diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 727a54e2c..92f1dbb02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - 9c70886ce692eb31afed39239ff5921abab65798 + 2be63be7944666ad0c9f7079db7d265b08d8af03 - + https://github.com/dotnet/windowsdesktop - 9c70886ce692eb31afed39239ff5921abab65798 + 2be63be7944666ad0c9f7079db7d265b08d8af03 - + https://github.com/dotnet/windowsdesktop - 9c70886ce692eb31afed39239ff5921abab65798 + 2be63be7944666ad0c9f7079db7d265b08d8af03 - + https://github.com/dotnet/windowsdesktop - 9c70886ce692eb31afed39239ff5921abab65798 + 2be63be7944666ad0c9f7079db7d265b08d8af03 - + https://github.com/dotnet/llvm-project - c1304304028d603e34f6803b0740c34441f80d2e + 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 @@ -53,38 +53,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + 04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 - + https://github.com/dotnet/aspnetcore - 59a0a28436a4a8785302e71d40ac7fd58890a967 + f5aa46ea26c2c8ed9088d094f2186df7f23e64a7 https://github.com/dotnet/test-templates @@ -103,44 +103,44 @@ 1128a34b1d7a579d5209f3fbe5ce2f4fda103fcc - + https://github.com/dotnet/sdk - a8e9c118bd0a2f797ac799cb293b091204694e34 + 391eef06e36b8d5636367d5e761e7a6293d49621 - + https://github.com/dotnet/sdk - a8e9c118bd0a2f797ac799cb293b091204694e34 + 391eef06e36b8d5636367d5e761e7a6293d49621 - + https://github.com/dotnet/sdk - a8e9c118bd0a2f797ac799cb293b091204694e34 + 391eef06e36b8d5636367d5e761e7a6293d49621 - + https://github.com/dotnet/sdk - a8e9c118bd0a2f797ac799cb293b091204694e34 + 391eef06e36b8d5636367d5e761e7a6293d49621 - + https://github.com/dotnet/winforms - 8eae0a9764548296263b8d7de19115cd7f9834c2 + a332a1fec8ddac6172ac149ff46c085cf2beeb43 - + https://github.com/dotnet/wpf - 0d7c37b9e225939c41da228ec38a229e5862532c + c9a6d9f821616f6f119088d50da6d0d0ce4891d5 - + https://github.com/dotnet/fsharp - 753fc58b631d7a5f7f0b085d4a3adb3b4d47c7e6 + 430d645d778ec0db10ad7ad0b02de9fab3ce5647 - + https://github.com/dotnet/fsharp - 753fc58b631d7a5f7f0b085d4a3adb3b4d47c7e6 + 430d645d778ec0db10ad7ad0b02de9fab3ce5647 - + https://github.com/microsoft/vstest - 713a8cdc0cebcbd0dbdff4bcd039ac2d51504452 + d94aafd04f9ebecda6d36cce3f8cc1605d88f4ed @@ -149,41 +149,41 @@ linker - + https://github.com/dotnet/roslyn - c5d3485aaab167b5b8d19ae8c317c7cf1693a08a + 91902d4dd2c07549fb64357ed5c3a0ee9d7c3610 - + https://github.com/dotnet/msbuild - 2db11c256ade886f673ed56d12780fb70e6ef92e + 3d01db7c23495c327f010b6392961082839041a6 - + https://github.com/nuget/nuget.client - b396ad8b56c089ec3fa189f1013530d237a0e8c2 + d22c6743bf6237c39b98d5d680e06e6c33e97f1c https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 8d8d2122b16c81df4b158fe43995f958e8fe115e + 76e6b338e87093ddc9b3b650f027706aba65d388 - + https://github.com/dotnet/emsdk - 8d8d2122b16c81df4b158fe43995f958e8fe115e + 76e6b338e87093ddc9b3b650f027706aba65d388 https://github.com/dotnet/deployment-tools c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - e53b62ccc6a887987efdb820334594b674f6071d + 6e9ede1f2771f59d80a4050c02d051bbbd457c77 diff --git a/eng/Versions.props b/eng/Versions.props index 3f2dd5e62..515285694 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,11 +30,11 @@ - 7.0.0-rc.2.22431.4 + 7.0.0-rc.2.22431.7 - 7.0.0-rc.2.22431.4 + 7.0.0-rc.2.22431.6 @@ -49,46 +49,46 @@ - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 - 7.0.0-rc.2.22452.11 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 + 7.0.0-rc.2.22464.23 0.2.0 - 7.0.100-rc.2.22456.13 - 7.0.100-rc.2.22456.13 - 7.0.100-rc.2.22456.13 + 7.0.100-rc.2.22465.9 + 7.0.100-rc.2.22465.9 + 7.0.100-rc.2.22465.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rc.2.22451.11 + 7.0.0-rc.2.22464.18 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 - 7.0.0-rc.2.22451.11 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 + 7.0.0-rc.2.22464.18 2.1.0 - 7.0.0-rc.2.22431.6 - 7.0.0-rc.2.22431.6 - 7.0.0-rc.2.22431.6 - 7.0.0-rc.2.22431.6 + 7.0.0-rc.2.22459.5 + 7.0.0-rc.2.22459.5 + 7.0.0-rc.2.22459.5 + 7.0.0-rc.2.22459.5 @@ -170,7 +170,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220905-03 + 17.4.0-preview-20220913-02 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rc.2.22430.5 - 7.0.0-rc.2.22430.5 + 7.0.0-rc.2.22459.3 + 7.0.0-rc.2.22459.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-sourcelink-submodule-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-sourcelink-submodule-workaround.patch deleted file mode 100644 index 1ab86bd3c..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-Revert-sourcelink-submodule-workaround.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9b529c2f911e9a7ad25586d0d4a8db8bc5a7b2e5 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Thu, 5 Aug 2021 22:44:48 +0000 -Subject: [PATCH] Revert sourcelink submodule workaround - -aspnetcore will fail the offline tarball build because of the sourcelink workaround being removed here. -To fix this, a sourcelink patch was added to address the issue. - -Backport: https://github.com/dotnet/source-build/issues/2708 ---- - eng/SourceBuild.props | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 3dbfe2ce7e..403b91f976 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -2,7 +2,6 @@ - - aspnetcore - true -- false - - - - - -- -- -- -- -- -- - -- 10 - true - Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools) - -diff --git a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj -index 26b5733684c3f..4df9075220402 100644 ---- a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj -+++ b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj -@@ -2,7 +2,7 @@ - - - Exe -- net6.0 -+ $(NetCoreAppToolCurrent) - latest - enable - diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch index f49d2ed95..c329100ec 100644 --- a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch +++ b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch @@ -12,9 +12,10 @@ diff --git a/Directory.Build.props b/Directory.Build.props index 1353696a29..4e7463a453 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -13,9 +13,11 @@ - net7.0 - $(SdkTargetFramework) +@@ -14,9 +14,11 @@ + + net6.0 - @@ -24,6 +25,6 @@ index 1353696a29..4e7463a453 100644 + CA1420 - Temporarily disable for source-build until SDK builds with latest toolset. + --> + $(NoWarn);NU1701;CA1420 + + true true - - diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch b/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch index bb3c2b80f..ae0617daa 100644 --- a/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch +++ b/src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch @@ -4,6 +4,7 @@ Date: Fri, 22 Jul 2022 15:10:08 -0700 Subject: [PATCH] Change TargetFramework to net7.0 --- + Directory.Build.props | 2 ++ .../Microsoft.DotNet.ApiCompat.Task.csproj | 2 +- .../build/Microsoft.DotNet.ApiCompat.Task.targets | 2 +- .../Microsoft.DotNet.ApiCompat.Tool.csproj | 2 +- @@ -11,12 +12,26 @@ Subject: [PATCH] Change TargetFramework to net7.0 .../Microsoft.DotNet.PackageValidation.csproj | 2 +- .../Microsoft.Extensions.DotNetDeltaApplier.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- - src/Layout/redist/targets/GenerateLayout.targets | 4 ++-- + src/Layout/redist/targets/GenerateLayout.targets | 2 +- src/Layout/redist/targets/OverlaySdkOnLKG.targets | 2 +- - 9 files changed, 10 insertions(+), 10 deletions(-) + .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 4 ++-- + 11 files changed, 13 insertions(+), 11 deletions(-) +diff --git a/Directory.Build.props b/Directory.Build.props +index 809b7c0668..10d7f2e1a2 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -17,6 +17,8 @@ + + net6.0 ++ ++ $(SdkTargetFramework) + + true diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj -index 2de17ce715..32e6580920 100644 +index 4d148d1360..8e2f52a7ac 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj @@ -1,7 +1,7 @@ -  + - net6.0 @@ -55,7 +70,7 @@ index 2de17ce715..32e6580920 100644 enable true diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj -index 7b8569a72b..b1e1e4d53e 100644 +index 4ee0173f24..c72ac850d1 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj @@ -1,7 +1,7 @@ @@ -94,12 +109,12 @@ index 40927ae1f2..3c2236e38d 100644 false 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 006f56939d..ddcfe2e362 100644 +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 @@ -107,18 +122,9 @@ index 006f56939d..ddcfe2e362 100644 diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets -index 85adb4ed8a..d399fe6f29 100644 +index 148464df9e..d399fe6f29 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets -@@ -161,7 +161,7 @@ - BeforeTargets="Build"> - - netcoreapp3.1 -- net6.0 -+ net7.0 - $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ - - @@ -196,7 +196,7 @@ @@ -141,3 +147,18 @@ index b31188d592..4052c1581b 100644 +diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +index fddcbefd6f..4a1830bd19 100644 +--- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj ++++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +@@ -1,8 +1,8 @@ +  + + +- net6.0;net472 +- net6.0 ++ $(ResolverTargetFramework);net472 ++ $(ResolverTargetFramework) + AnyCPU + win-x86;win-x64 + true