diff --git a/.gitignore b/.gitignore index 2fd3065..05a709b 100644 --- a/.gitignore +++ b/.gitignore @@ -269,3 +269,4 @@ NDependOut/ # Build artifacts Test-*.XML +.DS_Store diff --git a/CluedIn.Enricher.KnowledgeGraph.sln b/CluedIn.Enricher.KnowledgeGraph.sln index 5871803..f2365d0 100644 --- a/CluedIn.Enricher.KnowledgeGraph.sln +++ b/CluedIn.Enricher.KnowledgeGraph.sln @@ -13,9 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7E2E897B-E EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unit", "unit", "{A32B6852-82C7-4107-8C68-AE9232289E09}" - ProjectSection(SolutionItems) = preProject - test\unit\Directory.Build.props = test\unit\Directory.Build.props - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "integration", "integration", "{DBD1964B-DBD9-4C70-96CA-391C34B3D75F}" EndProject @@ -25,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{E1A76004 ProjectSection(SolutionItems) = preProject azure-pipelines.yml = azure-pipelines.yml global.json = global.json + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9BD54E81-D9C8-4419-82B8-8EE6CC7E2647}" @@ -35,6 +34,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{02641789-0D38-4DBB-9288-23592CF55D25}" ProjectSection(SolutionItems) = preProject NuGet.config = NuGet.config + Packages.props = Packages.props EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Code Style", "Code Style", "{2C3AECCF-DCB5-4ED7-8B7B-8F373EDE3A5E}" diff --git a/Directory.Build.props b/Directory.Build.props index 5abefa4..f6f2b08 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,30 +1,42 @@ + + netcoreapp3.1 + - + + 4 false - + CS0105;CS0108;CS0109;CS0114;CS0162;CS0168;CS0169;CS0219;CS0252;CS0414;CS0472;CS0649;CS0652;CS1717;CS1998;CS4014;xUnit1013;MSB3245;MSB3270,NU1602 + + $(NoWarn);NU5105 prompt - false - - net452 + + $([System.Text.RegularExpressions.Regex]::Match($(Version), '\d+\.\d+').Value) + $([System.Text.RegularExpressions.Regex]::Match($(Version), '\d+\.\d+.\d+').Value) + CluedIn ApS + Copyright (c) 2020 $(Company). All rights reserved. + CluedIn + $(MSBuildProjectName) + $(Product).$(AssemblyTitle) + $(AssemblyName) - - CluedIn - Copyright (c) 2019 CluedIn. All rights reserved. - - Internal CluedIn Assembly - - https://github.com/CluedIn-io/CluedIn.Csharp.Template.git - git - true - - - symbols.nupkg - true - + + $(RootNamespace) + $(Company) + + + + http://cluedin.com + nugetlogo.png - + + + + + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index c92ec76..1b26f1b 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,22 +1,21 @@ + + + + + + + + + - - - - - + + + + + + + + diff --git a/GitVersion.yml b/GitVersion.yml index 44a853c..11b82a9 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,5 +1,5 @@ # GitVersion.yml mode: ContinuousDelivery -branches: {} +next-version: 3.0 ignore: - sha: [] + sha: [] \ No newline at end of file diff --git a/Packages.props b/Packages.props new file mode 100644 index 0000000..ccc0903 --- /dev/null +++ b/Packages.props @@ -0,0 +1,49 @@ + + + <_ComponentHost>2.0.0-alpha-14 + <_AutoFixture>4.11.0 + <_CluedIn>3.0.0-netcore.* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d05a1ea..448fe56 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,10 +33,27 @@ pool: vmImage: 'windows-latest' variables: - Dotnet.Skip.First.Time.Experience: 'True' - testFolderPath: '$(Build.SourcesDirectory)/test' + - group: nuget + - name: testFolderPath + value: '$(Build.SourcesDirectory)/test' + - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE + value: true + - name: DOTNET_CLI_TELEMETRY_OPTOUT + value: true steps: -- template: crawler.default.build.yml@templates + + # 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) + +- template: crawler.netcore.build.yml@templates - template: documentation.publish.yml@templates + diff --git a/build/assets/nugetlogo.png b/build/assets/nugetlogo.png new file mode 100644 index 0000000..8868c3e Binary files /dev/null and b/build/assets/nugetlogo.png differ diff --git a/docs/3.0.0-release-notes.md b/docs/3.0.0-release-notes.md new file mode 100644 index 0000000..8b97390 --- /dev/null +++ b/docs/3.0.0-release-notes.md @@ -0,0 +1,2 @@ +### Features ++ Support netcore and CluedIn 3.0.0+ diff --git a/global.json b/global.json new file mode 100644 index 0000000..a3a74c4 --- /dev/null +++ b/global.json @@ -0,0 +1,10 @@ +{ + "sdk": { + "version": "3.1.201", + "rollForward": "latestFeature" + }, + "msbuild-sdks": { + "Microsoft.Build.CentralPackageVersions": "2.0.52", + "Microsoft.Build.Traversal": "2.0.31" + } +} diff --git a/src/App.config b/src/App.config deleted file mode 100644 index 07a52d1..0000000 --- a/src/App.config +++ /dev/null @@ -1,70 +0,0 @@ - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ExternalSearch.Providers.KnowledgeGraph.csproj b/src/ExternalSearch.Providers.KnowledgeGraph.csproj index 0bc4135..54f5192 100644 --- a/src/ExternalSearch.Providers.KnowledgeGraph.csproj +++ b/src/ExternalSearch.Providers.KnowledgeGraph.csproj @@ -1,39 +1,5 @@  - - {FAAD6DC5-6B35-4D73-AD98-8D2C3D86FEA4} - CluedIn.ExternalSearch.Providers.KnowledgeGraph - CluedIn.ExternalSearch.Providers.KnowledgeGraph - net452 - ..\ - ExternalSearch.Providers.KnowledgeGraph - CluedIn - ExternalSearch.Providers.KnowledgeGraph - Copyright (c) 2019 Clued In. All rights reserved. - bin\$(Configuration)\ - - - full - x64 - - - pdbonly - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 0f0e46d..093d078 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,22 +1,17 @@ - + true - - - - - - - - + + + + + + + diff --git a/test/integration/ExternalSearch.KnowledgeGraph.Integration.Tests/ExternalSearch.KnowledgeGraph.Integration.Tests.csproj b/test/integration/ExternalSearch.KnowledgeGraph.Integration.Tests/ExternalSearch.KnowledgeGraph.Integration.Tests.csproj index bb450f4..a5b9e0e 100644 --- a/test/integration/ExternalSearch.KnowledgeGraph.Integration.Tests/ExternalSearch.KnowledgeGraph.Integration.Tests.csproj +++ b/test/integration/ExternalSearch.KnowledgeGraph.Integration.Tests/ExternalSearch.KnowledgeGraph.Integration.Tests.csproj @@ -1,56 +1,2 @@ - - - - - Debug - AnyCPU - {E4418764-F1EF-40D3-AA8C-C2C6C38B6654} - Library - Properties - ExternalSearch.KnowledgeGraph.Integration.Tests - ExternalSearch.KnowledgeGraph.Integration.Tests - v4.5.2 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - 1.3.2 - - - - + \ No newline at end of file diff --git a/test/unit/Directory.Build.props b/test/unit/Directory.Build.props index 0e983b3..b49a46d 100644 --- a/test/unit/Directory.Build.props +++ b/test/unit/Directory.Build.props @@ -2,8 +2,7 @@ - - +