From 7b32f49a194dc98fb6ce67d36598ac81de6eb3dd Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Thu, 1 Dec 2022 00:44:55 -0800 Subject: [PATCH 1/3] Deploy System.Diagnostics.DiagnosticSource to Tools folder (#14417) --- .../Microsoft.FSharp.Compiler.MSBuild.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj index eb3190a7418..bb4fd680a93 100644 --- a/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj +++ b/setup/Swix/Microsoft.FSharp.Compiler.MSBuild/Microsoft.FSharp.Compiler.MSBuild.csproj @@ -98,6 +98,7 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools" file source="$(BinariesFolder)fsc\$(Configuration)\$(TargetFramework)\FSharp.Compiler.Service.xml" file source="$(BinariesFolder)fsc\$(Configuration)\$(TargetFramework)\System.Buffers.dll" file source="$(BinariesFolder)fsc\$(Configuration)\$(TargetFramework)\System.Collections.Immutable.dll" + file source="$(BinariesFolder)fsc\$(Configuration)\$(TargetFramework)\System.Diagnostics.DiagnosticSource.dll" file source="$(BinariesFolder)fsc\$(Configuration)\$(TargetFramework)\System.Memory.dll" file source="$(BinariesFolder)fsc\$(Configuration)\$(TargetFramework)\System.Numerics.Vectors.dll" file source="$(BinariesFolder)fsc\$(Configuration)\$(TargetFramework)\System.Reflection.Metadata.dll" From fe5043ac7e889195881f4f7fb88a4a56f3453226 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Thu, 1 Dec 2022 09:14:34 -0800 Subject: [PATCH 2/3] reapply test disable --- tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs index 8549f8beaa9..ca694ce0ba4 100644 --- a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs +++ b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs @@ -68,6 +68,7 @@ val f: x: 'a -> TFirstV_1<'a> Assert.True(symbolUse.IsPrivateToFile)) } + // [] This is a bug - https://github.com/dotnet/fsharp/issues/14419 [] let ``Private function, with signature file`` () = SyntheticProject.Create( From 757fa0ca2404656bd5fc5709cdcb6226a494238a Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Thu, 1 Dec 2022 09:16:00 -0800 Subject: [PATCH 3/3] Update SymbolUse.fs oops --- .../FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs index ca694ce0ba4..c039463d983 100644 --- a/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs +++ b/tests/FSharp.Compiler.ComponentTests/FSharpChecker/SymbolUse.fs @@ -69,7 +69,6 @@ val f: x: 'a -> TFirstV_1<'a> } // [] This is a bug - https://github.com/dotnet/fsharp/issues/14419 - [] let ``Private function, with signature file`` () = SyntheticProject.Create( { sourceFile "First" [] with ExtraSource = "let private f3 x = x + 1" } @@ -77,4 +76,4 @@ val f: x: 'a -> TFirstV_1<'a> checkFile "First" (fun (typeCheckResult: FSharpCheckFileResults) -> let symbolUse = typeCheckResult.GetSymbolUseAtLocation(6, 14, "let private f3 x = x + 1", ["f3"]) |> Option.defaultWith (fun () -> failwith "no symbol use found") Assert.False(symbolUse.IsPrivateToFile)) - } \ No newline at end of file + }