Merge branch 'release/4.0.0'

CluedIn-io · Feb 7, 2024 · 82e7ab3 · 82e7ab3
2 parents c42a9ad + ee37215
commit 82e7ab3
Show file tree

Hide file tree

Showing 12 changed files with 152 additions and 74 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Compilation Metadata">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <!-- TODO: Clean up warnings -->

diff --git a/ExternalSearch.Providers.Web.Provider/ExternalSearch.Providers.Web.Provider.csproj b/ExternalSearch.Providers.Web.Provider/ExternalSearch.Providers.Web.Provider.csproj
@@ -1,17 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-		<LangVersion>latest</LangVersion>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-		<LangVersion>latest</LangVersion>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<PackageReference Include="CluedIn.Core" />
 		<PackageReference Include="ComponentHost" />

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,5 +1,5 @@
 mode: ContinuousDeployment
-next-version: 3.4
+next-version: 4.0
 branches:
   master:
     mode: ContinuousDelivery

diff --git a/Packages.props b/Packages.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup Label="Dependency Versions">
-    <_ComponentHost>2.0.0</_ComponentHost>
+    <_ComponentHost>3.1.0</_ComponentHost>
     <_AutoFixture>4.11.0</_AutoFixture>
-    <_CluedIn>3.4.0-*</_CluedIn>
+    <_CluedIn>4.0.0</_CluedIn>
   </PropertyGroup>
   <ItemGroup>
     <!--
@@ -21,7 +21,7 @@
     <PackageReference Update="Xunit.SkippableFact" Version="1.3.12" />
     <PackageReference Update="Moq" Version="4.13.1" />
     <PackageReference Update="Shouldly" Version="3.0.2" />
-    <PackageReference Update="CluedIn.Testing.Base" Version="$(_CluedIn)" />
+    <PackageReference Update="CluedIn.Testing.Base" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>
     <!--

