diff --git a/NuGet.config b/NuGet.config index dbd29f96e..09e307a27 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,19 @@ + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33c6137b1..aa94ca744 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,47 @@ - - https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 417429fc040af552532bb07aad29e5e8639b840f - - https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 @@ -48,38 +49,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + d099f075e45d2aa6007a22b71b45a08758559f80 - - https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 - - - https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 - - https://github.com/dotnet/aspnetcore - 2651d9202b0bf5fdd081930cd7a4438ced351410 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + bb01bbf4433e27289b99001b7de6a582879d1835 https://github.com/dotnet/test-templates @@ -98,78 +99,78 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + 3f9beb17aec19fb589a86602e4452c2d0e3dde70 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + 3f9beb17aec19fb589a86602e4452c2d0e3dde70 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + 3f9beb17aec19fb589a86602e4452c2d0e3dde70 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + 3f9beb17aec19fb589a86602e4452c2d0e3dde70 - - https://github.com/dotnet/winforms - 993983be2ce14ca67f7ff09b8b04e9b8391b3339 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + e83409daa530605da4eb5f847c6740a520325d25 - - https://github.com/dotnet/wpf - a956caa0747c27f0b0776d845fafe0b05b2c7337 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 9f7329d4b4deab97603643eaa6607779d03568f1 - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 9f7329d4b4deab97603643eaa6607779d03568f1 - + https://github.com/microsoft/vstest - 576a7cc1b259976393cf576a6a9c5df967bb2b7d + b61973970a544ea30d03ac35b6f5535adb64fd4c - + https://github.com/dotnet/linker - 219e84c88def8276179f66282b2f7cb5f1d0d126 + 22376ee081ea791b4c8bfa82509f8e45af4bc629 linker - + https://github.com/dotnet/roslyn - 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb + 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 - + https://github.com/dotnet/msbuild - 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef + d14b74d6f08ab7f2e17706359a38f8c22b569cb5 - + https://github.com/nuget/nuget.client - 1a082949ae5b6da7ca2cce047396c53ae1afdde7 + 125f673fd1cdb3cc012f62aa3ce764d2460b89eb https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools @@ -201,9 +202,9 @@ https://github.com/dotnet/arcade f36ea231c234560514ede4c2747897a737ced28f - + https://github.com/dotnet/source-build-reference-packages - 8366acfc3e0660ceef6bddbe7794044e5d503521 + 29cef6e67cbd7989db409037f0c1fe0af21384ad diff --git a/eng/Versions.props b/eng/Versions.props index 9cd63ca22..31985605f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22476.8 + 7.0.0-rtm.22518.7 - 7.0.0-rtm.22476.6 + 7.0.0-rtm.22518.2 @@ -50,46 +50,46 @@ - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 - 7.0.0-rtm.22504.29 + 7.0.0 + 7.0.0 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 0.2.0 - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 + 7.0.200 + 7.0.200-preview.22564.32 + 7.0.200-preview.22564.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22505.15 + 7.0.0 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 + 7.0.0-rtm.22518.5 + 7.0.0-rtm.22518.5 + 7.0.0 + 7.0.0 + 7.0.0 + 7.0.0 2.1.0 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 + 7.0.0-rtm.22519.1 + 7.0.0-rtm.22519.1 + 7.0.0 + 7.0.0 @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-release-20220926-01 + 17.5.0-preview-20221111-01 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 9a61647b4..7bf88fdd6 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -85,11 +85,11 @@ NewText="/p:RepoRoot="$repo_root/"" /> - + Outputs="$(RepoCompletedSemaphorePath)AddNoWarns.complete" > true + + CS9057 diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch new file mode 100644 index 000000000..62a4f8d31 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Fri, 12 Aug 2022 23:02:54 +0000 +Subject: [PATCH] IDE0060 workaround + +Backport: https://github.com/dotnet/roslyn-analyzers/issues/6228 +--- + src/Http/Routing/src/Matching/Ascii.cs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Http/Routing/src/Matching/Ascii.cs b/src/Http/Routing/src/Matching/Ascii.cs +index 081af0bb07..393a9eb65f 100644 +--- a/src/Http/Routing/src/Matching/Ascii.cs ++++ b/src/Http/Routing/src/Matching/Ascii.cs +@@ -12,7 +12,6 @@ internal static class Ascii + // and we know that the spans are the same length. + // + // Similar to https://github.com/dotnet/coreclr/blob/master/src/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs#L549 +- [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool AsciiIgnoreCaseEquals(ReadOnlySpan a, ReadOnlySpan b, int length) + { + // The caller should have checked the length. We enforce that here by THROWING if the diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch new file mode 100644 index 000000000..b98759d70 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Thu, 27 Oct 2022 02:47:08 +0000 +Subject: [PATCH] Address obsolete errors + +Backport: https://github.com/dotnet/aspnetcore/pull/44734 +--- + src/Servers/Kestrel/Core/src/KestrelServerOptions.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs +index f31880e891..fc6322dd41 100644 +--- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs ++++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs +@@ -252,9 +252,6 @@ public class KestrelServerOptions + writer.WritePropertyName(nameof(AllowResponseHeaderCompression)); + writer.WriteBooleanValue(AllowResponseHeaderCompression); + +- writer.WritePropertyName(nameof(EnableAltSvc)); +- writer.WriteBooleanValue(EnableAltSvc); +- + writer.WritePropertyName(nameof(IsDevCertLoaded)); + writer.WriteBooleanValue(IsDevCertLoaded); + diff --git a/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch b/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch deleted file mode 100644 index d875d0aeb..000000000 --- a/src/SourceBuild/tarball/patches/command-line-api/0001-Update-projects-to-net7.0-TFM-with-shared-property.patch +++ /dev/null @@ -1,268 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 19 Jul 2022 14:47:28 -0700 -Subject: [PATCH] Update projects to net7.0 TFM with shared property, Only enable trimming for .NET Core - -Backport PR: https://github.com/dotnet/command-line-api/pull/1803 ---- - Directory.Build.props | 1 + - global.json | 7 ++++--- - .../System.CommandLine.ApiCompatibility.Tests.csproj | 2 +- - .../System.CommandLine.Benchmarks.csproj | 4 ++-- - .../System.CommandLine.DragonFruit.Tests.csproj | 2 +- - .../System.CommandLine.Generator.Tests.csproj | 2 +- - .../System.CommandLine.Hosting.Tests.csproj | 2 +- - .../System.CommandLine.NamingConventionBinder.Tests.csproj | 2 +- - .../System.CommandLine.Rendering.Tests.csproj | 2 +- - .../EndToEndTestApp/EndToEndTestApp.csproj | 2 +- - .../dotnet-suggest.Tests.csproj | 2 +- - src/System.CommandLine.Suggest/dotnet-suggest.csproj | 2 +- - .../System.CommandLine.Tests.csproj | 2 +- - .../TestApps/NativeAOT/NativeAOT.csproj | 4 ++-- - .../TestApps/Trimming/Trimming.csproj | 4 ++-- - src/System.CommandLine/System.CommandLine.csproj | 7 +++++-- - 16 files changed, 26 insertions(+), 21 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index c0c5f79a..901c57c7 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -9,6 +9,7 @@ - $(NoWarn);CS8714;CS8765;CS8600;CS8601;CS8602;CS8603;CS8604 - MIT - 10.0 -+ net7.0 - - - -diff --git a/global.json b/global.json -index 1c6fd268..f5bec611 100644 ---- a/global.json -+++ b/global.json -@@ -1,12 +1,13 @@ - { - "tools": { -- "dotnet": "6.0.100", -+ "dotnet": "7.0.100-preview.6.22352.1", - "runtimes": { - "dotnet": [ -- "5.0.10" -+ "5.0.17", -+ "6.0.7" - ] - }, -- "xcopy-msbuild": "16.10.0-preview2" -+ "xcopy-msbuild": "17.1.0" - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22168.2" -diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj -index 30bcd139..4cc48fde 100644 ---- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj -+++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - false - - -diff --git a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -index e54aabc4..185ba62a 100644 ---- a/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -+++ b/src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj -@@ -9,8 +9,8 @@ - false - - -- net461;net5.0;net6.0; -- net5.0;net6.0; -+ net461;net5.0;net6.0;net7.0 -+ net5.0;net6.0;net7.0 - - - False -diff --git a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj -index 7eee0b38..e504f7e8 100644 ---- a/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj -+++ b/src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - AutoGeneratedProgram - - true -diff --git a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj -index a423eb1e..20f0f410 100644 ---- a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj -+++ b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - true - true -diff --git a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj -index 328b4e12..8e2cd6ea 100644 ---- a/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj -+++ b/src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj -@@ -1,7 +1,7 @@ -  - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - false - -diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj -index 43eb7c29..7bff1796 100644 ---- a/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj -+++ b/src/System.CommandLine.NamingConventionBinder.Tests/System.CommandLine.NamingConventionBinder.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - 10 - -diff --git a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj -index 1c116508..afd6dc6a 100644 ---- a/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj -+++ b/src/System.CommandLine.Rendering.Tests/System.CommandLine.Rendering.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - false - - -diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj -index 9a3eb54d..76add0d5 100644 ---- a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj -+++ b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj -@@ -6,7 +6,7 @@ - - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj -index da6abedf..f1711a10 100644 ---- a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj -+++ b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj -@@ -1,7 +1,7 @@ - - - -- net6.0 -+ $(TargetFrameworkForNETSDK) - - - -diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj -index fd825008..ce4bda1d 100644 ---- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj -+++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj -@@ -1,7 +1,7 @@ -  - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - true - true - dotnet-suggest -diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj -index c1988ec4..44b5c9fc 100644 ---- a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj -+++ b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj -@@ -1,6 +1,6 @@ -  - -- net6.0 -+ $(TargetFrameworkForNETSDK) - $(TargetFrameworks);net462 - false - -diff --git a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj -index b0036ed0..cc306fea 100644 ---- a/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj -+++ b/src/System.CommandLine.Tests/TestApps/NativeAOT/NativeAOT.csproj -@@ -2,13 +2,13 @@ - - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - - false - - - -- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll -+ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll - - - -diff --git a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj -index 6dcf8892..615b0764 100644 ---- a/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj -+++ b/src/System.CommandLine.Tests/TestApps/Trimming/Trimming.csproj -@@ -2,7 +2,7 @@ - - - Exe -- net6.0 -+ $(TargetFrameworkForNETSDK) - enable - enable - true -@@ -10,7 +10,7 @@ - - - -- ..\..\..\System.CommandLine\bin\Release\net6.0\System.CommandLine.dll -+ ..\..\..\System.CommandLine\bin\Release\$(TargetFrameworkForNETSDK)\System.CommandLine.dll - - - -diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj -index 424053a6..37115d70 100644 ---- a/src/System.CommandLine/System.CommandLine.csproj -+++ b/src/System.CommandLine/System.CommandLine.csproj -@@ -3,7 +3,7 @@ - - true - System.CommandLine -- net6.0;netstandard2.0 -+ $(TargetFrameworkForNETSDK);netstandard2.0 - enable - true - 10 -@@ -15,9 +15,12 @@ - * Test and debug support - - true -+ true -+ -+ -+ - true - true -- true - - - diff --git a/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch new file mode 100644 index 000000000..e8b8f38fd --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0001-Address-Microsoft.Build.Locator-prebuilt.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Tue, 15 Nov 2022 17:34:00 +0000 +Subject: [PATCH] Address Microsoft.Build.Locator prebuilt + +Backport: https://github.com/dotnet/format/issues/1759 +--- + Directory.Packages.props | 2 +- + eng/Versions.props | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index c4bf3cf..f7e85b2 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -10,7 +10,7 @@ + + + +- ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index fcd583b..2933963 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -14,6 +14,7 @@ + + + 17.3.0-preview-22302-02 ++ 1.5.5 + 3.3.3 + 7.0.0-rc.1.22426.10 + diff --git a/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch b/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch deleted file mode 100644 index 2285f0472..000000000 --- a/src/SourceBuild/tarball/patches/format/0001-Update-nullability-constraints-for-BeginScope-in-Sim.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Mon, 16 May 2022 16:29:43 -0700 -Subject: [PATCH] Update nullability constraints for BeginScope in - SimpleConsoleLogger - -Workaround for: https://github.com/dotnet/format/issues/1609 ---- - src/Logging/SimpleConsoleLogger.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs -index fd8015c..2971595 100644 ---- a/src/Logging/SimpleConsoleLogger.cs -+++ b/src/Logging/SimpleConsoleLogger.cs -@@ -64,7 +64,7 @@ public bool IsEnabled(LogLevel logLevel) - return (int)logLevel >= (int)_minimalLogLevel; - } - -- public IDisposable BeginScope(TState state) -+ public IDisposable? BeginScope(TState state) where TState : notnull - { - return NullScope.Instance; - } diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch deleted file mode 100644 index 1a9573cb5..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-Use-the-source-built-version-of-ref-packs-and-don-t-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 15 Sep 2022 14:46:53 -0500 -Subject: [PATCH] Use the source-built version of ref packs and don't use app - host when building in source-build. - -Backport PR: https://github.com/dotnet/roslyn/pull/64055. - ---- - Directory.Build.targets | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 8f38a48cd95..dfb4fd33c9a 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -1,5 +1,20 @@ - - -+ -+ -+ -+ 6.0.0 -+ -+ -+ 6.0.0 -+ -+ -+ -+ -+ -+ false -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch deleted file mode 100644 index 02e49eec9..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0001-Remove-llvm-ObjWriter-dependency-in-source-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Mon, 26 Sep 2022 14:25:33 -0500 -Subject: Remove LLVM ObjWriter dependency in source-build - -Backport PR: https://github.com/dotnet/runtime/pull/76206. - ---- - src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -index 8c4fce523906e..4fd1db03e8a48 100644 ---- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -@@ -48,12 +48,14 @@ - - - true -+ -+ true - - - - - -- -+ - $(ObjWriterVersion) - - -@@ -62,7 +64,7 @@ - $(NetStandardLibraryVersion) - - -- -+ - PreserveNewest - false - false diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch deleted file mode 100644 index dd0d19c7a..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 20 Sep 2022 10:10:29 -0700 -Subject: [PATCH] Look for msbuild net7.0 artifacts - -Backport: https://github.com/dotnet/sdk/pull/28425 ---- - .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -index 03ea923734..3246138cf9 100644 ---- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -@@ -22,7 +22,7 @@ - - - -- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll -+ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll - - -