diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6989035ce..c954c1cc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,42 +5,42 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 1f8cf263480b63072fc7cf7461c7ea6923122a71 + 7ad7b59ff90d06dbde40df041c7694fd151b6435 - + https://github.com/dotnet/windowsdesktop - 1f8cf263480b63072fc7cf7461c7ea6923122a71 + 7ad7b59ff90d06dbde40df041c7694fd151b6435 - + https://github.com/dotnet/windowsdesktop - 1f8cf263480b63072fc7cf7461c7ea6923122a71 + 7ad7b59ff90d06dbde40df041c7694fd151b6435 - + https://github.com/dotnet/windowsdesktop - 1f8cf263480b63072fc7cf7461c7ea6923122a71 + 7ad7b59ff90d06dbde40df041c7694fd151b6435 - + https://github.com/dotnet/runtime - d775a3bb77add85dc30032b20c78c83f9a0e3c1f + 568ed4125d0ae62c0d82d8f3703854fcc04bf32d - + https://github.com/dotnet/runtime - d775a3bb77add85dc30032b20c78c83f9a0e3c1f + 568ed4125d0ae62c0d82d8f3703854fcc04bf32d - + https://github.com/dotnet/runtime - d775a3bb77add85dc30032b20c78c83f9a0e3c1f + 568ed4125d0ae62c0d82d8f3703854fcc04bf32d - + https://github.com/dotnet/runtime - d775a3bb77add85dc30032b20c78c83f9a0e3c1f + 568ed4125d0ae62c0d82d8f3703854fcc04bf32d - + https://github.com/dotnet/runtime - d775a3bb77add85dc30032b20c78c83f9a0e3c1f + 568ed4125d0ae62c0d82d8f3703854fcc04bf32d @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d775a3bb77add85dc30032b20c78c83f9a0e3c1f + 568ed4125d0ae62c0d82d8f3703854fcc04bf32d - + https://github.com/dotnet/aspnetcore - 115b73cf767ec8553bf2fd190e309b9115803f5f + ffa0a028464e13d46aaec0c5ad8de0725a4d5aa5 - + https://github.com/dotnet/aspnetcore - 115b73cf767ec8553bf2fd190e309b9115803f5f + ffa0a028464e13d46aaec0c5ad8de0725a4d5aa5 - + https://github.com/dotnet/aspnetcore - 115b73cf767ec8553bf2fd190e309b9115803f5f + ffa0a028464e13d46aaec0c5ad8de0725a4d5aa5 - + https://github.com/dotnet/aspnetcore - 115b73cf767ec8553bf2fd190e309b9115803f5f + ffa0a028464e13d46aaec0c5ad8de0725a4d5aa5 - + https://github.com/dotnet/aspnetcore - 115b73cf767ec8553bf2fd190e309b9115803f5f + ffa0a028464e13d46aaec0c5ad8de0725a4d5aa5 - + https://github.com/dotnet/aspnetcore - 115b73cf767ec8553bf2fd190e309b9115803f5f + ffa0a028464e13d46aaec0c5ad8de0725a4d5aa5 - + https://github.com/dotnet/aspnetcore - 115b73cf767ec8553bf2fd190e309b9115803f5f + ffa0a028464e13d46aaec0c5ad8de0725a4d5aa5 - + https://github.com/dotnet/sdk - b621820457728ae368de33b898470a1bb5bac5ac + 2863312d3bd79db89b467a4f5243f6b89bc8b2d6 - + https://github.com/dotnet/sdk - b621820457728ae368de33b898470a1bb5bac5ac + 2863312d3bd79db89b467a4f5243f6b89bc8b2d6 - + https://github.com/dotnet/sdk - b621820457728ae368de33b898470a1bb5bac5ac + 2863312d3bd79db89b467a4f5243f6b89bc8b2d6 - + https://github.com/dotnet/sdk - b621820457728ae368de33b898470a1bb5bac5ac + 2863312d3bd79db89b467a4f5243f6b89bc8b2d6 https://github.com/dotnet/test-templates @@ -120,54 +120,54 @@ c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://github.com/dotnet/winforms - ed598f3fe6403aa3aaa7659d21029f5f8924c6f4 + 3d2eea7ac142d4d459f3672c32a7e74bdde45612 - + https://github.com/dotnet/wpf - 2bfc70242c5184c3c44748f232eb3ecafca005b5 + 76f4e4c10005ad197a831e611e8f31b5a6d1e1b0 - + https://github.com/dotnet/fsharp - 0c5e24d19dc915b00b8755a8532bfb2582aa2b47 + c040d25693a071efb0df0deb24fca347802d0f22 - + https://github.com/dotnet/fsharp - 0c5e24d19dc915b00b8755a8532bfb2582aa2b47 + c040d25693a071efb0df0deb24fca347802d0f22 - + https://github.com/microsoft/vstest - fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 + f82bfa7cad1d5a6beaf08a789e4534623a78f53f - + https://github.com/dotnet/runtime - d775a3bb77add85dc30032b20c78c83f9a0e3c1f + 568ed4125d0ae62c0d82d8f3703854fcc04bf32d - + https://github.com/dotnet/roslyn - 8da753b65c4b05e086a29f7a2714ef40797728f7 + a151c1e6f707b478960cfc84a05c1f52a0daf001 - + https://github.com/dotnet/msbuild - 08494c73128451a3f7cfb47a5e9cbd63f5507a1f + ed404c0d68dc073a09c5c9402a5c56f65e7a29a8 - + https://github.com/nuget/nuget.client - b02fdbb36d34947c24496b2c0b505aa785bc657f + ec3e25481c88488630cabe436d3e53907a3b7b7b https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 97568ad0e2120f194df7ac3895e9589fcc8a255b + cd13d57eccb71580227d612efc2fa27c5512aef4 diff --git a/eng/Versions.props b/eng/Versions.props index dd54a742f..21eac8ba3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-alpha.1.23520.4 + 9.0.0-alpha.1.23525.8 - 9.0.0-alpha.1.23520.4 + 9.0.0-alpha.1.23526.3 @@ -71,50 +71,50 @@ - 9.0.0-alpha.1.23523.17 - 9.0.0-alpha.1.23523.17 - 9.0.0-alpha.1.23523.17 - 9.0.0-alpha.1.23523.17 - 9.0.0-alpha.1.23523.17 - 9.0.0-alpha.1.23523.17 - 9.0.0-alpha.1.23523.17 + 9.0.0-alpha.1.23525.5 + 9.0.0-alpha.1.23525.5 + 9.0.0-alpha.1.23525.5 + 9.0.0-alpha.1.23525.5 + 9.0.0-alpha.1.23525.5 + 9.0.0-alpha.1.23525.5 + 9.0.0-alpha.1.23525.5 0.2.0 - 9.0.100-alpha.1.23524.29 - 9.0.100-alpha.1.23524.29 - 9.0.100-alpha.1.23524.29 + 9.0.100-alpha.1.23527.9 + 9.0.100-alpha.1.23527.9 + 9.0.100-alpha.1.23527.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-1.23524.3 + 4.9.0-1.23526.18 - 9.0.0-alpha.1.23523.13 + 9.0.0-alpha.1.23527.2 - 9.0.0-alpha.1.23523.13 - 9.0.0-alpha.1.23523.13 - 9.0.0-alpha.1.23523.13 - 9.0.0-alpha.1.23523.13 - 9.0.0-alpha.1.23523.13 + 9.0.0-alpha.1.23527.2 + 9.0.0-alpha.1.23527.2 + 9.0.0-alpha.1.23527.2 + 9.0.0-alpha.1.23527.2 + 9.0.0-alpha.1.23527.2 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23521.3 - 9.0.0-alpha.1.23521.3 - 9.0.0-alpha.1.23521.3 - 9.0.0-alpha.1.23521.3 + 9.0.0-alpha.1.23526.7 + 9.0.0-alpha.1.23526.7 + 9.0.0-alpha.1.23526.7 + 9.0.0-alpha.1.23526.7 @@ -126,7 +126,7 @@ - 6.9.0-preview.1.18 + 6.9.0-preview.1.21 @@ -238,7 +238,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23519-02 + 17.9.0-preview-23525-02 8.0.0-alpha.1.22557.12 8.0.0-preview.23424.2 @@ -254,7 +254,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 9.0.0-alpha.1.23507.1 + 9.0.0-alpha.1.23523.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/sdk/0001-Use-net9.0-for-tool-dependencies.patch b/src/SourceBuild/patches/sdk/0001-Use-net9.0-for-tool-dependencies.patch index aa356f97c..438ed7427 100644 --- a/src/SourceBuild/patches/sdk/0001-Use-net9.0-for-tool-dependencies.patch +++ b/src/SourceBuild/patches/sdk/0001-Use-net9.0-for-tool-dependencies.patch @@ -13,19 +13,6 @@ diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redis index eab01ef144..922b959531 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets -@@ -112,9 +112,9 @@ - - - -- -- -- -+ -+ -+ - - - @@ -178,7 +178,7 @@ BeforeTargets="Build">