From 63d474f2126ac56969b2356e94b66d21b703cf85 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Fri, 22 Sep 2023 10:38:34 +0200 Subject: [PATCH 1/4] add branding to 17.9 --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 56574443865..7044a3bd338 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,8 +2,8 @@ - 17.8.0 - 17.7.0 + 17.9.0 + 17.8.0 15.1.0.0 preview true From fa0f78138bf2767b40547b403cb599d6ab7b5dde Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Fri, 22 Sep 2023 16:31:57 +0200 Subject: [PATCH 2/4] update PackageValidationBaselineVersion --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7044a3bd338..f1166235466 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 17.9.0 - 17.8.0 + 17.8.0-preview-23471-08 15.1.0.0 preview true From a222f0ec2c2df3d076fe32ee19c6275b072a1c77 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Mon, 25 Sep 2023 09:33:29 +0200 Subject: [PATCH 3/4] decrease tools.dotnet version 8.0.100-preview.7.23376.3 -> 8.0.100-preview.6.23330.14 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index d9967b3a53d..038162633ad 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "8.0.100-preview.6.23330.14", "vs": { "version": "17.6.0" }, From 4bfe7c75060d37a0d7ed4fd46e9084f544d07c73 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Mon, 25 Sep 2023 13:23:24 +0200 Subject: [PATCH 4/4] add ApiCompatPreserveUnnecessarySuppressions tag --- global.json | 24 +++++++++---------- src/Build/Microsoft.Build.csproj | 5 ++++ .../Microsoft.Build.Framework.csproj | 5 ++++ src/Tasks/Microsoft.Build.Tasks.csproj | 5 ++++ .../Microsoft.Build.Utilities.csproj | 5 ++++ 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/global.json b/global.json index 038162633ad..7a0263bee6b 100644 --- a/global.json +++ b/global.json @@ -1,15 +1,15 @@ { - "sdk": { - "allowPrerelease": true - }, - "tools": { - "dotnet": "8.0.100-preview.6.23330.14", - "vs": { - "version": "17.6.0" + "sdk": { + "allowPrerelease": true }, - "xcopy-msbuild": "17.6.0-2" - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2" - } + "tools": { + "dotnet": "8.0.100-preview.7.23376.3", + "vs": { + "version": "17.6.0" + }, + "xcopy-msbuild": "17.6.0-2" + }, + "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2" + } } diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj index 9a5b1175b0e..db15f2e0ced 100644 --- a/src/Build/Microsoft.Build.csproj +++ b/src/Build/Microsoft.Build.csproj @@ -26,6 +26,11 @@ $(NoWarn);NU5104 + + true + true + + diff --git a/src/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj index c0da0474e6c..1c044599152 100644 --- a/src/Framework/Microsoft.Build.Framework.csproj +++ b/src/Framework/Microsoft.Build.Framework.csproj @@ -27,6 +27,11 @@ + + true + true + + Shared\Constants.cs diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj index e11a7698f31..c2f5e698f87 100644 --- a/src/Tasks/Microsoft.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.Build.Tasks.csproj @@ -19,6 +19,11 @@ true + + true + true + + Resx diff --git a/src/Utilities/Microsoft.Build.Utilities.csproj b/src/Utilities/Microsoft.Build.Utilities.csproj index 5b9a22eba36..af17ff082a7 100644 --- a/src/Utilities/Microsoft.Build.Utilities.csproj +++ b/src/Utilities/Microsoft.Build.Utilities.csproj @@ -18,6 +18,11 @@ true + + true + true + +