diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 048248fb0..70996c15a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 71e223a38bfa0a76bd1b69ab264ab3083e10eed8 + e85a8eeca716274c5d543a66e1b4226c9fd7e065 - + https://github.com/dotnet/windowsdesktop - 71e223a38bfa0a76bd1b69ab264ab3083e10eed8 + e85a8eeca716274c5d543a66e1b4226c9fd7e065 - + https://github.com/dotnet/windowsdesktop - 71e223a38bfa0a76bd1b69ab264ab3083e10eed8 + e85a8eeca716274c5d543a66e1b4226c9fd7e065 - + https://github.com/dotnet/windowsdesktop - 71e223a38bfa0a76bd1b69ab264ab3083e10eed8 + e85a8eeca716274c5d543a66e1b4226c9fd7e065 - + https://github.com/dotnet/runtime - bc9dad2351827fdbbde7b10ff97f253a065d49e5 + 888bac304442e1a6883cfb922d21a74df910112d - + https://github.com/dotnet/runtime - bc9dad2351827fdbbde7b10ff97f253a065d49e5 + 888bac304442e1a6883cfb922d21a74df910112d - + https://github.com/dotnet/runtime - bc9dad2351827fdbbde7b10ff97f253a065d49e5 + 888bac304442e1a6883cfb922d21a74df910112d - + https://github.com/dotnet/runtime - bc9dad2351827fdbbde7b10ff97f253a065d49e5 + 888bac304442e1a6883cfb922d21a74df910112d - + https://github.com/dotnet/runtime - bc9dad2351827fdbbde7b10ff97f253a065d49e5 + 888bac304442e1a6883cfb922d21a74df910112d - + https://github.com/dotnet/runtime - bc9dad2351827fdbbde7b10ff97f253a065d49e5 + 888bac304442e1a6883cfb922d21a74df910112d @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - bc9dad2351827fdbbde7b10ff97f253a065d49e5 + 888bac304442e1a6883cfb922d21a74df910112d - + https://github.com/dotnet/aspnetcore - 730dac21a5991eb8f130717c12de22f46715b8c7 + 220b05497fc1deffb3480e59e361a5fffa25db78 - + https://github.com/dotnet/aspnetcore - 730dac21a5991eb8f130717c12de22f46715b8c7 + 220b05497fc1deffb3480e59e361a5fffa25db78 - + https://github.com/dotnet/aspnetcore - 730dac21a5991eb8f130717c12de22f46715b8c7 + 220b05497fc1deffb3480e59e361a5fffa25db78 - + https://github.com/dotnet/aspnetcore - 730dac21a5991eb8f130717c12de22f46715b8c7 + 220b05497fc1deffb3480e59e361a5fffa25db78 - + https://github.com/dotnet/aspnetcore - 730dac21a5991eb8f130717c12de22f46715b8c7 + 220b05497fc1deffb3480e59e361a5fffa25db78 - + https://github.com/dotnet/aspnetcore - 730dac21a5991eb8f130717c12de22f46715b8c7 + 220b05497fc1deffb3480e59e361a5fffa25db78 - + https://github.com/dotnet/aspnetcore - 730dac21a5991eb8f130717c12de22f46715b8c7 + 220b05497fc1deffb3480e59e361a5fffa25db78 https://github.com/dotnet/test-templates @@ -102,72 +102,72 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 831612e6da70206767fbc314c3a0263482ba4e68 + 77f9aaec2c4ea6dd392c72a28cd610bbf6fdfb30 - + https://github.com/dotnet/sdk - 831612e6da70206767fbc314c3a0263482ba4e68 + 77f9aaec2c4ea6dd392c72a28cd610bbf6fdfb30 - + https://github.com/dotnet/sdk - 831612e6da70206767fbc314c3a0263482ba4e68 + 77f9aaec2c4ea6dd392c72a28cd610bbf6fdfb30 - + https://github.com/dotnet/sdk - 831612e6da70206767fbc314c3a0263482ba4e68 + 77f9aaec2c4ea6dd392c72a28cd610bbf6fdfb30 - + https://github.com/dotnet/winforms - 42a162cb55c1155f10fd3f9ff524610633653e88 + ba9c95758d8e5edff18a69bd996769a93eb6a8d6 - + https://github.com/dotnet/wpf - 7228d1cadcdd6591c7869797df480b3d07f86277 + c3439bc20a3c2ee28d98e7d0eebcf7edcc37b7b9 - + https://github.com/dotnet/fsharp - 4aa2bf326fc98f39f6516c9b3be6ae73f2a50166 + dd9c7d9c3987ad625fdc47977a838cf98621c034 - + https://github.com/dotnet/fsharp - 4aa2bf326fc98f39f6516c9b3be6ae73f2a50166 + dd9c7d9c3987ad625fdc47977a838cf98621c034 - + https://github.com/microsoft/vstest - 9ded6180d38d3092df375a5a2cca83cc156f14ff + 2dd26c7ba502c3d98cbc66c02e35367062b66c07 - + https://github.com/dotnet/runtime - bc9dad2351827fdbbde7b10ff97f253a065d49e5 + 888bac304442e1a6883cfb922d21a74df910112d - + https://github.com/dotnet/roslyn - 2cfd4b21980e5f40ae367a122a00e2ed1a4c4a0b + 63019e999de19e9a451e381d6dbdd8f520e2907f - + https://github.com/dotnet/msbuild - 59879b095e5d93d4d23ac02f3fddc45862345330 + 7f4bef8b46b3ebc275219ec936837ebf9f32c148 - + https://github.com/nuget/nuget.client - f1757fe7a9a3e178562518f4535f71348a117010 + 4b10ba9db66078700d3cea25198d185fe5030a27 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 81590b9b847acc7ab0e16c93628a0ccdbf4d9ee9 + ab09b0b8d6768d58e09c033beea1570d4ca74c1f @@ -186,25 +186,25 @@ 89d4778cc9ed6063be7a2f92266bfc2952d95fdc - + https://github.com/dotnet/symreader - 0c29b7109c054bdc578e917515ae7e8635b9cb9d + 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 - + https://github.com/dotnet/arcade - 833d08dde7eca1590731085b73245a81de96bd10 + 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 - + https://github.com/dotnet/arcade - 833d08dde7eca1590731085b73245a81de96bd10 + 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 - + https://github.com/dotnet/arcade - 833d08dde7eca1590731085b73245a81de96bd10 + 1f8ffd35f5f4af2fd1c309c36f4dfcf7cffda4f6 https://github.com/dotnet/arcade-services @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - c896aec98150aae68c90b0579a24babc864ceb88 + 3e23b3bb8fb547e2431e80c6f510146d09aaae84 @@ -228,9 +228,9 @@ 47c52dd2ebf9edfd40abdcff999c13eb461f6ce2 - + https://github.com/dotnet/xliff-tasks - 40d8321047961765c1f4ff62070e4fc72e7b48c4 + d1dd46c475ca2599bcbb1637548b0be2513b83c3 diff --git a/eng/Versions.props b/eng/Versions.props index 5bc5ed9b9..5242b7140 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23259.1 + 8.0.0-beta.23260.3 @@ -41,11 +41,11 @@ - 8.0.0-preview.5.23251.5 + 8.0.0-preview.5.23259.3 - 8.0.0-preview.5.23251.1 + 8.0.0-preview.5.23260.1 @@ -65,50 +65,50 @@ - 8.0.0-preview.5.23252.26 - 8.0.0-preview.5.23252.26 - 8.0.0-preview.5.23252.26 - 8.0.0-preview.5.23252.26 - 8.0.0-preview.5.23252.26 - 8.0.0-preview.5.23252.26 - 8.0.0-preview.5.23252.26 + 8.0.0-preview.5.23260.10 + 8.0.0-preview.5.23260.10 + 8.0.0-preview.5.23260.10 + 8.0.0-preview.5.23260.10 + 8.0.0-preview.5.23260.10 + 8.0.0-preview.5.23260.10 + 8.0.0-preview.5.23260.10 0.2.0 - 8.0.100-preview.5.23253.7 - 8.0.100-preview.5.23253.7 - 8.0.100-preview.5.23253.7 + 8.0.100-preview.5.23261.1 + 8.0.100-preview.5.23261.1 + 8.0.100-preview.5.23261.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-2.23251.6 + 4.7.0-2.23260.9 - 8.0.0-preview.5.23252.13 + 8.0.0-preview.5.23260.3 - 8.0.0-preview.5.23252.13 - 8.0.0-preview.5.23252.13 - 8.0.0-preview.5.23252.13 - 8.0.0-preview.5.23252.13 - 8.0.0-preview.5.23252.13 - 8.0.0-preview.5.23252.13 + 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23260.3 2.1.0 - 8.0.0-preview.5.23252.1 - 8.0.0-preview.5.23252.1 - 8.0.0-preview.5.23252.1 - 8.0.0-preview.5.23252.1 + 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23260.3 + 8.0.0-preview.5.23260.3 @@ -222,7 +222,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview.23226.2 + 17.7.0-preview.23260.2 8.0.0-alpha.1.22557.12 @@ -235,7 +235,7 @@ 13.1.462-net8-p3 16.1.1250-net8-p3 - 8.0.0-preview.5.23225.2 + 8.0.0-preview.5.23252.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/global.json b/global.json index 709f6fc19..a755284bb 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23259.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23259.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23260.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23260.3" } } diff --git a/src/SourceBuild/patches/vstest/0001-Remove-IO-from-source-build-4426.patch b/src/SourceBuild/patches/vstest/0001-Remove-IO-from-source-build-4426.patch deleted file mode 100644 index 00d1ea37c..000000000 --- a/src/SourceBuild/patches/vstest/0001-Remove-IO-from-source-build-4426.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jakub Chocholowicz <59966772+jakubch1@users.noreply.github.com> -Date: Fri, 28 Apr 2023 16:38:18 +0200 -Subject: [PATCH] Remove IO from source build (#4426) - -Backport: https://github.com/microsoft/vstest/pull/4426 ---- - .../Microsoft.TestPlatform.CLI.csproj | 4 ++-- - .../Microsoft.TestPlatform.CLI.sourcebuild.nuspec | 1 - - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -index 6b5ea83b..330f3233 100644 ---- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -@@ -67,7 +67,7 @@ - - - -- -+ - - - -@@ -92,7 +92,7 @@ - - - -- -+ - - - -diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec -index dd1349a7..4fb6e868 100644 ---- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec -+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.sourcebuild.nuspec -@@ -18,7 +18,6 @@ - - - -- - - - diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 572b100b3..d9f961933 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -47,6 +47,7 @@ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\ $(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Worker\tools\$(DefaultToolTfm)\ + $(SdkOutputDirectory)Containers\tasks\$(DefaultToolTfm)\ @@ -67,6 +68,10 @@ + + + + @@ -77,6 +82,7 @@ +