From a4051743be824ef97fa58bb10d02d8f0371057ad Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 19 Oct 2022 14:58:47 +0200 Subject: [PATCH 1/2] nuget updates --- build/common/Utilities/DockerContextExtensions.cs | 2 +- build/common/Utilities/Tools.cs | 2 +- dotnet-tools.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/common/Utilities/DockerContextExtensions.cs b/build/common/Utilities/DockerContextExtensions.cs index 4252b7a0d5..7486ee701e 100644 --- a/build/common/Utilities/DockerContextExtensions.cs +++ b/build/common/Utilities/DockerContextExtensions.cs @@ -13,7 +13,7 @@ public static bool SkipImage(this ICakeContext context, DockerImage dockerImage) { var (distro, targetFramework, architecture, _, _) = dockerImage; - if (architecture != Architecture.Arm64) return false; + if (architecture == Architecture.Amd64) return false; if (!Constants.DistrosToSkip.Contains(distro)) return false; context.Information($"Skipping Target: {targetFramework}, Distro: {distro}, Arch: {architecture}"); diff --git a/build/common/Utilities/Tools.cs b/build/common/Utilities/Tools.cs index 62ea1268b1..47252238b3 100644 --- a/build/common/Utilities/Tools.cs +++ b/build/common/Utilities/Tools.cs @@ -6,6 +6,6 @@ public class Tools public static readonly Dictionary Versions = new() { - { NugetCmd, "6.1.0" }, + { NugetCmd, "6.3.1" }, }; } diff --git a/dotnet-tools.json b/dotnet-tools.json index 4c6f94aa79..09789d57a2 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -9,7 +9,7 @@ ] }, "gitversion.tool": { - "version": "5.10.1", + "version": "5.10.3", "commands": [ "dotnet-gitversion" ] @@ -21,7 +21,7 @@ ] }, "Wyam2.Tool": { - "version": "3.0.0-rc3", + "version": "3.0.0", "commands": [ "wyam2" ] From 5974053628efa8218c5fdc9b7b0fad7d8dfe6b8b Mon Sep 17 00:00:00 2001 From: Artur Date: Thu, 20 Oct 2022 15:30:04 +0200 Subject: [PATCH 2/2] #3169 - added .net 7.0 support, +semver: major --- .github/workflows/ci.yml | 62 +++++++++++-------- .github/workflows/codeql-analysis.yml | 8 +-- .github/workflows/docs.yml | 21 ++++--- .github/workflows/format.yml | 5 +- build/Directory.Build.props | 4 +- .../Tasks/ArtifactsDotnetToolTest.cs | 2 +- .../Tasks/ArtifactsMsBuildCoreTest.cs | 5 +- .../Tasks/ArtifactsMsBuildFullTest.cs | 2 +- build/artifacts/Tasks/ArtifactsNativeTest.cs | 2 +- build/artifacts/Tasks/ArtifactsPrepare.cs | 2 +- build/artifacts/Tasks/ArtifactsTest.cs | 2 +- build/build/Tasks/Test/UnitTest.cs | 4 +- build/common/Utilities/Constants.cs | 8 ++- .../Utilities/DockerContextExtensions.cs | 3 +- build/docker/Tasks/DockerBuild.cs | 2 +- build/docker/Tasks/DockerManifest.cs | 2 +- build/docker/Tasks/DockerPublish.cs | 2 +- build/docker/Tasks/DockerTest.cs | 2 +- build/global.json | 7 --- dotnet-tools.json | 2 +- src/Directory.Build.props | 2 +- .../GitVersion.App.Tests.csproj | 2 +- src/GitVersion.App/GitVersion.App.csproj | 4 +- .../GitVersion.Core.Tests.csproj | 2 +- .../GitVersion.MsBuild.Tests.csproj | 2 +- src/GitVersion.MsBuild/nuget-files.props | 4 ++ 26 files changed, 88 insertions(+), 75 deletions(-) delete mode 100644 build/global.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2c2196f8c..37a7de5129 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,10 +55,11 @@ jobs: path: run key: run-${{ runner.os }}-${{ hashFiles('./build/**') }} - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Prepare]' if: steps.cache-cake.outputs.cache-hit != 'true' @@ -94,10 +95,11 @@ jobs: path: tools key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }} - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Build]' shell: pwsh @@ -133,7 +135,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest, macos-latest] - targetFramework: [net6.0] + targetFramework: [net7.0, net6.0] fail-fast: false steps: @@ -157,10 +159,11 @@ jobs: path: tools key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }} - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Unit Test]' shell: pwsh @@ -209,10 +212,11 @@ jobs: name: nuget path: ${{ github.workspace }}/artifacts/packages/nuget - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Test Artifacts]' shell: pwsh @@ -224,7 +228,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - targetFramework: [ '6.0' ] + targetFramework: [ '7.0', '6.0' ] distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ] fail-fast: false @@ -269,10 +273,11 @@ jobs: with: install: true - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Test Artifacts (amd64)]' shell: pwsh @@ -288,7 +293,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - targetFramework: [ '6.0' ] + targetFramework: [ '7.0', '6.0' ] distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ] fail-fast: false @@ -327,10 +332,11 @@ jobs: with: install: true - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: Login to DockerHub if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools' @@ -417,10 +423,11 @@ jobs: name: nuget path: ${{ github.workspace }}/artifacts/packages/nuget - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Publish]' shell: pwsh @@ -471,10 +478,11 @@ jobs: name: native-macOS path: ${{ github.workspace }}/artifacts/packages/native - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Release]' shell: pwsh diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 224d32bd19..ccdaab0e61 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -58,11 +58,11 @@ jobs: key: run-${{ runner.os }}-${{ hashFiles('./build/**') }} - - name: Install .NET SDKs - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: | - 6.0.x + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Prepare]' diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d60bc46498..70ae87cd6c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -69,10 +69,11 @@ jobs: key: node-${{ runner.os }}-${{ hashFiles('./package-lock.json') }} restore-keys: node-${{ runner.os }} - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Prepare]' if: steps.cache-cake.outputs.cache-hit != 'true' @@ -103,10 +104,11 @@ jobs: path: tools key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }} - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Build Documentation]' shell: pwsh @@ -160,10 +162,11 @@ jobs: path: tools key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }} - - name: Install .NET SDK 6.0.x - uses: actions/setup-dotnet@v3 + name: Setup .NET SDK + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: '[Publish Documentation]' if: ${{ github.event_name == 'push' }} diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 6bc805a2e2..939f8213ea 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -30,9 +30,10 @@ jobs: - uses: actions/checkout@v3 - name: Setup .NET SDK - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v3.0.2 with: - dotnet-version: '6.0.x' + dotnet-version: '7.0.x' + dotnet-quality: 'preview' - name: Run Format Build solution run: dotnet format ./build/ --verify-no-changes diff --git a/build/Directory.Build.props b/build/Directory.Build.props index 945f92f0fc..a33ab94102 100644 --- a/build/Directory.Build.props +++ b/build/Directory.Build.props @@ -1,12 +1,12 @@  Exe - net6.0 + net7.0 $(MSBuildProjectDirectory) ..\..\run\ false enable - 10 + 11 NU1604 enable diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs index c2d6da8c58..3473bf507e 100644 --- a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs +++ b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsDotnetToolTest))] [TaskDescription("Tests the dotnet global tool in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)] [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(ArtifactsPrepare))] public class ArtifactsDotnetToolTest : FrostingTask diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs index 2cd0feae16..fea0e0c4fa 100644 --- a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs +++ b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsMsBuildCoreTest))] [TaskDescription("Tests the msbuild package in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)] [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(ArtifactsPrepare))] public class ArtifactsMsBuildCoreTest : FrostingTask @@ -29,12 +29,11 @@ public override void Run(BuildContext context) { if (context.SkipImage(dockerImage)) continue; - string distro = dockerImage.Distro; string targetFramework = dockerImage.TargetFramework; targetFramework = targetFramework switch { - Constants.Version60 => $"net{targetFramework}", + Constants.Version60 or Constants.Version70 => $"net{targetFramework}", _ => targetFramework }; diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs index 1d074c925a..66fb26f978 100644 --- a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs +++ b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs @@ -23,7 +23,7 @@ public override void Run(BuildContext context) var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath; context.Information("\nTesting msbuild task with dotnet build (for .net core)\n"); - var frameworks = new[] { Constants.NetVersion60 }; + var frameworks = new[] { Constants.NetVersion60, Constants.NetVersion70 }; foreach (var framework in frameworks) { var dotnetMsBuildSettings = new DotNetMSBuildSettings(); diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs index 09534ae36f..7301bffbf1 100644 --- a/build/artifacts/Tasks/ArtifactsNativeTest.cs +++ b/build/artifacts/Tasks/ArtifactsNativeTest.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsNativeTest))] [TaskDescription("Tests the native executables in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)] [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(ArtifactsPrepare))] public class ArtifactsNativeTest : FrostingTask diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs index b30b05aee9..137fe26853 100644 --- a/build/artifacts/Tasks/ArtifactsPrepare.cs +++ b/build/artifacts/Tasks/ArtifactsPrepare.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsPrepare))] [TaskDescription("Pulls the docker images needed for testing the artifacts")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)] [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] public class ArtifactsPrepare : FrostingTask { diff --git a/build/artifacts/Tasks/ArtifactsTest.cs b/build/artifacts/Tasks/ArtifactsTest.cs index 559bfe3ec6..2cf57d98b0 100644 --- a/build/artifacts/Tasks/ArtifactsTest.cs +++ b/build/artifacts/Tasks/ArtifactsTest.cs @@ -5,7 +5,7 @@ namespace Artifacts.Tasks; [TaskName(nameof(ArtifactsTest))] [TaskDescription("Tests packages in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)] [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(ArtifactsNativeTest))] [IsDependentOn(typeof(ArtifactsDotnetToolTest))] diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs index ee5b82a786..f8ba3975ec 100644 --- a/build/build/Tasks/Test/UnitTest.cs +++ b/build/build/Tasks/Test/UnitTest.cs @@ -8,7 +8,7 @@ namespace Build.Tasks; [TaskName(nameof(UnitTest))] [TaskDescription("Run the unit tests")] -[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion60)] +[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion60, Constants.NetVersion70)] [IsDependentOn(typeof(Build))] public class UnitTest : FrostingTask { @@ -17,7 +17,7 @@ public class UnitTest : FrostingTask public override void Run(BuildContext context) { var dotnetTarget = context.Argument(Arguments.DotnetTarget, string.Empty); - var frameworks = new[] { Constants.NetVersion60 }; + var frameworks = new[] { Constants.NetVersion60, Constants.NetVersion70 }; if (!string.IsNullOrWhiteSpace(dotnetTarget)) { if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase)) diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs index 532107958a..2c1483e21d 100644 --- a/build/common/Utilities/Constants.cs +++ b/build/common/Utilities/Constants.cs @@ -6,10 +6,12 @@ public class Constants public const string Repository = "GitVersion"; public const string Version60 = "6.0"; + public const string Version70 = "7.0"; - public const string NetVersion60 = "net6.0"; + public const string NetVersion60 = $"net{Version60}"; + public const string NetVersion70 = $"net{Version70}"; - public static readonly string[] VersionsToBuild = { Version60 }; + public static readonly string[] VersionsToBuild = { Version60, Version70 }; public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 }; public static readonly string[] DistrosToSkip = { Alpine313, Alpine314, Centos7 }; @@ -26,6 +28,7 @@ public class Constants public const string Alpine313 = "alpine.3.13"; public const string Alpine314 = "alpine.3.14"; + public const string Alpine315 = "alpine.3.15"; public const string Centos7 = "centos.7"; public const string Centos8 = "centos.8"; public const string Debian10 = "debian.10"; @@ -39,6 +42,7 @@ public class Constants { Alpine313, Alpine314, + Alpine315, Centos7, Centos8, Debian10, diff --git a/build/common/Utilities/DockerContextExtensions.cs b/build/common/Utilities/DockerContextExtensions.cs index 7486ee701e..71cb6db1e4 100644 --- a/build/common/Utilities/DockerContextExtensions.cs +++ b/build/common/Utilities/DockerContextExtensions.cs @@ -145,7 +145,8 @@ private static void DockerTestRun(this BuildContextBase context, string image, A var output = context.DockerRunImage(settings, image, command, args); context.Information("Output : " + output); - Assert.Contains(context.Version?.GitVersion.FullSemVer, output); + Assert.NotNull(context.Version?.GitVersion); + Assert.Contains(context.Version.GitVersion.FullSemVer!, output); } private static IEnumerable GetDockerTags(this BuildContextBase context, DockerImage dockerImage, Architecture? arch = null) { diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs index 9f866b326c..5051da7c1d 100644 --- a/build/docker/Tasks/DockerBuild.cs +++ b/build/docker/Tasks/DockerBuild.cs @@ -5,7 +5,7 @@ namespace Docker.Tasks; [TaskName(nameof(DockerBuild))] [TaskDescription("Build the docker images containing the GitVersion Tool")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)] [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)] public class DockerBuild : FrostingTask diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs index 4d04efa413..4270a3f6d3 100644 --- a/build/docker/Tasks/DockerManifest.cs +++ b/build/docker/Tasks/DockerManifest.cs @@ -5,7 +5,7 @@ namespace Docker.Tasks; [TaskName(nameof(DockerManifest))] [TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)] [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(DockerManifestInternal))] public class DockerManifest : FrostingTask diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs index c5c15b8e3a..2f8d4b080f 100644 --- a/build/docker/Tasks/DockerPublish.cs +++ b/build/docker/Tasks/DockerPublish.cs @@ -5,7 +5,7 @@ namespace Docker.Tasks; [TaskName(nameof(DockerPublish))] [TaskDescription("Publish the docker images containing the GitVersion Tool")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)] [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)] [IsDependentOn(typeof(DockerPublishInternal))] diff --git a/build/docker/Tasks/DockerTest.cs b/build/docker/Tasks/DockerTest.cs index dd86824cd4..97332ab517 100644 --- a/build/docker/Tasks/DockerTest.cs +++ b/build/docker/Tasks/DockerTest.cs @@ -5,7 +5,7 @@ namespace Docker.Tasks; [TaskName(nameof(DockerTest))] [TaskDescription("Test the docker images containing the GitVersion Tool")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] -[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] +[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)] [TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)] [IsDependentOn(typeof(DockerBuild))] diff --git a/build/global.json b/build/global.json deleted file mode 100644 index 07fa13d9ea..0000000000 --- a/build/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - "version": "5.0", - "rollForward": "latestMajor", - "allowPrerelease": true - } -} diff --git a/dotnet-tools.json b/dotnet-tools.json index 09789d57a2..4228ef64f0 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -20,7 +20,7 @@ "dotnet-gitreleasemanager" ] }, - "Wyam2.Tool": { + "Wyam2": { "version": "3.0.0", "commands": [ "wyam2" diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 845e9145ab..8fc43e7d6d 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -18,7 +18,7 @@ 1591,8618 embedded - 10 + 11 enable enable diff --git a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj index 180f5611c0..294d2c0b01 100644 --- a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj +++ b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net7.0 true diff --git a/src/GitVersion.App/GitVersion.App.csproj b/src/GitVersion.App/GitVersion.App.csproj index ac73795313..6e1aa25731 100644 --- a/src/GitVersion.App/GitVersion.App.csproj +++ b/src/GitVersion.App/GitVersion.App.csproj @@ -4,14 +4,14 @@ Exe GitVersion gitversion - net6.0 + net6.0;net7.0 AnyCPU MIT - net6.0 + net6.0;net7.0 diff --git a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj index 6ffeea0ace..23d088dfbc 100644 --- a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj +++ b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 full false diff --git a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj index 65ac88c7d9..1636b1aaf6 100644 --- a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj +++ b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 true diff --git a/src/GitVersion.MsBuild/nuget-files.props b/src/GitVersion.MsBuild/nuget-files.props index edd431cfc1..5c53cb2806 100644 --- a/src/GitVersion.MsBuild/nuget-files.props +++ b/src/GitVersion.MsBuild/nuget-files.props @@ -2,7 +2,9 @@ ../GitVersion.App/bin/$(Configuration)/net6.0/publish + ../GitVersion.App/bin/$(Configuration)/net7.0/publish tools/net6.0 + tools/net7.0 @@ -10,6 +12,8 @@ + +