diff --git a/GitVersion.yml b/GitVersion.yml index 11b82a9..fda7acc 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,5 +1,10 @@ -# GitVersion.yml -mode: ContinuousDelivery -next-version: 3.0 -ignore: - sha: [] \ No newline at end of file +mode: ContinuousDeployment +next-version: 3.2 +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 ccc0903..5e85d24 100644 --- a/Packages.props +++ b/Packages.props @@ -1,8 +1,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..e5b3af5 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: @@ -28,6 +20,7 @@ resources: 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 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+ 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 @@  + + + + + + diff --git a/src/KnowledgeGraphExternalSearchProvider.cs b/src/KnowledgeGraphExternalSearchProvider.cs index 509e9a5..6c5e5a6 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; @@ -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 Properties { get; } = null; public Guide Guide { get; } = null;