diff --git a/README.md b/README.md
@@ -46,3 +46,12 @@ docker-compose logs wiremock
 - [Docker](https://www.docker.com/)
 - [Pester](https://github.com/pester/Pester)
 - [WireMock](http://wiremock.org/)
+
+# About CluedIn
+CluedIn is the Cloud-native Master Data Management Platform that brings data teams together enabling them to deliver the foundation of high-quality, trusted data that empowers everyone to make a difference. 
+
+We're different because we use enhanced data management techniques like [Graph](https://www.cluedin.com/graph-versus-relational-databases-which-is-best) and [Zero Upfront Modelling](https://www.cluedin.com/upfront-versus-dynamic-data-modelling) to accelerate the time taken to prepare data to deliver insight by as much as 80%. Installed in as little as 20 minutes from the [Azure Marketplace](https://azuremarketplace.microsoft.com/en-gb/marketplace/apps/cluedin.azure_cluedin?tab=Overview), CluedIn is fully integrated with [Microsoft Purview](https://www.cluedin.com/product/microsoft-purview-mdm-integration?hsCtaTracking=461021ab-7a38-41a3-93dd-cfe2325dfd35%7Cb835efc0-e9b7-4385-a1b6-75cb7632527b) and the full [Microsoft Fabric](https://www.cluedin.com/microsoft-fabric) suite, making it the preferred choice for [Azure customers](https://www.cluedin.com/microsoft-intelligent-data-platform). 
+
+To learn more about CluedIn, [contact the team](https://www.cluedin.com/discovery-call) today.
+
+[https://www.cluedin.com](https://www.cluedin.com)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -38,14 +38,7 @@ variables:
 
 steps:
 
-  # Configure NuGet
-- pwsh: |
-    @('develop','release','AzurePipelines') | ForEach-Object{
-        dotnet nuget update  source $_ -p $env:NUGET_KEY -u VssSessionToken --configfile nuget.config
-    }
-  condition: and(succeeded(), variables['nuget.key'])
-  displayName: 'Add api token to access nuget artifacts'
-  env:
-    NUGET_KEY: $(nuget.key)
+- task: NuGetAuthenticate@1
+  displayName: 'Authenticate with nuget'
 
 - template: crawler.build.yml@templates
diff --git a/docs/4.0.0-release-notes.md b/docs/4.0.0-release-notes.md
@@ -0,0 +1,2 @@
+# Features
+- Update to support CluedIn 4.0
diff --git a/global.json b/global.json
@@ -1,7 +1,8 @@
 {
   "sdk": {
-    "version": "3.1.201",
-    "rollForward": "latestFeature"
+    "version": "6.0.400",
+    "rollForward": "latestFeature",
+    "allowPrerelease": false
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.52"

diff --git a/src/Vocabularies/WebsiteVocabulary.cs b/src/Vocabularies/WebsiteVocabulary.cs
@@ -30,11 +30,57 @@ public WebsiteVocabulary()
             this.Title                      = this.Add(new VocabularyKey("Title"));
             this.Logo                       = this.Add(new VocabularyKey("Logo", VocabularyKeyVisibility.Hidden));
             this.CopyrightEntity            = this.Add(new VocabularyKey("CopyrightEntity"));
+            this.WebsiteDescription         = this.Add(new VocabularyKey("WebsiteDescription"));
+            this.Name                       = this.Add(new VocabularyKey("Name"));
+            this.URI                        = this.Add(new VocabularyKey("URI"));
+            this.PhoneNumber                = this.Add(new VocabularyKey("PhoneNumber"));
+            this.FaxNumber                  = this.Add(new VocabularyKey("FaxNumber"));
+            this.ContactEmail               = this.Add(new VocabularyKey("ContactEmail"));
+            this.Address                    = this.Add(new VocabularyKey("Address"));
+            this.Country                    = this.Add(new VocabularyKey("Country"));
+            this.TechnologiesListText       = this.Add(new VocabularyKey("TechnologiesListText"));
+            this.AddressCountry             = this.Add(new VocabularyKey("AddressCountry"));
+            this.PostalCode                 = this.Add(new VocabularyKey("PostalCode"));
+            this.StreetAddress              = this.Add(new VocabularyKey("StreetAddress"));
+            this.FoundingDate               = this.Add(new VocabularyKey("FoundingDate"));
+            this.Duns                       = this.Add(new VocabularyKey("Duns"));
+            this.GlobalLocationNumber       = this.Add(new VocabularyKey("GlobalLocationNumber"));
+            this.IsicV4                     = this.Add(new VocabularyKey("IsicV4"));
+            this.LeiCode                    = this.Add(new VocabularyKey("LeiCode"));
+            this.Naics                      = this.Add(new VocabularyKey("Naics"));
+            this.TaxId                      = this.Add(new VocabularyKey("TaxId"));
+            this.VatId                      = this.Add(new VocabularyKey("VatId"));
+            this.TickerSymbol               = this.Add(new VocabularyKey("TickerSymbol"));
+            this.CVR                        = this.Add(new VocabularyKey("CVR"));
+            this.GoogleAnalytics            = this.Add(new VocabularyKey("GoogleAnalytics"));
         }
 
         public VocabularyKey Description { get; protected set; }
         public VocabularyKey Title { get; protected set; }
         public VocabularyKey Logo { get; protected set; }
         public VocabularyKey CopyrightEntity { get; protected set; }
+        public VocabularyKey WebsiteDescription { get; protected set; }
+        public VocabularyKey Name { get; protected set; }
+        public VocabularyKey URI { get; protected set; }
+        public VocabularyKey PhoneNumber { get; protected set; }
+        public VocabularyKey FaxNumber { get; protected set; }
+        public VocabularyKey ContactEmail { get; protected set; }
+        public VocabularyKey Address { get; protected set; }
+        public VocabularyKey Country { get; protected set; }
+        public VocabularyKey TechnologiesListText { get; protected set; }
+        public VocabularyKey AddressCountry { get; protected set; }
+        public VocabularyKey PostalCode { get; protected set; }
+        public VocabularyKey StreetAddress { get; protected set; }
+        public VocabularyKey FoundingDate { get; protected set; }
+        public VocabularyKey Duns { get; protected set; }
+        public VocabularyKey GlobalLocationNumber { get; protected set; }
+        public VocabularyKey IsicV4 { get; protected set; }
+        public VocabularyKey LeiCode { get; protected set; }
+        public VocabularyKey Naics { get; protected set; }
+        public VocabularyKey TaxId { get; protected set; }
+        public VocabularyKey VatId { get; protected set; }
+        public VocabularyKey TickerSymbol { get; protected set; }
+        public VocabularyKey CVR { get; protected set; }
+        public VocabularyKey GoogleAnalytics { get; protected set; }
     }
 }
diff --git a/src/WebExternalSearchConstants.cs b/src/WebExternalSearchConstants.cs
@@ -14,7 +14,8 @@ public static class WebExternalSearchConstants
 
         public struct KeyName
         {
-            public const string ApiToken = "apiToken";
+            public const string AcceptedEntityType = "acceptedEntityType";
+            public const string WebsiteKey = "websiteKey";
 
         }
 
@@ -25,6 +26,22 @@ public struct KeyName
         public static AuthMethods AuthMethods { get; set; } = new AuthMethods
         {
             token = new List<Control>()
+            {
+                new Control()
+                {
+                    displayName = "Accepted Entity Type",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.AcceptedEntityType
+                },
+                new Control()
+                {
+                    displayName = "Website vocab key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.WebsiteKey
+                },
+            }
         };
 
         public static IEnumerable<Control> Properties { get; set; } = new List<Control>()

diff --git a/src/WebExternalSearchJobData.cs b/src/WebExternalSearchJobData.cs
@@ -7,12 +7,19 @@ public class WebExternalSearchJobData : CrawlJobData
     {
         public WebExternalSearchJobData(IDictionary<string, object> configuration)
         {
-            // ApiToken = GetValue<string>(configuration, WebConstants.KeyName.ApiToken);
+            AcceptedEntityType = GetValue<string>(configuration, WebExternalSearchConstants.KeyName.AcceptedEntityType);
+            WebsiteKey = GetValue<string>(configuration, WebExternalSearchConstants.KeyName.WebsiteKey);
         }
 
         public IDictionary<string, object> ToDictionary()
         {
-            return new Dictionary<string, object>();
+            return new Dictionary<string, object>()
+            {
+                { WebExternalSearchConstants.KeyName.AcceptedEntityType, AcceptedEntityType },
+                { WebExternalSearchConstants.KeyName.WebsiteKey, WebsiteKey }
+            };
         }
+        public string AcceptedEntityType { get; set; }
+        public string WebsiteKey { get; set; }
     }
 }