From 6ff97aac7c137ed89f9b806dd23594a1db8e7cfb Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Wed, 13 Nov 2024 02:54:20 +0100 Subject: [PATCH 1/2] add .net9.0 target --- build/Directory.Build.props | 4 ++-- build/common/Utilities/Constants.cs | 2 +- new-cli/Directory.Build.props | 2 +- src/Directory.Build.props | 4 ++-- src/GitVersion.MsBuild/GitVersion.MsBuild.csproj | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build/Directory.Build.props b/build/Directory.Build.props index edbb8dac4d..97be940115 100644 --- a/build/Directory.Build.props +++ b/build/Directory.Build.props @@ -1,12 +1,12 @@  Exe - net8.0 + net9.0 $(MSBuildProjectDirectory) ..\..\run\ false enable - 12 + latest NU1604 enable diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs index d8817cccc8..6a21c36e31 100644 --- a/build/common/Utilities/Constants.cs +++ b/build/common/Utilities/Constants.cs @@ -7,7 +7,7 @@ public static class Constants public const string Repository = "GitVersion"; public const string VersionLatest = "8.0"; - public static readonly string[] DotnetVersions = [VersionLatest]; + public static readonly string[] DotnetVersions = [VersionLatest, "9.0"]; public const string DefaultBranch = "main"; public const string DefaultConfiguration = "Release"; diff --git a/new-cli/Directory.Build.props b/new-cli/Directory.Build.props index ea7d0c9db2..88b7cf62da 100644 --- a/new-cli/Directory.Build.props +++ b/new-cli/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net9.0 GitVersion latest diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6224b2b353..af1ddcba7f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net8.0;net9.0 $([System.DateTime]::Today.Year) GitTools and Contributors @@ -22,7 +22,7 @@ $(WarningsAsErrors);RS0016;RS0017;RS0022;RS0024;RS0025;RS0026;RS0027 embedded - 12 + latest enable enable en diff --git a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj index 61aed5a2d4..033f10f2b4 100644 --- a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj +++ b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj @@ -39,6 +39,7 @@ + From 75f1dfe799657076bc19c233b57e01973df2c324 Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Wed, 13 Nov 2024 02:54:38 +0100 Subject: [PATCH 2/2] updated rider run configurations --- build/.run/Artifacts DotnetTool Test.run.xml | 4 ++-- build/.run/Artifacts Executable Test.run.xml | 4 ++-- build/.run/Artifacts MsBuildCore Test.run.xml | 4 ++-- build/.run/Artifacts MsBuildFull Test.run.xml | 4 ++-- build/.run/Artifacts Native Test.run.xml | 4 ++-- build/.run/Artifacts Prepare.run.xml | 4 ++-- build/.run/Artifacts Test.run.xml | 4 ++-- build/.run/Build Docs.run.xml | 4 ++-- build/.run/Build Prepare.run.xml | 4 ++-- build/.run/Build.run.xml | 4 ++-- build/.run/Clean.run.xml | 2 +- build/.run/Code Format.run.xml | 4 ++-- build/.run/Default Artifacts.run.xml | 4 ++-- build/.run/Default Build.run.xml | 4 ++-- build/.run/Default Config.run.xml | 2 +- build/.run/Default Docker.run.xml | 4 ++-- build/.run/Default Docs.run.xml | 4 ++-- build/.run/Default Publish.run.xml | 4 ++-- build/.run/Docker Build.run.xml | 4 ++-- build/.run/Docker Manifest.run.xml | 4 ++-- build/.run/Docker Publish.run.xml | 4 ++-- build/.run/Docker Test.run.xml | 4 ++-- build/.run/DockerHub Readme Publish.run.xml | 4 ++-- build/.run/Generate Schemas.run.xml | 4 ++-- build/.run/Package Archive.run.xml | 4 ++-- build/.run/Package Chocolatey.run.xml | 4 ++-- build/.run/Package Nuget.run.xml | 4 ++-- build/.run/Package Prepare.run.xml | 4 ++-- build/.run/Package.run.xml | 4 ++-- build/.run/Preview Docs.run.xml | 4 ++-- build/.run/Publish Chocolatey.run.xml | 4 ++-- build/.run/Publish Docs.run.xml | 4 ++-- build/.run/Publish Nuget.run.xml | 6 ++--- build/.run/Publish Release.run.xml | 4 ++-- build/.run/PublishCoverage.run.xml | 4 ++-- build/.run/SetMatrix.run.xml | 2 +- build/.run/Test.run.xml | 4 ++-- build/.run/UnitTest (8.0).run.xml | 2 +- build/.run/UnitTest (9.0).run.xml | 23 +++++++++++++++++++ build/.run/Validate Version.run.xml | 4 ++-- 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 ++-- src/.run/cli (help).run.xml | 4 ++-- src/.run/cli (showconfig).run.xml | 4 ++-- src/.run/cli (version).run.xml | 4 ++-- src/.run/cli.run.xml | 6 ++--- src/.run/schema.run.xml | 6 ++--- 57 files changed, 135 insertions(+), 112 deletions(-) create mode 100644 build/.run/UnitTest (9.0).run.xml diff --git a/build/.run/Artifacts DotnetTool Test.run.xml b/build/.run/Artifacts DotnetTool Test.run.xml index 5a4546c2b5..f09edd6a7e 100644 --- a/build/.run/Artifacts DotnetTool Test.run.xml +++ b/build/.run/Artifacts DotnetTool Test.run.xml @@ -1,6 +1,6 @@ -