From bcb8027b1cb25677a9e730081061659901657a42 Mon Sep 17 00:00:00 2001 From: Stephen Pope <689099+stephenpope@users.noreply.github.com> Date: Wed, 13 May 2020 13:07:31 +0100 Subject: [PATCH 1/2] feat: Upgrade to NetCore 3.1 --- .gitignore | 1 + CluedIn.Enricher.KnowledgeGraph.sln | 6 +- Directory.Build.props | 52 ++++++++----- Directory.Build.targets | 35 +++++---- GitVersion.yml | 17 ++++- Packages.props | 49 ++++++++++++ azure-pipelines.yml | 44 ++++++++++- build/assets/nugetlogo.png | Bin 0 -> 8303 bytes global.json | 10 +++ src/App.config | 70 ------------------ ...rnalSearch.Providers.KnowledgeGraph.csproj | 36 +-------- test/Directory.Build.props | 21 ++---- ...ch.KnowledgeGraph.Integration.Tests.csproj | 56 +------------- test/unit/Directory.Build.props | 3 +- 14 files changed, 180 insertions(+), 220 deletions(-) create mode 100644 Packages.props create mode 100644 build/assets/nugetlogo.png create mode 100644 global.json delete mode 100644 src/App.config 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..eba5805 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,5 +1,18 @@ # GitVersion.yml mode: ContinuousDelivery -branches: {} +next-version: 3.0 +branches: + feature: + regex: ^features?[/-](^netcore) + netcore: + regex: '^feature/netcore$' + mode: ContinuousDeployment + tag: netcore + increment: Inherit + prevent-increment-of-merged-branch-version: true + track-merge-target: false + tracks-release-branches: false + is-release-branch: false + source-branches: [ 'master' ] 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..d2c7fdb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,6 +5,7 @@ trigger: include: - master - develop + - feature/netcore tags: include: - v* @@ -18,6 +19,7 @@ pr: - develop - master - release/* + - feature/netcore paths: exclude: - '*.md' @@ -33,10 +35,48 @@ 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: + + # 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.default.build.yml@templates - template: documentation.publish.yml@templates + +- task: DotNetCoreCLI@2 + displayName: 'Create Netcore NuGet packages' + condition: and ( succeeded(), in(variables['Build.SourceBranch'], 'refs/heads/feature/netcore')) + inputs: + command: 'pack' + packagesToPack: 'src/**/*.csproj' + packDirectory: '$(Build.ArtifactStagingDirectory)/nuget' + versioningScheme: 'byEnvVar' + versionEnvVar: GITVERSION_SEMVER + includeSymbols: true + nugetConfigPath: nuget.config + +- task: NuGetCommand@2 + displayName: 'Push Netcore to develop feed' + condition: and ( succeeded(), in(variables['Build.SourceBranch'], 'refs/heads/feature/netcore')) + inputs: + command: 'push' + packagesToPush: '$(Build.ArtifactStagingDirectory)/nuget/**/*.nupkg' + allowPackageConflicts: true + publishVstsFeed: 'develop' + includeSymbols: true diff --git a/build/assets/nugetlogo.png b/build/assets/nugetlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..8868c3e0f5368881389c18839922ffaf7cbea598 GIT binary patch literal 8303 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 literal 0 HcmV?d00001 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 @@ - - + From bd65f97ff579f6a0842128e4a9a1cb697d246352 Mon Sep 17 00:00:00 2001 From: Kieranties Date: Wed, 29 Jul 2020 14:07:31 +0100 Subject: [PATCH 2/2] fix: use netcore build --- GitVersion.yml | 13 ------------- azure-pipelines.yml | 27 ++------------------------- docs/3.0.0-release-notes.md | 2 ++ 3 files changed, 4 insertions(+), 38 deletions(-) create mode 100644 docs/3.0.0-release-notes.md diff --git a/GitVersion.yml b/GitVersion.yml index eba5805..11b82a9 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,18 +1,5 @@ # GitVersion.yml mode: ContinuousDelivery next-version: 3.0 -branches: - feature: - regex: ^features?[/-](^netcore) - netcore: - regex: '^feature/netcore$' - mode: ContinuousDeployment - tag: netcore - increment: Inherit - prevent-increment-of-merged-branch-version: true - track-merge-target: false - tracks-release-branches: false - is-release-branch: false - source-branches: [ 'master' ] ignore: sha: [] \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d2c7fdb..448fe56 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,7 +5,6 @@ trigger: include: - master - develop - - feature/netcore tags: include: - v* @@ -19,7 +18,6 @@ pr: - develop - master - release/* - - feature/netcore paths: exclude: - '*.md' @@ -35,7 +33,7 @@ pool: vmImage: 'windows-latest' variables: - - group: nuget + - group: nuget - name: testFolderPath value: '$(Build.SourcesDirectory)/test' - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE @@ -55,28 +53,7 @@ steps: env: NUGET_KEY: $(nuget.key) -- template: crawler.default.build.yml@templates +- template: crawler.netcore.build.yml@templates - template: documentation.publish.yml@templates -- task: DotNetCoreCLI@2 - displayName: 'Create Netcore NuGet packages' - condition: and ( succeeded(), in(variables['Build.SourceBranch'], 'refs/heads/feature/netcore')) - inputs: - command: 'pack' - packagesToPack: 'src/**/*.csproj' - packDirectory: '$(Build.ArtifactStagingDirectory)/nuget' - versioningScheme: 'byEnvVar' - versionEnvVar: GITVERSION_SEMVER - includeSymbols: true - nugetConfigPath: nuget.config - -- task: NuGetCommand@2 - displayName: 'Push Netcore to develop feed' - condition: and ( succeeded(), in(variables['Build.SourceBranch'], 'refs/heads/feature/netcore')) - inputs: - command: 'push' - packagesToPush: '$(Build.ArtifactStagingDirectory)/nuget/**/*.nupkg' - allowPackageConflicts: true - publishVstsFeed: 'develop' - includeSymbols: true 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+