Merge remote-tracking branch 'origin/release/3.2'

CluedIn-io · Nov 24, 2020 · be5b92a · be5b92a
2 parents ab7b470 + a67b850
commit be5b92a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 25 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,5 +1,10 @@
-# GitVersion.yml
-mode: ContinuousDelivery
-next-version: 3.0
-ignore:
-  sha: []
+mode: ContinuousDeployment
+next-version: 3.2
+branches:
+  master:
+    mode: ContinuousDelivery
+  pull-request:
+    tag: pr
+    increment: None
+  develop:
+    tag: alpha1
diff --git a/Packages.props b/Packages.props
@@ -1,8 +1,7 @@
 <Project>
   <PropertyGroup Label="Dependency Versions">
-    <_ComponentHost>2.0.0-alpha-14</_ComponentHost>
     <_AutoFixture>4.11.0</_AutoFixture>
-    <_CluedIn>3.0.0-netcore.*</_CluedIn>
+    <_CluedIn>3.2.0-*</_CluedIn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -3,31 +3,24 @@ name: $(Date:yyyyMMdd)$(Rev:.r)
 trigger:
   branches:
     include:
-    - master
     - develop
-  tags:
-    include:
-      - v*
-  paths:
-    exclude:
-    - '*.md'
+    - master
+    - release/*
 
 pr:
   branches:
     include:
     - develop
     - master
     - release/*
-  paths:
-    exclude:
-    - '*.md'
 
 resources:
   repositories:
     - repository: templates
       type: github
       name: CluedIn-io/AzurePipelines.Templates
       endpoint: 'CluedIn-io'
+      ref: refs/heads/refactor
 
 pool:
   vmImage: 'windows-latest'
@@ -40,6 +33,8 @@ variables:
     value: true
   - name: DOTNET_CLI_TELEMETRY_OPTOUT
     value: true
+  - name: buildConfiguration
+    value: Release
 
 steps:
 
@@ -53,7 +48,4 @@ steps:
   env:
     NUGET_KEY: $(nuget.key)
 
-- template: crawler.netcore.build.yml@templates
-
-- template: documentation.publish.yml@templates
-
+- template: crawler.build.yml@templates
diff --git a/docs/3.2.0-release-notes.md b/docs/3.2.0-release-notes.md
@@ -0,0 +1,5 @@
+### Fixes
++ Update extended metadata
+
+### Features
++ Support netcore and CluedIn 3.2.0+
diff --git a/src/ExternalSearch.Providers.KnowledgeGraph.csproj b/src/ExternalSearch.Providers.KnowledgeGraph.csproj
@@ -1,4 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <None Remove="Resources\knowledgegraph.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\knowledgegraph.jpg" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CluedIn.ExternalSearch" />
   </ItemGroup>

diff --git a/src/KnowledgeGraphExternalSearchProvider.cs b/src/KnowledgeGraphExternalSearchProvider.cs
@@ -1200,7 +1200,7 @@ public partial class KnowledgeGraphExternalSearchProvider : ExternalSearchProvid
             }
             .Select(t => t.ToLowerInvariant())
             .Distinct()
-            .ToHashSet();
+            .ToHashSetEx();
 
         /**********************************************************************************************************
          * CONSTRUCTORS
@@ -1248,7 +1248,7 @@ public override IEnumerable<IExternalSearchQuery> BuildQueries(ExecutionContext
             {
                 var values = organizationName.GetOrganizationNameVariants()
                                              .Select(NameNormalization.Normalize)
-                                             .ToHashSet();
+                                             .ToHashSetEx();
 
                 foreach (var value in values.Where(v => !nameFilter(v)))
                     yield return new ExternalSearchQuery(this, entityType, ExternalSearchQueryParameter.Name, value);
@@ -1279,7 +1279,7 @@ public override IEnumerable<IExternalSearchQueryResult> ExecuteSearch(ExecutionC
             name = HttpUtility.UrlEncode(name);
 
             var client = new RestClient("https://kgsearch.googleapis.com");
-           
+
             var request = new RestRequest(string.Format("v1/entities:search?query={0}&key={1}&limit=10&indent=True", name ?? uri, "AIzaSyA_jYkIzEp_8w90K70KQYuoKLrLuOf1wZA"), Method.GET);
 
             var response = client.ExecuteTaskAsync<KnowledgeResponse>(request).Result;
@@ -1432,7 +1432,7 @@ private void PopulateMetadata(IEntityMetadata metadata, IExternalSearchQueryResu
 
         public string Icon { get; } = "Resources.knowledgegraph.jpg";
         public string Domain { get; } = "https://developers.google.com/knowledge-graph";
-        public string About { get; } = "Knowledge Graph is enricher which allows you to find entities using Google Knowledge Graph API";
+        public string About { get; } = "Knowledge Graph is an enricher which allows you to find entities using the Google Knowledge Graph API";
         public AuthMethods AuthMethods { get; } = null;
         public IEnumerable<Control> Properties { get; } = null;
         public Guide Guide { get; } = null;