From 9fac4709f995d7b958ccd224329350b769b190bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Apr 2026 02:05:22 +0000 Subject: [PATCH 1/6] Backflow from https://github.com/dotnet/dotnet / b61c1c3 build 310568 [[ commit created by automation ]] --- .../Microsoft.FSharp.Compiler.fsproj | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj index 0323b00ea92..36d7036a22c 100644 --- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj +++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj @@ -11,12 +11,15 @@ true + + + + - <_ArcadeSdkMSBuildProjectDir>$([System.IO.Path]::GetDirectoryName('$(ArcadeSdkBuildTasksAssembly)'))\..\ - <_BuildReleasePackagesTargets>$(_ArcadeSdkMSBuildProjectDir)BuildReleasePackages.targets + $(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotNetNuGetRepackTasksVersion)\tools\netframework\Microsoft.DotNet.NuGetRepack.Tasks.dll + $(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotNetNuGetRepackTasksVersion)\tools\net\Microsoft.DotNet.NuGetRepack.Tasks.dll - - + @@ -86,11 +89,6 @@ - - - - - $([MSBuild]::NormalizeDirectory( '$(ArtifactsDir)', 'packages', '$(Configuration)', 'Dependency' )) From bc236686620dcb6bc7adf9c9a080bde4ac1d0484 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Apr 2026 02:05:22 +0000 Subject: [PATCH 2/6] Update dependencies from build 310568 No dependency updates to commit [[ commit created by automation ]] --- NuGet.config | 1 - eng/Version.Details.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce7fe711793..527f95b5c87 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76ebd34ba05..85fd19b1881 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild From a7fe76681a3a2fe269988c844d9e5bdbf086913b Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Thu, 16 Apr 2026 09:37:10 +0200 Subject: [PATCH 3/6] Fix CI: restore MSBuild NuGet feed removed by codeflow The codeflow automation incorrectly removed the darc-pub-DotNet-msbuild-Trusted-e5ebe15 NuGet feed from NuGet.config, even though MSBuild 18.6.1 packages still depend on it. The VMR source at the same SHA retains this feed. Restoring it fixes all NU1103 errors. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 527f95b5c87..ce7fe711793 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + From 12d5945eaf0977b48ed566dc22202d02775a5681 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Thu, 16 Apr 2026 10:31:22 +0200 Subject: [PATCH 4/6] Fix flaky FindReferences test by isolating checker instance The ProjectActivePatternInSig test was using the shared global checker, which causes race conditions when tests run in parallel. Give it a dedicated FSharpChecker instance, matching the pattern used by Project25. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../ProjectAnalysisTests.fs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs b/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs index 551bdf02ea2..6b4f6d946f6 100644 --- a/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs +++ b/tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs @@ -5856,6 +5856,9 @@ let ``Empty source list produces error FS0207`` () = // https://github.com/dotnet/fsharp/issues/14969 module internal ProjectActivePatternInSig = + // Dedicated checker to isolate from shared state races with parallel tests. + let checker = FSharpChecker.Create(useTransparentCompiler = FSharp.Test.CompilerAssertHelpers.UseTransparentCompiler) + let fileName1 = Path.ChangeExtension(getTemporaryFileName (), ".fs") let sigFileName1 = Path.ChangeExtension(fileName1, ".fsi") let base2 = getTemporaryFileName () @@ -5911,7 +5914,7 @@ let describe x = [] let ``FindReferences for active patterns in fsi - project has no errors`` () = let wholeProjectResults = - checker.ParseAndCheckProject(ProjectActivePatternInSig.options) + ProjectActivePatternInSig.checker.ParseAndCheckProject(ProjectActivePatternInSig.options) |> Async.RunImmediate for e in wholeProjectResults.Diagnostics do @@ -5922,11 +5925,11 @@ let ``FindReferences for active patterns in fsi - project has no errors`` () = [] let ``FindReferences for active patterns in fsi - finds Even in sig and impl`` () = let wholeProjectResults = - checker.ParseAndCheckProject(ProjectActivePatternInSig.options) + ProjectActivePatternInSig.checker.ParseAndCheckProject(ProjectActivePatternInSig.options) |> Async.RunImmediate let _, typedParse2 = - checker.GetBackgroundCheckResultsForFileInProject( + ProjectActivePatternInSig.checker.GetBackgroundCheckResultsForFileInProject( ProjectActivePatternInSig.fileName2, ProjectActivePatternInSig.options ) From 3421e6ce55aa8452f344f4b32d45ed2ffe7fcbf8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Apr 2026 02:05:40 +0000 Subject: [PATCH 5/6] Backflow from https://github.com/dotnet/dotnet / ab01524 build 310648 [[ commit created by automation ]] --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8248454c00f..bf7d9ac6873 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,7 +158,7 @@ 5.0.0-preview.7.20364.11 17.14.1 2.0.2 - 13.0.3 + 13.0.4 3.2.2 3.2.2 8.0.0 From 9b44b0dcf263ee506b45f5e628c45b8b339dd457 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Apr 2026 02:05:40 +0000 Subject: [PATCH 6/6] Update dependencies from build 310648 No dependency updates to commit [[ commit created by automation ]] --- NuGet.config | 1 - eng/Version.Details.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce7fe711793..527f95b5c87 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85fd19b1881..73cf5bb054b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild