diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b389f260..8c60643d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - d5ed25ddb3b627e064014199fba4a4bd0266f249 + ef2dfa16fb10fa9fc5c00259b5e69a264b6a7263 - + https://github.com/dotnet/windowsdesktop - d5ed25ddb3b627e064014199fba4a4bd0266f249 + ef2dfa16fb10fa9fc5c00259b5e69a264b6a7263 - + https://github.com/dotnet/windowsdesktop - d5ed25ddb3b627e064014199fba4a4bd0266f249 + ef2dfa16fb10fa9fc5c00259b5e69a264b6a7263 - + https://github.com/dotnet/windowsdesktop - d5ed25ddb3b627e064014199fba4a4bd0266f249 + ef2dfa16fb10fa9fc5c00259b5e69a264b6a7263 - + https://github.com/dotnet/runtime - 5c5e66e6c067f8a82d514598575011cd21655ffb + 7ab7f83fb1bdfed781ceb8da066986184ac782a1 - + https://github.com/dotnet/runtime - 5c5e66e6c067f8a82d514598575011cd21655ffb + 7ab7f83fb1bdfed781ceb8da066986184ac782a1 - + https://github.com/dotnet/runtime - 5c5e66e6c067f8a82d514598575011cd21655ffb + 7ab7f83fb1bdfed781ceb8da066986184ac782a1 - + https://github.com/dotnet/runtime - 5c5e66e6c067f8a82d514598575011cd21655ffb + 7ab7f83fb1bdfed781ceb8da066986184ac782a1 - + https://github.com/dotnet/runtime - 5c5e66e6c067f8a82d514598575011cd21655ffb + 7ab7f83fb1bdfed781ceb8da066986184ac782a1 - + https://github.com/dotnet/runtime - 5c5e66e6c067f8a82d514598575011cd21655ffb + 7ab7f83fb1bdfed781ceb8da066986184ac782a1 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5c5e66e6c067f8a82d514598575011cd21655ffb + 7ab7f83fb1bdfed781ceb8da066986184ac782a1 - + https://github.com/dotnet/aspnetcore - da6cdcbd5dc75b695cee36d47a22e1399cbea89e + 5834b3eb52e196c7e7653ef6ec57fa9d394b82f5 - + https://github.com/dotnet/aspnetcore - da6cdcbd5dc75b695cee36d47a22e1399cbea89e + 5834b3eb52e196c7e7653ef6ec57fa9d394b82f5 - + https://github.com/dotnet/aspnetcore - da6cdcbd5dc75b695cee36d47a22e1399cbea89e + 5834b3eb52e196c7e7653ef6ec57fa9d394b82f5 - + https://github.com/dotnet/aspnetcore - da6cdcbd5dc75b695cee36d47a22e1399cbea89e + 5834b3eb52e196c7e7653ef6ec57fa9d394b82f5 - + https://github.com/dotnet/aspnetcore - da6cdcbd5dc75b695cee36d47a22e1399cbea89e + 5834b3eb52e196c7e7653ef6ec57fa9d394b82f5 - + https://github.com/dotnet/aspnetcore - da6cdcbd5dc75b695cee36d47a22e1399cbea89e + 5834b3eb52e196c7e7653ef6ec57fa9d394b82f5 - + https://github.com/dotnet/aspnetcore - da6cdcbd5dc75b695cee36d47a22e1399cbea89e + 5834b3eb52e196c7e7653ef6ec57fa9d394b82f5 https://github.com/dotnet/test-templates @@ -98,32 +98,32 @@ 135655caa47549d5598f08e433aa66557b8a7695 - + https://github.com/dotnet/templating - ad7832f9267ecd20f150a9ab75cd3c1ff21a380e + 302ab2bf2db02656f7b8af27b6a21a9a9106e851 - + https://github.com/dotnet/templating - ad7832f9267ecd20f150a9ab75cd3c1ff21a380e + 302ab2bf2db02656f7b8af27b6a21a9a9106e851 - + https://github.com/dotnet/sdk - 097c9203c352def8e5fe6ad6b73ae7cef37b97da + a66d4afb842eb8fcbbc312c483cbd433f4c36098 - + https://github.com/dotnet/sdk - 097c9203c352def8e5fe6ad6b73ae7cef37b97da + a66d4afb842eb8fcbbc312c483cbd433f4c36098 - + https://github.com/dotnet/winforms - 645aaf13ddf9e00a670f261dc88975fef8956da5 + c72e202daa0656fbecee52a4630b0c81550f742d - + https://github.com/dotnet/wpf - 6d3ffc00b70316dc9139a336be76095be8ea73ea + b6d5f2dfaa6c1971be42759125ed7569eb807ced https://github.com/dotnet/fsharp @@ -134,20 +134,20 @@ 211fd760c2315d73cfa0d375fe64abb346bc1096 - + https://github.com/microsoft/vstest - 8cb879729fe0d69c913b69a66b96bedb33879ed9 + 8a3ae5cadd49c6a3d3e39214985390e2f5229b73 - + https://github.com/dotnet/linker - 618eb724e7320fd2e4a2b6e8f7e0a22195a9e633 + 17033869c8e75e3805ba42af4c5509af72c8bb72 linker - + https://github.com/dotnet/roslyn - 069a85a786acae3be2c7b49e330b7f968a624c88 + 3bd38ba691ad9776bd4f641a6b9fd46295010372 @@ -155,9 +155,9 @@ 1c045cf58dcb0d2f0474364550eeab37877257a1 - + https://github.com/nuget/nuget.client - b8a61266d9a6780cb7eb9c1942695cf813fdef0a + 6f99a10b228b521bb5d2c7412bb2e3c43e6e7b3f @@ -170,9 +170,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - ea10b4e5534de1806cc2e84ddd3b00eabcab962f + 3fbbd97b47b5a71d7cf3ca2e197b0b93feaf975d https://github.com/dotnet/deployment-tools @@ -184,9 +184,9 @@ ab3eb7a525e31dc6fb4d9cc0b7154fa2be58dac1 - + https://github.com/dotnet/source-build-externals - 929686f9bb080937b5cd8f496527f4c02123a11e + 2754582d2b62e25a399c1048ac7be26aac9e0832 diff --git a/eng/Versions.props b/eng/Versions.props index e09796f33..18dbb1294 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,15 +30,15 @@ - 7.0.0-preview.6.22310.1 + 7.0.0-preview.6.22315.3 - 7.0.0-preview.6.22311.1 + 7.0.0-preview.6.22315.3 - 7.0.100-preview.6.22313.1 + 7.0.100-preview.6.22321.2 @@ -52,45 +52,45 @@ - 7.0.0-preview.6.22312.2 - 7.0.0-preview.6.22312.2 - 7.0.0-preview.6.22312.2 - 7.0.0-preview.6.22312.2 - 7.0.0-preview.6.22312.2 - 7.0.0-preview.6.22312.2 - 7.0.0-preview.6.22312.2 + 7.0.0-preview.6.22321.11 + 7.0.0-preview.6.22321.11 + 7.0.0-preview.6.22321.11 + 7.0.0-preview.6.22321.11 + 7.0.0-preview.6.22321.11 + 7.0.0-preview.6.22321.11 + 7.0.0-preview.6.22321.11 0.2.0 - 7.0.100-preview.6.22313.2 - 7.0.100-preview.6.22313.2 + 7.0.100-preview.6.22321.40 + 7.0.100-preview.6.22321.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-preview.6.22312.1 + 7.0.0-preview.6.22320.7 - 7.0.0-preview.6.22312.1 - 7.0.0-preview.6.22312.1 - 7.0.0-preview.6.22312.1 - 7.0.0-preview.6.22312.1 - 7.0.0-preview.6.22312.1 - 7.0.0-preview.6.22312.1 + 7.0.0-preview.6.22320.7 + 7.0.0-preview.6.22320.7 + 7.0.0-preview.6.22320.7 + 7.0.0-preview.6.22320.7 + 7.0.0-preview.6.22320.7 + 7.0.0-preview.6.22320.7 2.1.0 - 7.0.0-preview.6.22311.2 - 7.0.0-preview.6.22311.2 - 7.0.0-preview.6.22311.2 - 7.0.0-preview.6.22311.2 + 7.0.0-preview.6.22317.1 + 7.0.0-preview.6.22317.1 + 7.0.0-preview.6.22317.1 + 7.0.0-preview.6.22317.1 @@ -168,7 +168,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.0-preview-20220610-03 + 17.3.0-preview-20220620-08 @@ -201,7 +201,7 @@ 12.3.303 15.4.303 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-preview.6.22281.1 + 7.0.0-preview.6.22320.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch deleted file mode 100644 index 4baea9205..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Pin-Microsoft.Build-and-Microsoft.Extensions.Command.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Wed, 11 May 2022 21:16:46 +0000 -Subject: [PATCH] Pin Microsoft.Build and - Microsoft.Extensions.CommandLineUtils.Sources versions in source-build - -Update package version reference to not pick up the source-build PVP versions and instead utilize SBRP versions -so that source-build builds closer to the normal repo build. - -Backport: https://github.com/NuGet/NuGet.Client/pull/4643 ---- - build/packages.targets | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/packages.targets b/build/packages.targets -index 0ca4b1309..dc3db5b8e 100644 ---- a/build/packages.targets -+++ b/build/packages.targets -@@ -1,6 +1,6 @@ - - -- 16.8.0 -+ 16.8.0 - 13.0.1 - 3.0.0 - 4.5.0 -@@ -10,7 +10,7 @@ - 5.0.0 - 2.14.0-rtm-832 - 17.0.0-beta1-10402-05 -- 3.0.0-preview6.19253.5 -+ 3.0.0-preview6.19253.5 - - - diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Define-SystemCollectionsImmutableVersion-Versions.pr.patch b/src/SourceBuild/tarball/patches/sdk/0001-Define-SystemCollectionsImmutableVersion-Versions.pr.patch deleted file mode 100644 index 723458388..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Define-SystemCollectionsImmutableVersion-Versions.pr.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 10 Jun 2022 20:31:15 +0000 -Subject: [PATCH] Define SystemCollectionsImmutableVersion Versions.props - -Backport: https://github.com/dotnet/sdk/pull/26007 ---- - eng/Versions.props | 1 + - .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 08c828d775..8e359a44cb 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -29,6 +29,7 @@ - 2.0.1-servicing-26011-01 - 13.0.1 - $(NewtonsoftJsonPackageVersion) -+ 6.0.0 - 4.0.0 - 6.0.0 - 7.0.0-beta.22310.1 -diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -index 1a6ba41771..38a5b931db 100644 ---- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj -@@ -74,7 +74,7 @@ - Also download an old version and (later in the target ReferenceOlderSCIandSRM) - pass them to the compiler. --> - -- -+ - - -