From a4273d1c598455dc972527282658c888db00097b Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Mon, 6 Nov 2023 12:46:03 +0100 Subject: [PATCH] Update Target Framework Moniker to net8.0 Upgraded the Target Framework Moniker (TFM) from net7.0 to net8.0 in multiple configurations, project files, and script files. This includes modifying the task arguments, project configurations, constants, and GitHub workflows to reflect the changes made to accommodate the new net8.0 framework. The SDK version has been updated in the global.json file to "8.0.100-rc.2.23502.2", and additional properties such as "allowPrerelease" and "rollForward" have been set. In the BuildLifetime.cs file, a new property "IncludeSourceRevisionInInformationalVersion" has also been added to address a specific issue namely, 'dotnet/docs#37674'. --- .github/actions/docker-test/action.yml | 2 +- .github/workflows/_artifacts_linux.yml | 4 ++-- .github/workflows/_docker.yml | 4 ++-- .github/workflows/_docker_manifests.yml | 4 ++-- .github/workflows/_unit_tests.yml | 4 ++-- build/.run/Artifacts DotnetTool Test.run.xml | 2 +- build/.run/Artifacts Executable Test.run.xml | 2 +- build/.run/Artifacts MsBuildCore Test.run.xml | 2 +- build/.run/Artifacts MsBuildFull Test.run.xml | 2 +- build/.run/Artifacts Native Test.run.xml | 2 +- build/.run/Artifacts Prepare.run.xml | 2 +- build/.run/Artifacts Test.run.xml | 2 +- build/.run/Build Docs.run.xml | 2 +- build/.run/Build Prepare.run.xml | 2 +- build/.run/Build.run.xml | 2 +- build/.run/Clean.run.xml | 2 +- build/.run/Code Format.run.xml | 2 +- build/.run/Default Artifacts.run.xml | 2 +- build/.run/Default Build.run.xml | 2 +- build/.run/Default Chores.run.xml | 2 +- build/.run/Default Docker.run.xml | 2 +- build/.run/Default Docs.run.xml | 2 +- build/.run/Default Publish.run.xml | 2 +- build/.run/Docker Build.run.xml | 2 +- build/.run/Docker Manifest.run.xml | 2 +- build/.run/Docker Publish.run.xml | 2 +- build/.run/Docker Test.run.xml | 2 +- build/.run/DockerHub Readme Publish.run.xml | 2 +- build/.run/Generate Schemas.run.xml | 2 +- build/.run/Package Archive.run.xml | 2 +- build/.run/Package Chocolatey.run.xml | 2 +- build/.run/Package Nuget.run.xml | 2 +- build/.run/Package Prepare.run.xml | 2 +- build/.run/Package.run.xml | 2 +- build/.run/Preview Docs.run.xml | 2 +- build/.run/Publish Chocolatey.run.xml | 2 +- build/.run/Publish Docs.run.xml | 2 +- build/.run/Publish Nuget.run.xml | 2 +- build/.run/Publish Release.run.xml | 2 +- build/.run/PublishCoverage.run.xml | 2 +- build/.run/Test.run.xml | 2 +- build/.run/Tools Install.run.xml | 2 +- build/.run/Tools Update.run.xml | 2 +- build/.run/UnitTest (6.0).run.xml | 2 +- build/.run/UnitTest (7.0).run.xml | 2 +- build/.run/UnitTest (8.0).run.xml | 20 ++++++++++++++++ build/.run/Validate Version.run.xml | 2 +- build/Directory.Build.props | 2 +- .../Tasks/ArtifactsDotnetToolTest.cs | 2 +- .../Tasks/ArtifactsMsBuildCoreTest.cs | 4 ++-- .../Tasks/ArtifactsMsBuildFullTest.cs | 3 +-- build/artifacts/Tasks/ArtifactsNativeTest.cs | 2 +- build/artifacts/Tasks/ArtifactsPrepare.cs | 2 +- build/artifacts/Tasks/ArtifactsTest.cs | 2 +- build/build/BuildLifetime.cs | 3 +++ build/build/Tasks/Test/UnitTest.cs | 4 ++-- build/common/Lifetime/BuildLifetimeBase.cs | 6 ++--- build/common/Utilities/Constants.cs | 24 ++++++++++--------- build/docker/Tasks/DockerBuild.cs | 2 +- build/docker/Tasks/DockerManifest.cs | 2 +- build/docker/Tasks/DockerPublish.cs | 2 +- build/docker/Tasks/DockerTest.cs | 2 +- global.json | 8 ++++++- new-cli/.run/Calculate.run.xml | 4 ++-- new-cli/.run/Config Help.run.xml | 4 ++-- new-cli/.run/Config Init.run.xml | 4 ++-- new-cli/.run/Config Show.run.xml | 4 ++-- new-cli/.run/Help.run.xml | 4 ++-- new-cli/.run/Normalize.run.xml | 4 ++-- new-cli/.run/Output AssemblyInfo.run.xml | 4 ++-- new-cli/.run/Output Help.run.xml | 4 ++-- new-cli/.run/Output Project.run.xml | 4 ++-- new-cli/.run/Output Wix.run.xml | 4 ++-- new-cli/.run/Tester.run.xml | 6 ++--- new-cli/.run/Version.run.xml | 4 ++-- new-cli/Directory.Build.props | 2 +- src/Directory.Build.props | 2 +- src/GitVersion.App/GitVersion.App.csproj | 2 +- .../GitVersion.MsBuild.csproj | 1 + tests/scripts/test-msbuild-task.sh | 2 +- 80 files changed, 140 insertions(+), 109 deletions(-) create mode 100644 build/.run/UnitTest (8.0).run.xml 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 @@