diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e2f02072..a3e2ebb71 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 - 44ece6fe1ed7e3808e277252631dbd16d3a07f16 + 22ec63c9172b7998b103de28ceb98cf5b53d52b3 - + https://github.com/dotnet/windowsdesktop - 44ece6fe1ed7e3808e277252631dbd16d3a07f16 + 22ec63c9172b7998b103de28ceb98cf5b53d52b3 - + https://github.com/dotnet/windowsdesktop - 44ece6fe1ed7e3808e277252631dbd16d3a07f16 + 22ec63c9172b7998b103de28ceb98cf5b53d52b3 - + https://github.com/dotnet/windowsdesktop - 44ece6fe1ed7e3808e277252631dbd16d3a07f16 + 22ec63c9172b7998b103de28ceb98cf5b53d52b3 - + https://github.com/dotnet/runtime - 646445614c8788aa7a706bbe2dd2505adf7566a8 + 0d81a5ac76948b49840c3a6f44703bfd6489109b - + https://github.com/dotnet/runtime - 646445614c8788aa7a706bbe2dd2505adf7566a8 + 0d81a5ac76948b49840c3a6f44703bfd6489109b - + https://github.com/dotnet/runtime - 646445614c8788aa7a706bbe2dd2505adf7566a8 + 0d81a5ac76948b49840c3a6f44703bfd6489109b - + https://github.com/dotnet/runtime - 646445614c8788aa7a706bbe2dd2505adf7566a8 + 0d81a5ac76948b49840c3a6f44703bfd6489109b - + https://github.com/dotnet/runtime - 646445614c8788aa7a706bbe2dd2505adf7566a8 + 0d81a5ac76948b49840c3a6f44703bfd6489109b @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 646445614c8788aa7a706bbe2dd2505adf7566a8 + 0d81a5ac76948b49840c3a6f44703bfd6489109b - + https://github.com/dotnet/aspnetcore - b7e531078d2deafab92c9883a976f2dbb427226d + de12f70f8d536a72bd8c6a2add8f6c8ad8f344af - + https://github.com/dotnet/aspnetcore - b7e531078d2deafab92c9883a976f2dbb427226d + de12f70f8d536a72bd8c6a2add8f6c8ad8f344af - + https://github.com/dotnet/aspnetcore - b7e531078d2deafab92c9883a976f2dbb427226d + de12f70f8d536a72bd8c6a2add8f6c8ad8f344af - + https://github.com/dotnet/aspnetcore - b7e531078d2deafab92c9883a976f2dbb427226d + de12f70f8d536a72bd8c6a2add8f6c8ad8f344af - + https://github.com/dotnet/aspnetcore - b7e531078d2deafab92c9883a976f2dbb427226d + de12f70f8d536a72bd8c6a2add8f6c8ad8f344af - + https://github.com/dotnet/aspnetcore - b7e531078d2deafab92c9883a976f2dbb427226d + de12f70f8d536a72bd8c6a2add8f6c8ad8f344af - + https://github.com/dotnet/aspnetcore - b7e531078d2deafab92c9883a976f2dbb427226d + de12f70f8d536a72bd8c6a2add8f6c8ad8f344af - + https://github.com/dotnet/sdk - 208ccf0bffe0a09a2aec8587ce87bf9b357f161d + 176e8ca72f5b9111649c49ca43a71d1dd9904bd0 - + https://github.com/dotnet/sdk - 208ccf0bffe0a09a2aec8587ce87bf9b357f161d + 176e8ca72f5b9111649c49ca43a71d1dd9904bd0 - + https://github.com/dotnet/sdk - 208ccf0bffe0a09a2aec8587ce87bf9b357f161d + 176e8ca72f5b9111649c49ca43a71d1dd9904bd0 - + https://github.com/dotnet/sdk - 208ccf0bffe0a09a2aec8587ce87bf9b357f161d + 176e8ca72f5b9111649c49ca43a71d1dd9904bd0 https://github.com/dotnet/test-templates @@ -128,17 +128,17 @@ https://github.com/dotnet/winforms daf3f4db5de296ac78b51d279e86a38c62255e0b - + https://github.com/dotnet/wpf - 77828c5774af8375db66c90a3ba0f8d67ece827f + b9272765feae8da69fee7340c127add8296917fb - + https://github.com/dotnet/fsharp - 8d7795d4a68a21010577f11084ba937e51daf9a3 + 32898dc51efc669de98e7e47f57d521bc07ac4cc - + https://github.com/dotnet/fsharp - 8d7795d4a68a21010577f11084ba937e51daf9a3 + 32898dc51efc669de98e7e47f57d521bc07ac4cc @@ -146,9 +146,9 @@ c0c0e75fb8ea396a8b0717d17c2e738975d412e7 - + https://github.com/dotnet/runtime - 646445614c8788aa7a706bbe2dd2505adf7566a8 + 0d81a5ac76948b49840c3a6f44703bfd6489109b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index b2098d760..6fa6085f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ - 9.0.0-preview.2.24074.5 + 9.0.0-preview.2.24075.1 @@ -73,22 +73,22 @@ - 9.0.0-preview.2.24075.2 - 9.0.0-preview.2.24075.2 - 9.0.0-preview.2.24075.2 - 9.0.0-preview.2.24075.2 - 9.0.0-preview.2.24075.2 - 9.0.0-preview.2.24075.2 - 9.0.0-preview.2.24075.2 + 9.0.0-preview.2.24075.3 + 9.0.0-preview.2.24075.3 + 9.0.0-preview.2.24075.3 + 9.0.0-preview.2.24075.3 + 9.0.0-preview.2.24075.3 + 9.0.0-preview.2.24075.3 + 9.0.0-preview.2.24075.3 0.2.0 - 9.0.100-preview.2.24075.5 - 9.0.100-preview.2.24075.5 - 9.0.100-preview.2.24075.5 + 9.0.100-preview.2.24076.2 + 9.0.100-preview.2.24076.2 + 9.0.100-preview.2.24076.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -99,23 +99,23 @@ - 9.0.0-preview.2.24074.12 + 9.0.0-preview.2.24075.11 - 9.0.0-preview.2.24074.12 - 9.0.0-preview.2.24074.12 - 9.0.0-preview.2.24074.12 - 9.0.0-preview.2.24074.12 - 9.0.0-preview.2.24074.12 + 9.0.0-preview.2.24075.11 + 9.0.0-preview.2.24075.11 + 9.0.0-preview.2.24075.11 + 9.0.0-preview.2.24075.11 + 9.0.0-preview.2.24075.11 2.1.0 - 9.0.0-preview.2.24075.2 - 9.0.0-preview.2.24075.2 - 9.0.0-preview.2.24075.2 - 9.0.0-preview.2.24075.2 + 9.0.0-preview.2.24075.4 + 9.0.0-preview.2.24075.4 + 9.0.0-preview.2.24075.4 + 9.0.0-preview.2.24075.4 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 252a193ba..18a132e6f 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 @@ -35,19 +35,18 @@ Backport: https://github.com/dotnet/source-build/issues/3663 .../HistoricalBenchmark.Runner.fsproj | 2 +- .../HistoricalBenchmark.fsproj | 2 +- .../FSharp.Compiler.Benchmarks.fsproj | 2 +- - .../FCSSourceFiles/FCSSourceFiles.fsproj | 1 + - .../Fsharp.ProfilingStartpointProject.fsproj | 2 +- + .../FCSSourceFiles/FCSSourceFiles.fsproj | 2 +- tests/fsharp/FSharpSuite.Tests.fsproj | 4 +-- .../Sample_ConsoleApp_net7.fsproj | 6 ++-- .../Sample_ConsoleApp_net7.fsproj | 6 ++-- .../LocalCompilerAndFslib.fsproj | 6 ++-- - 36 files changed, 83 insertions(+), 73 deletions(-) + 35 files changed, 82 insertions(+), 73 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 879bd8941..161d115ad 100644 +index 10c539090..824602dcb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -30,8 +30,8 @@ +@@ -34,8 +34,8 @@ $(MSBuildThisFileDirectory)artifacts/ $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/ @@ -148,10 +147,10 @@ index e4103999f..fe08d0cc4 100644 Exe false diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj -index 687bc2692..bcd71892c 100644 +index dd7b6e25c..2171473d8 100644 --- a/src/Compiler/FSharp.Compiler.Service.fsproj +++ b/src/Compiler/FSharp.Compiler.Service.fsproj -@@ -525,15 +525,15 @@ +@@ -543,15 +543,15 @@ @@ -390,7 +389,7 @@ index e3c796d0b..e4926cd6c 100644 true xunit diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj -index 904fbbf73..cb027fac9 100644 +index a9dd53828..a33c287be 100644 --- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj +++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj @@ -3,8 +3,8 @@ @@ -420,7 +419,7 @@ index cdfd467e5..2fdcffc90 100644 true xunit diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj -index 909402a2a..b1b1e85f3 100644 +index 780ba10f3..52e6bedb0 100644 --- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -5,6 +5,15 @@ @@ -440,7 +439,7 @@ index 909402a2a..b1b1e85f3 100644 true false diff --git a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj -index 915332ac4..b0064bd9d 100644 +index 0e4b91b42..dc805e4f7 100644 --- a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj +++ b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj @@ -3,8 +3,8 @@ @@ -470,7 +469,7 @@ index 4b6c5c534..1b20371c4 100644 FSharp.Core.UnitTests diff --git a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj -index 6867d180a..c0be4dda2 100644 +index 5cfcba98c..c67b8f85d 100644 --- a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj +++ b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj @@ -1,8 +1,8 @@ @@ -485,7 +484,7 @@ index 6867d180a..c0be4dda2 100644 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81 true diff --git a/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/CS/MicroPerfCSharp.csproj b/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/CS/MicroPerfCSharp.csproj -index 96ac25da8..fa08000dc 100644 +index 50bba8f6f..95f458777 100644 --- a/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/CS/MicroPerfCSharp.csproj +++ b/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/CS/MicroPerfCSharp.csproj @@ -1,7 +1,7 @@ @@ -549,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 19c7f7a7e..10e1ff2f3 100644 +index 55968eddd..e62ac8b85 100644 --- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj +++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj @@ -2,7 +2,7 @@ @@ -562,30 +561,18 @@ index 19c7f7a7e..10e1ff2f3 100644 false diff --git a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj -index 3774aa870..988ccb579 100644 +index 3774aa870..03c11414e 100644 --- a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj +++ b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj -@@ -4,6 +4,7 @@ - Exe - net8.0 - true -+ net9.0 - - - -diff --git a/tests/benchmarks/Fsharp.ProfilingStartpointProject/Fsharp.ProfilingStartpointProject.fsproj b/tests/benchmarks/Fsharp.ProfilingStartpointProject/Fsharp.ProfilingStartpointProject.fsproj -index 6cb9e4bd7..1ab60ffd4 100644 ---- a/tests/benchmarks/Fsharp.ProfilingStartpointProject/Fsharp.ProfilingStartpointProject.fsproj -+++ b/tests/benchmarks/Fsharp.ProfilingStartpointProject/Fsharp.ProfilingStartpointProject.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 + true - diff --git a/tests/fsharp/FSharpSuite.Tests.fsproj b/tests/fsharp/FSharpSuite.Tests.fsproj index b6d69d8ae..fff42ac08 100644 --- a/tests/fsharp/FSharpSuite.Tests.fsproj