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..73cf5bb054b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild 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 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' )) 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 )