From e253254c0bb13490cc0f1b2d546d79a54e7336a6 Mon Sep 17 00:00:00 2001 From: Ben Fidge Date: Tue, 13 Oct 2020 16:08:17 +0700 Subject: [PATCH 1/7] Made icon an embedded resource --- src/ExternalSearch.Providers.KnowledgeGraph.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ExternalSearch.Providers.KnowledgeGraph.csproj b/src/ExternalSearch.Providers.KnowledgeGraph.csproj index 54f5192..d4ac4cf 100644 --- a/src/ExternalSearch.Providers.KnowledgeGraph.csproj +++ b/src/ExternalSearch.Providers.KnowledgeGraph.csproj @@ -1,4 +1,10 @@  + + + + + + From d81884ea05916e2702da45343f58ecd61a4388cb Mon Sep 17 00:00:00 2001 From: Kieranties Date: Mon, 16 Nov 2020 09:52:06 +0000 Subject: [PATCH 2/7] chore: prepare for release --- GitVersion.yml | 2 +- Packages.props | 2 +- azure-pipelines.yml | 12 ++---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 11b82a9..20f4a55 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,5 +1,5 @@ # GitVersion.yml mode: ContinuousDelivery -next-version: 3.0 +next-version: 3.2 ignore: sha: [] \ No newline at end of file diff --git a/Packages.props b/Packages.props index ccc0903..2af8be4 100644 --- a/Packages.props +++ b/Packages.props @@ -2,7 +2,7 @@ <_ComponentHost>2.0.0-alpha-14 <_AutoFixture>4.11.0 - <_CluedIn>3.0.0-netcore.* + <_CluedIn>3.2.0-* diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 448fe56..8c66e9d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,14 +3,9 @@ name: $(Date:yyyyMMdd)$(Rev:.r) trigger: branches: include: - - master - develop - tags: - include: - - v* - paths: - exclude: - - '*.md' + - master + - release/* pr: branches: @@ -18,9 +13,6 @@ pr: - develop - master - release/* - paths: - exclude: - - '*.md' resources: repositories: From 28bef4d517ab9ff09f815d6d0992b75fa3468e02 Mon Sep 17 00:00:00 2001 From: Kieranties Date: Mon, 16 Nov 2020 09:52:50 +0000 Subject: [PATCH 3/7] chore: prepare for release --- docs/3.2.0-release-notes.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/3.2.0-release-notes.md diff --git a/docs/3.2.0-release-notes.md b/docs/3.2.0-release-notes.md new file mode 100644 index 0000000..dc581fa --- /dev/null +++ b/docs/3.2.0-release-notes.md @@ -0,0 +1,5 @@ +### Fixes ++ Update extended metadata + +### Features ++ Support netcore and CluedIn 3.2.0+ From f727bd1d2dd059a78012d7dd6288a2a73be61775 Mon Sep 17 00:00:00 2001 From: Kieranties Date: Tue, 17 Nov 2020 14:32:38 +0000 Subject: [PATCH 4/7] chore: prepare for release --- GitVersion.yml | 13 +++++++++---- Packages.props | 1 - azure-pipelines.yml | 8 ++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 20f4a55..fda7acc 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,5 +1,10 @@ -# GitVersion.yml -mode: ContinuousDelivery +mode: ContinuousDeployment next-version: 3.2 -ignore: - sha: [] \ No newline at end of file +branches: + master: + mode: ContinuousDelivery + pull-request: + tag: pr + increment: None + develop: + tag: alpha1 \ No newline at end of file diff --git a/Packages.props b/Packages.props index 2af8be4..5e85d24 100644 --- a/Packages.props +++ b/Packages.props @@ -1,6 +1,5 @@ - <_ComponentHost>2.0.0-alpha-14 <_AutoFixture>4.11.0 <_CluedIn>3.2.0-* diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8c66e9d..e5b3af5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,6 +20,7 @@ resources: type: github name: CluedIn-io/AzurePipelines.Templates endpoint: 'CluedIn-io' + ref: refs/heads/refactor pool: vmImage: 'windows-latest' @@ -32,6 +33,8 @@ variables: value: true - name: DOTNET_CLI_TELEMETRY_OPTOUT value: true + - name: buildConfiguration + value: Release steps: @@ -45,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 From a5c689b2328ec3ab954aa7c556a4e377fe7c137b Mon Sep 17 00:00:00 2001 From: Kieranties Date: Tue, 17 Nov 2020 14:42:31 +0000 Subject: [PATCH 5/7] build: fix ambiguous calls --- src/KnowledgeGraphExternalSearchProvider.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/KnowledgeGraphExternalSearchProvider.cs b/src/KnowledgeGraphExternalSearchProvider.cs index 509e9a5..30c89a7 100644 --- 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 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 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(request).Result; From 6db2271ab34fc2a6fa1a21ef12838e2b1817db35 Mon Sep 17 00:00:00 2001 From: Kieranties Date: Wed, 18 Nov 2020 10:14:58 +0000 Subject: [PATCH 6/7] fix: update description --- src/KnowledgeGraphExternalSearchProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/KnowledgeGraphExternalSearchProvider.cs b/src/KnowledgeGraphExternalSearchProvider.cs index 30c89a7..2e5b826 100644 --- a/src/KnowledgeGraphExternalSearchProvider.cs +++ b/src/KnowledgeGraphExternalSearchProvider.cs @@ -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 Google Knowledge Graph API"; public AuthMethods AuthMethods { get; } = null; public IEnumerable Properties { get; } = null; public Guide Guide { get; } = null; From d3a1defc5af5ccedee9a9571a3b98b5644438046 Mon Sep 17 00:00:00 2001 From: Kieranties Date: Wed, 18 Nov 2020 10:20:13 +0000 Subject: [PATCH 7/7] fix: update description --- src/KnowledgeGraphExternalSearchProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/KnowledgeGraphExternalSearchProvider.cs b/src/KnowledgeGraphExternalSearchProvider.cs index 2e5b826..6c5e5a6 100644 --- a/src/KnowledgeGraphExternalSearchProvider.cs +++ b/src/KnowledgeGraphExternalSearchProvider.cs @@ -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 an 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 Properties { get; } = null; public Guide Guide { get; } = null;