diff --git a/.github/actions/docker-test/action.yml b/.github/actions/docker-test/action.yml
index 801a016040..4552612fd4 100644
--- a/.github/actions/docker-test/action.yml
+++ b/.github/actions/docker-test/action.yml
@@ -9,7 +9,7 @@ inputs:
default: 'debian.11'
targetFramework:
description: '.net version'
- default: '7.0'
+ default: '8.0'
runs:
using: 'composite'
diff --git a/.github/workflows/_artifacts_linux.yml b/.github/workflows/_artifacts_linux.yml
index 538029df32..a61eab319e 100644
--- a/.github/workflows/_artifacts_linux.yml
+++ b/.github/workflows/_artifacts_linux.yml
@@ -23,8 +23,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
- targetFramework: [ '7.0', '6.0' ]
+ distro: [ alpine.3.17, alpine.3.18, centos.stream.8, debian.11, fedora.37, ubuntu.20.04, ubuntu.22.04 ]
+ targetFramework: [ '6.0', '7.0', '8.0' ]
steps:
-
diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml
index 3194ee5a85..aded9a2c61 100644
--- a/.github/workflows/_docker.yml
+++ b/.github/workflows/_docker.yml
@@ -19,8 +19,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
- targetFramework: [ '7.0', '6.0' ]
+ distro: [ alpine.3.17, alpine.3.18, centos.stream.8, debian.11, fedora.37, ubuntu.20.04, ubuntu.22.04 ]
+ targetFramework: [ '6.0', '7.0', '8.0' ]
steps:
-
diff --git a/.github/workflows/_docker_manifests.yml b/.github/workflows/_docker_manifests.yml
index d69ffdfd20..840acc422f 100644
--- a/.github/workflows/_docker_manifests.yml
+++ b/.github/workflows/_docker_manifests.yml
@@ -12,8 +12,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
- targetFramework: [ '7.0', '6.0' ]
+ distro: [ alpine.3.17, alpine.3.18, centos.stream.8, debian.11, fedora.37, ubuntu.20.04, ubuntu.22.04 ]
+ targetFramework: [ '6.0', '7.0', '8.0' ]
steps:
-
diff --git a/.github/workflows/_unit_tests.yml b/.github/workflows/_unit_tests.yml
index e66c2bd588..c3cb53d4a1 100644
--- a/.github/workflows/_unit_tests.yml
+++ b/.github/workflows/_unit_tests.yml
@@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
- targetFramework: [net7.0, net6.0]
+ targetFramework: [ 'net8.0', 'net7.0', 'net6.0' ]
runs-on: ${{ matrix.os }}
steps:
@@ -34,6 +34,6 @@ jobs:
-
name: Test Summary
uses: test-summary/action@v2
- if: matrix.targetFramework == 'net7.0'
+ if: matrix.targetFramework == 'net8.0'
with:
paths: artifacts/test-results/*.results.xml
diff --git a/build/.run/Artifacts DotnetTool Test.run.xml b/build/.run/Artifacts DotnetTool Test.run.xml
index 02a8559140..20fd374236 100644
--- a/build/.run/Artifacts DotnetTool Test.run.xml
+++ b/build/.run/Artifacts DotnetTool Test.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Artifacts Executable Test.run.xml b/build/.run/Artifacts Executable Test.run.xml
index 42720de594..e28ceedea3 100644
--- a/build/.run/Artifacts Executable Test.run.xml
+++ b/build/.run/Artifacts Executable Test.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Artifacts MsBuildCore Test.run.xml b/build/.run/Artifacts MsBuildCore Test.run.xml
index 91c1dc3302..c4b5ba1afb 100644
--- a/build/.run/Artifacts MsBuildCore Test.run.xml
+++ b/build/.run/Artifacts MsBuildCore Test.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Artifacts MsBuildFull Test.run.xml b/build/.run/Artifacts MsBuildFull Test.run.xml
index f9abd084ee..31b7b025f3 100644
--- a/build/.run/Artifacts MsBuildFull Test.run.xml
+++ b/build/.run/Artifacts MsBuildFull Test.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Artifacts Native Test.run.xml b/build/.run/Artifacts Native Test.run.xml
index 306c6154b8..636a58a15f 100644
--- a/build/.run/Artifacts Native Test.run.xml
+++ b/build/.run/Artifacts Native Test.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Artifacts Prepare.run.xml b/build/.run/Artifacts Prepare.run.xml
index 7feacda9ce..b4174ecce7 100644
--- a/build/.run/Artifacts Prepare.run.xml
+++ b/build/.run/Artifacts Prepare.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Artifacts Test.run.xml b/build/.run/Artifacts Test.run.xml
index 4d21c37bd8..961588aed2 100644
--- a/build/.run/Artifacts Test.run.xml
+++ b/build/.run/Artifacts Test.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Build Docs.run.xml b/build/.run/Build Docs.run.xml
index be01724548..2057ab88d0 100644
--- a/build/.run/Build Docs.run.xml
+++ b/build/.run/Build Docs.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Build Prepare.run.xml b/build/.run/Build Prepare.run.xml
index b5b3bbff79..2d64a908d0 100644
--- a/build/.run/Build Prepare.run.xml
+++ b/build/.run/Build Prepare.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Build.run.xml b/build/.run/Build.run.xml
index bc0c4f7173..18bffb4512 100644
--- a/build/.run/Build.run.xml
+++ b/build/.run/Build.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Clean.run.xml b/build/.run/Clean.run.xml
index 5a5fae3811..ae7016c4ef 100644
--- a/build/.run/Clean.run.xml
+++ b/build/.run/Clean.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Code Format.run.xml b/build/.run/Code Format.run.xml
index c52608257c..ce22ecc7ef 100644
--- a/build/.run/Code Format.run.xml
+++ b/build/.run/Code Format.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Default Artifacts.run.xml b/build/.run/Default Artifacts.run.xml
index 9a48b09d3d..b11ae50ad5 100644
--- a/build/.run/Default Artifacts.run.xml
+++ b/build/.run/Default Artifacts.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Default Build.run.xml b/build/.run/Default Build.run.xml
index cbfab80b2b..40b932706d 100644
--- a/build/.run/Default Build.run.xml
+++ b/build/.run/Default Build.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Default Chores.run.xml b/build/.run/Default Chores.run.xml
index cadf959bc4..a4642c17d7 100644
--- a/build/.run/Default Chores.run.xml
+++ b/build/.run/Default Chores.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Default Docker.run.xml b/build/.run/Default Docker.run.xml
index 19b72d7457..ec02b99b91 100644
--- a/build/.run/Default Docker.run.xml
+++ b/build/.run/Default Docker.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Default Docs.run.xml b/build/.run/Default Docs.run.xml
index cc770ed886..2741e3a8a7 100644
--- a/build/.run/Default Docs.run.xml
+++ b/build/.run/Default Docs.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Default Publish.run.xml b/build/.run/Default Publish.run.xml
index e2e1407ce0..dfe8c455d3 100644
--- a/build/.run/Default Publish.run.xml
+++ b/build/.run/Default Publish.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Docker Build.run.xml b/build/.run/Docker Build.run.xml
index 16047c55d8..b66208dc37 100644
--- a/build/.run/Docker Build.run.xml
+++ b/build/.run/Docker Build.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Docker Manifest.run.xml b/build/.run/Docker Manifest.run.xml
index 5d17a533b4..1b6f1665d7 100644
--- a/build/.run/Docker Manifest.run.xml
+++ b/build/.run/Docker Manifest.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Docker Publish.run.xml b/build/.run/Docker Publish.run.xml
index e09b831984..ca71ad19ca 100644
--- a/build/.run/Docker Publish.run.xml
+++ b/build/.run/Docker Publish.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Docker Test.run.xml b/build/.run/Docker Test.run.xml
index 139a381cb6..e8aaf3e25a 100644
--- a/build/.run/Docker Test.run.xml
+++ b/build/.run/Docker Test.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/DockerHub Readme Publish.run.xml b/build/.run/DockerHub Readme Publish.run.xml
index 073a2a0a3c..abccf7c47f 100644
--- a/build/.run/DockerHub Readme Publish.run.xml
+++ b/build/.run/DockerHub Readme Publish.run.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/build/.run/Generate Schemas.run.xml b/build/.run/Generate Schemas.run.xml
index bc5bdbaace..e8b7a008a7 100644
--- a/build/.run/Generate Schemas.run.xml
+++ b/build/.run/Generate Schemas.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Package Archive.run.xml b/build/.run/Package Archive.run.xml
index 84f49ad9d4..7f6fdf601f 100644
--- a/build/.run/Package Archive.run.xml
+++ b/build/.run/Package Archive.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Package Chocolatey.run.xml b/build/.run/Package Chocolatey.run.xml
index a941f14e04..f623b0b793 100644
--- a/build/.run/Package Chocolatey.run.xml
+++ b/build/.run/Package Chocolatey.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Package Nuget.run.xml b/build/.run/Package Nuget.run.xml
index 220260d456..f7d26d597c 100644
--- a/build/.run/Package Nuget.run.xml
+++ b/build/.run/Package Nuget.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Package Prepare.run.xml b/build/.run/Package Prepare.run.xml
index 654cd166e1..a4f1c9a96e 100644
--- a/build/.run/Package Prepare.run.xml
+++ b/build/.run/Package Prepare.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Package.run.xml b/build/.run/Package.run.xml
index 9fa83bd848..1bc955563d 100644
--- a/build/.run/Package.run.xml
+++ b/build/.run/Package.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Preview Docs.run.xml b/build/.run/Preview Docs.run.xml
index 6dc9e36366..22fe19e0d6 100644
--- a/build/.run/Preview Docs.run.xml
+++ b/build/.run/Preview Docs.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Publish Chocolatey.run.xml b/build/.run/Publish Chocolatey.run.xml
index ac789c6e18..7b74022d81 100644
--- a/build/.run/Publish Chocolatey.run.xml
+++ b/build/.run/Publish Chocolatey.run.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/build/.run/Publish Docs.run.xml b/build/.run/Publish Docs.run.xml
index 01e2e382b5..a7291c7f94 100644
--- a/build/.run/Publish Docs.run.xml
+++ b/build/.run/Publish Docs.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Publish Nuget.run.xml b/build/.run/Publish Nuget.run.xml
index bb2f04913c..8c0d06dc9b 100644
--- a/build/.run/Publish Nuget.run.xml
+++ b/build/.run/Publish Nuget.run.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/build/.run/Publish Release.run.xml b/build/.run/Publish Release.run.xml
index 940b7327a4..fcf6261525 100644
--- a/build/.run/Publish Release.run.xml
+++ b/build/.run/Publish Release.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/PublishCoverage.run.xml b/build/.run/PublishCoverage.run.xml
index 2acf49a988..e5179a9657 100644
--- a/build/.run/PublishCoverage.run.xml
+++ b/build/.run/PublishCoverage.run.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/build/.run/Test.run.xml b/build/.run/Test.run.xml
index f56c7cc9fd..44f174179f 100644
--- a/build/.run/Test.run.xml
+++ b/build/.run/Test.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Tools Install.run.xml b/build/.run/Tools Install.run.xml
index 2ec75929d8..af61847fe0 100644
--- a/build/.run/Tools Install.run.xml
+++ b/build/.run/Tools Install.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/Tools Update.run.xml b/build/.run/Tools Update.run.xml
index 5a5c4debee..0d57a12a19 100644
--- a/build/.run/Tools Update.run.xml
+++ b/build/.run/Tools Update.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/UnitTest (6.0).run.xml b/build/.run/UnitTest (6.0).run.xml
index ed46c440de..72c6d1aa38 100644
--- a/build/.run/UnitTest (6.0).run.xml
+++ b/build/.run/UnitTest (6.0).run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/UnitTest (7.0).run.xml b/build/.run/UnitTest (7.0).run.xml
index bf97e9375a..c23ab78beb 100644
--- a/build/.run/UnitTest (7.0).run.xml
+++ b/build/.run/UnitTest (7.0).run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/.run/UnitTest (8.0).run.xml b/build/.run/UnitTest (8.0).run.xml
new file mode 100644
index 0000000000..509643230c
--- /dev/null
+++ b/build/.run/UnitTest (8.0).run.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/.run/Validate Version.run.xml b/build/.run/Validate Version.run.xml
index 2f91fd5a0c..b16e1c4915 100644
--- a/build/.run/Validate Version.run.xml
+++ b/build/.run/Validate Version.run.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index 5dc19ed4be..c22a23648c 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -1,7 +1,7 @@
Exe
- net7.0
+ net8.0
$(MSBuildProjectDirectory)
..\..\run\
false
diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
index b8beb47b32..9419b532dd 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, Constants.Version70)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
[IsDependentOn(typeof(ArtifactsPrepare))]
public class ArtifactsDotnetToolTest : FrostingTask
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
index b5b75e6984..1308e49992 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, Constants.Version70)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
[IsDependentOn(typeof(ArtifactsPrepare))]
public class ArtifactsMsBuildCoreTest : FrostingTask
@@ -38,7 +38,7 @@ public override void Run(BuildContext context)
var targetFramework = framework switch
{
- Constants.Version60 or Constants.Version70 => $"net{framework}",
+ Constants.Version60 or Constants.Version70 or Constants.Version80 => $"net{framework}",
_ => framework
};
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
index 9c191a96ab..65ac175fd8 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
@@ -23,8 +23,7 @@ public override void Run(BuildContext context)
var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
context.Information("\nTesting msbuild task with dotnet build\n");
- var frameworks = new[] { Constants.NetVersion60, Constants.NetVersion70 };
- foreach (var framework in frameworks)
+ foreach (var framework in Constants.Frameworks)
{
var dotnetMsBuildSettings = new DotNetMSBuildSettings();
dotnetMsBuildSettings.SetTargetFramework(framework);
diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs
index e9dfc26540..d0fdcf983a 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, Constants.Version70)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
[IsDependentOn(typeof(ArtifactsPrepare))]
public class ArtifactsNativeTest : FrostingTask
diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs
index a7b712618b..be061d4188 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, Constants.Version70)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
public class ArtifactsPrepare : FrostingTask
{
diff --git a/build/artifacts/Tasks/ArtifactsTest.cs b/build/artifacts/Tasks/ArtifactsTest.cs
index 8d4a3c5bc8..020260f6f7 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, Constants.Version70)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
[IsDependentOn(typeof(ArtifactsNativeTest))]
[IsDependentOn(typeof(ArtifactsDotnetToolTest))]
diff --git a/build/build/BuildLifetime.cs b/build/build/BuildLifetime.cs
index 5b71d31a86..fb16f3e2e2 100644
--- a/build/build/BuildLifetime.cs
+++ b/build/build/BuildLifetime.cs
@@ -41,5 +41,8 @@ private static void SetMsBuildSettingsVersion(BuildContext context)
msBuildSettings.WithProperty("RepositoryCommit", version.GitVersion.Sha);
msBuildSettings.WithProperty("NoPackageAnalysis", "true");
msBuildSettings.WithProperty("UseSharedCompilation", "false");
+
+ // https://github.com/dotnet/docs/issues/37674
+ msBuildSettings.WithProperty("IncludeSourceRevisionInInformationalVersion", "false");
}
}
diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs
index f8ba3975ec..381eba3c6a 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, Constants.NetVersion70)]
+[TaskArgument(Arguments.DotnetTarget, Constants.NetVersion60, Constants.NetVersion70, Constants.NetVersion80)]
[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, Constants.NetVersion70 };
+ var frameworks = Constants.Frameworks;
if (!string.IsNullOrWhiteSpace(dotnetTarget))
{
if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))
diff --git a/build/common/Lifetime/BuildLifetimeBase.cs b/build/common/Lifetime/BuildLifetimeBase.cs
index a00e0cc574..ec4a52be57 100644
--- a/build/common/Lifetime/BuildLifetimeBase.cs
+++ b/build/common/Lifetime/BuildLifetimeBase.cs
@@ -30,12 +30,12 @@ public override void Setup(T context, ISetupContext info)
context.Information("Running BuildPrepare...");
return;
}
- var gitversionTool = context.GetGitVersionDotnetToolLocation();
+ var gitVersionTool = context.GetGitVersionDotnetToolLocation();
var gitVersionSettings = new GitVersionSettings
{
- OutputTypes = new HashSet { GitVersionOutput.Json, GitVersionOutput.BuildServer },
+ OutputTypes = new() { GitVersionOutput.Json, GitVersionOutput.BuildServer },
ToolPath = context.Tools.Resolve(new[] { "dotnet.exe", "dotnet" }),
- ArgumentCustomization = args => args.Prepend(gitversionTool!.FullPath)
+ ArgumentCustomization = args => args.Prepend(gitVersionTool!.FullPath)
};
var gitVersion = context.GitVersion(gitVersionSettings);
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
index 5ea66c239e..530e31e32e 100644
--- a/build/common/Utilities/Constants.cs
+++ b/build/common/Utilities/Constants.cs
@@ -7,19 +7,23 @@ public class Constants
public const string Version60 = "6.0";
public const string Version70 = "7.0";
- public const string VersionLatest = Version70;
+ public const string Version80 = "8.0";
+ public const string VersionLatest = Version80;
public const string NetVersion60 = $"net{Version60}";
public const string NetVersion70 = $"net{Version70}";
+ public const string NetVersion80 = $"net{Version80}";
public const string NetVersionLatest = $"net{VersionLatest}";
public const string DefaultBranch = "main";
public const string DefaultConfiguration = "Release";
public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
- public static readonly string[] VersionsToBuild = { Version60, Version70 };
- public static readonly string[] DistrosToSkipForArtifacts = { Centos7 };
- public static readonly string[] DistrosToSkipForDocker = { Centos7 };
+ public static readonly string[] VersionsToBuild = { Version60, Version70, Version80 };
+ public static readonly string[] Frameworks = { NetVersion60, NetVersion70, NetVersion80 };
+
+ public static readonly string[] DistrosToSkipForArtifacts = Array.Empty();
+ public static readonly string[] DistrosToSkipForDocker = Array.Empty();
public const string DockerBaseImageName = "gittools/build-images";
public const string DockerImageName = "gittools/gitversion";
@@ -32,27 +36,25 @@ public class Constants
public const string Arm64 = "arm64";
public const string Amd64 = "amd64";
- public const string Alpine316 = "alpine.3.16";
public const string Alpine317 = "alpine.3.17";
- public const string Centos7 = "centos.7";
+ public const string Alpine318 = "alpine.3.18";
public const string CentosStream8 = "centos.stream.8";
- public const string Fedora36 = "fedora.36";
public const string Debian11 = "debian.11";
+ public const string Fedora37 = "fedora.37";
public const string Ubuntu2004 = "ubuntu.20.04";
public const string Ubuntu2204 = "ubuntu.22.04";
public const string DockerDistroLatest = Debian11;
public const string DebianLatest = Debian11;
public const string UbuntuLatest = Ubuntu2204;
- public const string AlpineLatest = Alpine317;
+ public const string AlpineLatest = Alpine318;
public static readonly string[] DockerDistrosToBuild =
{
- Alpine316,
Alpine317,
- Centos7,
+ Alpine318,
CentosStream8,
- Fedora36,
Debian11,
+ Fedora37,
Ubuntu2004,
Ubuntu2204
};
diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs
index 7060273157..35aa4285b1 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, Constants.Version70)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
[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 82488571d3..e5f50e98b1 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, Constants.Version70)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
[IsDependentOn(typeof(DockerManifestInternal))]
public class DockerManifest : FrostingTask
diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs
index d9df9d7b59..11922ab391 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, Constants.Version70)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
[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 7a64f700b0..dbe409f922 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, Constants.Version70)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70, Constants.Version80)]
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
[IsDependentOn(typeof(DockerBuild))]
diff --git a/global.json b/global.json
index 06ce1b4852..77acfaee36 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,11 @@
{
+ "projects": [
+ "build",
+ "src"
+ ],
"sdk": {
- "version": "7.0.400"
+ "version": "8.0.100-rc.2.23502.2",
+ "rollForward": "latestMajor",
+ "allowPrerelease": true
}
}
diff --git a/new-cli/.run/Calculate.run.xml b/new-cli/.run/Calculate.run.xml
index 6095c8fb0e..0eafa18c92 100644
--- a/new-cli/.run/Calculate.run.xml
+++ b/new-cli/.run/Calculate.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Config Help.run.xml b/new-cli/.run/Config Help.run.xml
index e4a425e103..1010e91c4e 100644
--- a/new-cli/.run/Config Help.run.xml
+++ b/new-cli/.run/Config Help.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Config Init.run.xml b/new-cli/.run/Config Init.run.xml
index e7c37732f7..a9710c930c 100644
--- a/new-cli/.run/Config Init.run.xml
+++ b/new-cli/.run/Config Init.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Config Show.run.xml b/new-cli/.run/Config Show.run.xml
index 2790aee205..732ae409a4 100644
--- a/new-cli/.run/Config Show.run.xml
+++ b/new-cli/.run/Config Show.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Help.run.xml b/new-cli/.run/Help.run.xml
index 09b0c32203..1942858a7d 100644
--- a/new-cli/.run/Help.run.xml
+++ b/new-cli/.run/Help.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Normalize.run.xml b/new-cli/.run/Normalize.run.xml
index 0be4ac1d98..2c30468dce 100644
--- a/new-cli/.run/Normalize.run.xml
+++ b/new-cli/.run/Normalize.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Output AssemblyInfo.run.xml b/new-cli/.run/Output AssemblyInfo.run.xml
index 7e55a597a4..6e59af4e57 100644
--- a/new-cli/.run/Output AssemblyInfo.run.xml
+++ b/new-cli/.run/Output AssemblyInfo.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Output Help.run.xml b/new-cli/.run/Output Help.run.xml
index 3d48195289..1950abc17f 100644
--- a/new-cli/.run/Output Help.run.xml
+++ b/new-cli/.run/Output Help.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Output Project.run.xml b/new-cli/.run/Output Project.run.xml
index 2ae5d289ae..5d8cf02a32 100644
--- a/new-cli/.run/Output Project.run.xml
+++ b/new-cli/.run/Output Project.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Output Wix.run.xml b/new-cli/.run/Output Wix.run.xml
index c600607cac..fa1fdd93b2 100644
--- a/new-cli/.run/Output Wix.run.xml
+++ b/new-cli/.run/Output Wix.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Tester.run.xml b/new-cli/.run/Tester.run.xml
index f7553250bd..5870f80cee 100644
--- a/new-cli/.run/Tester.run.xml
+++ b/new-cli/.run/Tester.run.xml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/.run/Version.run.xml b/new-cli/.run/Version.run.xml
index 6e55e9104c..7cb482298e 100644
--- a/new-cli/.run/Version.run.xml
+++ b/new-cli/.run/Version.run.xml
@@ -1,6 +1,6 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/new-cli/Directory.Build.props b/new-cli/Directory.Build.props
index b8d763132a..be7b21400c 100644
--- a/new-cli/Directory.Build.props
+++ b/new-cli/Directory.Build.props
@@ -1,6 +1,6 @@
- net7.0
+ net8.0
GitVersion
latest
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 51dfc5f75d..7df32d55ab 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,6 @@
- net6.0;net7.0
+ net6.0;net7.0;net8.0
$([System.DateTime]::Today.Year)
GitTools and Contributors
diff --git a/src/GitVersion.App/GitVersion.App.csproj b/src/GitVersion.App/GitVersion.App.csproj
index 055a4f3630..6b750ebedd 100644
--- a/src/GitVersion.App/GitVersion.App.csproj
+++ b/src/GitVersion.App/GitVersion.App.csproj
@@ -10,7 +10,7 @@
- net6.0;net7.0
+ net6.0;net7.0;net8.0
diff --git a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
index e4456f6734..be3f594dc4 100644
--- a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
+++ b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
@@ -36,6 +36,7 @@
+
diff --git a/tests/scripts/test-msbuild-task.sh b/tests/scripts/test-msbuild-task.sh
index e17b5a46fc..b75db70371 100644
--- a/tests/scripts/test-msbuild-task.sh
+++ b/tests/scripts/test-msbuild-task.sh
@@ -1,5 +1,5 @@
#!/usr/bin/sh
-# sh /scripts/test-msbuild-task.sh --version 5.7.1-beta1.56 --nugetPath /nuget --repoPath /repo/tests/integration --targetframework net7.0
+# sh /scripts/test-msbuild-task.sh --version 6.0.0 --nugetPath /nuget --repoPath /repo/tests/integration --targetframework net8.0
while test "$#" -gt 0
do
case $1 in