From 6c63e5c3194bf290af8ff647d35de9be66ed9444 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 17:58:43 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#18440) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Thalman --- eng/Version.Details.xml | 124 +++++++++--------- eng/Versions.props | 50 +++---- .../0001-Explicitly-set-net9.0-TFM.patch | 14 +- 3 files changed, 94 insertions(+), 94 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd1ff50a5..7c3043b2e 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 - fba94d7a096cb102ee2ea8a2214010d5c02460c4 + 4feebc7df48f42a8cb8f2c0ad620ffce61e86a8e - + https://github.com/dotnet/windowsdesktop - fba94d7a096cb102ee2ea8a2214010d5c02460c4 + 4feebc7df48f42a8cb8f2c0ad620ffce61e86a8e - + https://github.com/dotnet/windowsdesktop - fba94d7a096cb102ee2ea8a2214010d5c02460c4 + 4feebc7df48f42a8cb8f2c0ad620ffce61e86a8e - + https://github.com/dotnet/windowsdesktop - fba94d7a096cb102ee2ea8a2214010d5c02460c4 + 4feebc7df48f42a8cb8f2c0ad620ffce61e86a8e - + https://github.com/dotnet/runtime - bcc1d3d6f00fbcea3f454b2e35bceeaa51e604b1 + d40c654c274fe4f4afe66328f0599130f3eb2ea6 - + https://github.com/dotnet/runtime - bcc1d3d6f00fbcea3f454b2e35bceeaa51e604b1 + d40c654c274fe4f4afe66328f0599130f3eb2ea6 - + https://github.com/dotnet/runtime - bcc1d3d6f00fbcea3f454b2e35bceeaa51e604b1 + d40c654c274fe4f4afe66328f0599130f3eb2ea6 - + https://github.com/dotnet/runtime - bcc1d3d6f00fbcea3f454b2e35bceeaa51e604b1 + d40c654c274fe4f4afe66328f0599130f3eb2ea6 - + https://github.com/dotnet/runtime - bcc1d3d6f00fbcea3f454b2e35bceeaa51e604b1 + d40c654c274fe4f4afe66328f0599130f3eb2ea6 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - bcc1d3d6f00fbcea3f454b2e35bceeaa51e604b1 + d40c654c274fe4f4afe66328f0599130f3eb2ea6 - + https://github.com/dotnet/aspnetcore - bd016947b6928159814950c06a6e2278be7a256f + 70abdab0a5969fd7746479c1fae4697bce2dbc92 - + https://github.com/dotnet/aspnetcore - bd016947b6928159814950c06a6e2278be7a256f + 70abdab0a5969fd7746479c1fae4697bce2dbc92 - + https://github.com/dotnet/aspnetcore - bd016947b6928159814950c06a6e2278be7a256f + 70abdab0a5969fd7746479c1fae4697bce2dbc92 - + https://github.com/dotnet/aspnetcore - bd016947b6928159814950c06a6e2278be7a256f + 70abdab0a5969fd7746479c1fae4697bce2dbc92 - + https://github.com/dotnet/aspnetcore - bd016947b6928159814950c06a6e2278be7a256f + 70abdab0a5969fd7746479c1fae4697bce2dbc92 - + https://github.com/dotnet/aspnetcore - bd016947b6928159814950c06a6e2278be7a256f + 70abdab0a5969fd7746479c1fae4697bce2dbc92 - + https://github.com/dotnet/aspnetcore - bd016947b6928159814950c06a6e2278be7a256f + 70abdab0a5969fd7746479c1fae4697bce2dbc92 - + https://github.com/dotnet/sdk - 3512b9275a5af9f78a379acac6f876453918ed83 + aea4e42aff076545d4709fd6071dda62fe0ae332 - + https://github.com/dotnet/sdk - 3512b9275a5af9f78a379acac6f876453918ed83 + aea4e42aff076545d4709fd6071dda62fe0ae332 - + https://github.com/dotnet/sdk - 3512b9275a5af9f78a379acac6f876453918ed83 + aea4e42aff076545d4709fd6071dda62fe0ae332 - + https://github.com/dotnet/sdk - 3512b9275a5af9f78a379acac6f876453918ed83 + aea4e42aff076545d4709fd6071dda62fe0ae332 https://github.com/dotnet/test-templates @@ -124,40 +124,40 @@ 561fc241f4c574345364b52bc7eb857b997111ad - + https://github.com/dotnet/winforms - 63f2d85bdc754063f935729029b1287f5b22d285 + 5207c6554bb20236bd91c6083c3e1ee3c76c9402 - + https://github.com/dotnet/wpf - bec0472431f3c127deb2b9823f17bfd9bfd55c1d + 3db410e6645fd9a13e9b1c13f36ab32087b5b970 - + https://github.com/dotnet/fsharp - 32898dc51efc669de98e7e47f57d521bc07ac4cc + 7c217c487c6e2b7d824f3d40666b3cbad412cad4 - + https://github.com/dotnet/fsharp - 32898dc51efc669de98e7e47f57d521bc07ac4cc + 7c217c487c6e2b7d824f3d40666b3cbad412cad4 - + https://github.com/microsoft/vstest - c0c0e75fb8ea396a8b0717d17c2e738975d412e7 + a09e17e9efd7f85abab5a83d627d15aef5b6a954 - + https://github.com/dotnet/runtime - bcc1d3d6f00fbcea3f454b2e35bceeaa51e604b1 + d40c654c274fe4f4afe66328f0599130f3eb2ea6 https://github.com/dotnet/roslyn 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - e7a44d757e097eb17dcac5a8436645dc612fec4b + 0d8d09e5c582526daeb4af0b52956c3290e424d1 @@ -169,20 +169,20 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ae7c93e25ae596594b3b22d64115f374a3595912 + 687be2a32a302aaade82380c0eaafa5af85fb4da - + https://github.com/dotnet/deployment-tools - e56c69b0610b50407d29fdc2dda2574712a7b94d + 643a0cb2966b097763158082a138189e22205d3b - + https://github.com/dotnet/deployment-tools - e56c69b0610b50407d29fdc2dda2574712a7b94d + 643a0cb2966b097763158082a138189e22205d3b diff --git a/eng/Versions.props b/eng/Versions.props index 75f67c847..5afd175fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-preview.2.24075.3 + 9.0.0-preview.2.24078.1 - 9.0.0-preview.2.24075.3 + 9.0.0-preview.2.24079.2 @@ -73,22 +73,22 @@ - 9.0.0-preview.2.24076.3 - 9.0.0-preview.2.24076.3 - 9.0.0-preview.2.24076.3 - 9.0.0-preview.2.24076.3 - 9.0.0-preview.2.24076.3 - 9.0.0-preview.2.24076.3 - 9.0.0-preview.2.24076.3 + 9.0.0-preview.2.24079.10 + 9.0.0-preview.2.24079.10 + 9.0.0-preview.2.24079.10 + 9.0.0-preview.2.24079.10 + 9.0.0-preview.2.24079.10 + 9.0.0-preview.2.24079.10 + 9.0.0-preview.2.24079.10 0.2.0 - 9.0.100-preview.2.24076.13 - 9.0.100-preview.2.24076.13 - 9.0.100-preview.2.24076.13 + 9.0.100-preview.2.24080.4 + 9.0.100-preview.2.24080.4 + 9.0.100-preview.2.24080.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -99,23 +99,23 @@ - 9.0.0-preview.2.24076.4 + 9.0.0-preview.2.24080.1 - 9.0.0-preview.2.24076.4 - 9.0.0-preview.2.24076.4 - 9.0.0-preview.2.24076.4 - 9.0.0-preview.2.24076.4 - 9.0.0-preview.2.24076.4 + 9.0.0-preview.2.24080.1 + 9.0.0-preview.2.24080.1 + 9.0.0-preview.2.24080.1 + 9.0.0-preview.2.24080.1 + 9.0.0-preview.2.24080.1 2.1.0 - 9.0.0-preview.2.24076.2 - 9.0.0-preview.2.24076.2 - 9.0.0-preview.2.24076.2 - 9.0.0-preview.2.24076.2 + 9.0.0-preview.2.24079.1 + 9.0.0-preview.2.24079.1 + 9.0.0-preview.2.24079.1 + 9.0.0-preview.2.24079.1 @@ -131,7 +131,7 @@ - 2.0.0-preview.1.24067.1 + 2.0.0-preview.1.24075.2 @@ -245,7 +245,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24073-02 + 17.10.0-preview-24078-03 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 @@ -261,7 +261,7 @@ 14.0.9712-net9-p1 17.0.9712-net9-p1 - 9.0.0-alpha.1.24072.1 + 9.0.0-preview.2.24076.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch index 18a132e6f..ae3b5241e 100644 --- a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch +++ b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch @@ -43,10 +43,10 @@ Backport: https://github.com/dotnet/source-build/issues/3663 35 files changed, 82 insertions(+), 73 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 10c539090..824602dcb 100644 +index 0fe610fc2..019d01d14 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -34,8 +34,8 @@ +@@ -36,8 +36,8 @@ $(MSBuildThisFileDirectory)artifacts/ $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ @@ -522,7 +522,7 @@ index 9706167ff..e02746a8e 100644 true diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj -index 13add7032..4bbae272f 100644 +index fe6d95f90..9f81af284 100644 --- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj +++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj @@ -1,7 +1,7 @@ @@ -533,9 +533,9 @@ index 13add7032..4bbae272f 100644 + net9.0 true HistoricalBenchmark.Utilities - + $(NoWarn);NETSDK1206 diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj -index 2534ba292..feef2eaf7 100644 +index 09ca5cb69..575bb32a3 100644 --- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj +++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj @@ -2,7 +2,7 @@ @@ -548,7 +548,7 @@ index 2534ba292..feef2eaf7 100644 Release diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj -index 55968eddd..e62ac8b85 100644 +index 043de02d3..d10a33cb6 100644 --- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj +++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj @@ -2,7 +2,7 @@ @@ -561,7 +561,7 @@ index 55968eddd..e62ac8b85 100644 false diff --git a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj -index 3774aa870..03c11414e 100644 +index 92255adb4..e2f32b3ee 100644 --- a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj +++ b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj @@ -2,7 +2,7 @@