Merge branch 'release/4.0.0'

CluedIn-io · Feb 7, 2024 · f500aa0 · f500aa0
2 parents b6f8258 + 9d4f95d
commit f500aa0
Show file tree

Hide file tree

Showing 15 changed files with 161 additions and 82 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 -->
@@ -36,6 +36,10 @@
     <PackageIcon>nugetlogo.png</PackageIcon>
   </PropertyGroup>
 
+  <PropertyGroup Label="FixBuildDefault">
+	  <IncludeProjectsNotInAssetsFileInDepsFile>false</IncludeProjectsNotInAssetsFileInDepsFile>
+  </PropertyGroup>
+
   <ItemGroup Label="Package Includes">
     <None Include="$(MSBuildThisFileDirectory)build\assets\nugetlogo.png" Pack="true" PackagePath="\" />
   </ItemGroup>

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,29 @@
-# GitVersion.yml
-mode: ContinuousDelivery
-next-version: 3.3
-branches: {}
+mode: ContinuousDeployment
+next-version: 4.0
+branches:
+  master:
+    mode: ContinuousDelivery
+  pull-request:
+    tag: pr
+    increment: None
+  develop:
+    tag: alpha
+  hotfix:
+    tag: useBranchName
+  ama:
+    increment: None
+    tracks-release-branches: false
+    regex: ^ama[/-]
+    is-release-branch: false
+    mode: ContinuousDeployment
+    track-merge-target: false
+    tag: ama
+    pre-release-weight: 30000
+    prevent-increment-of-merged-branch-version: true
+    is-mainline: false
+    source-branches:
+    - main
+    - develop
 ignore:
-  sha: []
+  sha: []
+
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.3.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
@@ -6,4 +6,11 @@ Project can be compiled running `dotnet build`.
 
 Azure Pipelines Continuous integration is already configured
 
-// TO BE COMPLETED
+# 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/docs/4.0.0-release-notes.md b/docs/4.0.0-release-notes.md
@@ -0,0 +1,3 @@
+# Features
+- Update to support CluedIn 4.0
+- Supports configurable types and keys
diff --git a/global.json b/global.json
@@ -1,9 +1,10 @@
 {
   "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/ExternalSearch.Providers.VatLayer.Provider/VatLayerSearchProviderProvider.cs b/src/ExternalSearch.Providers.VatLayer.Provider/VatLayerSearchProviderProvider.cs
@@ -111,6 +111,7 @@ public override IEnumerable<string> WebhookManagementEndpoints(IEnumerable<strin
             throw new NotImplementedException();
         }
 
+        public override bool ScheduleCrawlJobs => false;
         public string Icon { get; } = Constants.Icon;
         public string Domain { get; } = Constants.Domain;
         public string About { get; } = Constants.About;
@@ -119,4 +120,4 @@ public override IEnumerable<string> WebhookManagementEndpoints(IEnumerable<strin
         public Guide Guide { get; } = Constants.Guide;
         public new IntegrationType Type { get; } = Constants.IntegrationType;
     }
-}
+}
diff --git a/src/ExternalSearch.Providers.VatLayer/Constants.cs b/src/ExternalSearch.Providers.VatLayer/Constants.cs
@@ -14,11 +14,13 @@ public static class Constants
         public struct KeyName
         {
             public const string ApiToken = "apiToken";
+            public const string AcceptedEntityType = "acceptedEntityType";
+            public const string AcceptedVocabKey = "acceptedVocabKey";
 
         }
 
         public static string About { get; set; } = "VatLayer is an enricher for validating and cleaning VAT numbers";
-        public static string Icon { get; set; } = "Resources.vatlayer.png";
+        public static string Icon { get; set; } = "Resources.logo.svg";
         public static string Domain { get; set; } = "https://vatlayer.com/";
 
         public static AuthMethods AuthMethods { get; set; } = new AuthMethods
@@ -31,7 +33,21 @@ public struct KeyName
                     type = "input",
                     isRequired = true,
                     name = KeyName.ApiToken
-                }
+                },
+                new Control()
+                {
+                    displayName = "Accepted Entity Type",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.AcceptedEntityType
+                },
+                new Control()
+                {
+                    displayName = "Accepted Vocab Key",
+                    type = "input",
+                    isRequired = false,
+                    name = KeyName.AcceptedVocabKey
+                },
             }
         };
 

diff --git a/src/ExternalSearch.Providers.VatLayer/Directory.Build.props b/src/ExternalSearch.Providers.VatLayer/Directory.Build.props
diff --git a/src/ExternalSearch.Providers.VatLayer/ExternalSearch.Providers.VatLayer.csproj b/src/ExternalSearch.Providers.VatLayer/ExternalSearch.Providers.VatLayer.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <None Remove="Resources\vatlayer.png" />
+    <None Remove="Resources\logo.svg" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\vatlayer.png" />
+    <EmbeddedResource Include="Resources\logo.svg" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ExternalSearch.Providers.VatLayer/Resources/logo.svg b/src/ExternalSearch.Providers.VatLayer/Resources/logo.svg
diff --git a/src/ExternalSearch.Providers.VatLayer/Resources/vatlayer.png b/src/ExternalSearch.Providers.VatLayer/Resources/vatlayer.png
diff --git a/src/ExternalSearch.Providers.VatLayer/VatLayerExternalSearchJobData.cs b/src/ExternalSearch.Providers.VatLayer/VatLayerExternalSearchJobData.cs
@@ -8,15 +8,21 @@ public class VatLayerExternalSearchJobData : CrawlJobData
         public VatLayerExternalSearchJobData(IDictionary<string, object> configuration)
         {
             ApiToken = GetValue<string>(configuration, Constants.KeyName.ApiToken);
+            AcceptedEntityType = GetValue<string>(configuration, Constants.KeyName.AcceptedEntityType);
+            AcceptedVocabKey = GetValue<string>(configuration, Constants.KeyName.AcceptedVocabKey);
         }
 
         public IDictionary<string, object> ToDictionary()
         {
             return new Dictionary<string, object> {
-                { Constants.KeyName.ApiToken, ApiToken }
+                { Constants.KeyName.ApiToken, ApiToken },
+                { Constants.KeyName.AcceptedEntityType, AcceptedEntityType },
+                { Constants.KeyName.AcceptedVocabKey, AcceptedVocabKey }
             };
         }
 
         public string ApiToken { get; set; }
+        public string AcceptedEntityType { get; set; }
+        public string AcceptedVocabKey { get; set; }
     }
 }