diff --git a/FSharp.sln b/FSharp.sln index 798f881d5e0b95710fda2fd5ac7f4d9081f62e76..da837f9b04fdc6b932ffc4966e7886e5420e49ff 100644 --- a/FSharp.sln +++ b/FSharp.sln @@ -44,12 +44,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.DependencyManager.Nuget", "src\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj", "{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting", "src\fsharp\FSharp.Compiler.Private.Scripting\FSharp.Compiler.Private.Scripting.fsproj", "{6771860A-614D-4FDD-A655-4C70EBCC91B0}" -EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting.UnitTests", "tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj", "{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.DotNet.DependencyManager", "src\fsharp\Microsoft.DotNet.DependencyManager\Microsoft.DotNet.DependencyManager.fsproj", "{B5A043F8-6D7F-4D4E-B8AD-5880070180B6}" -EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.ComponentTests", "tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj", "{FAC5A3BF-C0D6-437A-868A-E962AA00B418}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fsharpqa", "fsharpqa", "{292C4F92-A313-4CAF-9552-731F39C6C21F}" @@ -242,18 +238,6 @@ Global {8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|Any CPU.Build.0 = Release|Any CPU {8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|x86.ActiveCfg = Release|Any CPU {8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|x86.Build.0 = Release|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|x86.ActiveCfg = Debug|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|x86.Build.0 = Debug|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|Any CPU.ActiveCfg = Debug|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|Any CPU.Build.0 = Debug|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|x86.ActiveCfg = Debug|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|x86.Build.0 = Debug|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|Any CPU.Build.0 = Release|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|x86.ActiveCfg = Release|Any CPU - {6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|x86.Build.0 = Release|Any CPU {4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|Any CPU.Build.0 = Debug|Any CPU {4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -266,18 +250,6 @@ Global {4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|Any CPU.Build.0 = Release|Any CPU {4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|x86.ActiveCfg = Release|Any CPU {4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|x86.Build.0 = Release|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Debug|x86.ActiveCfg = Debug|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Debug|x86.Build.0 = Debug|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Proto|Any CPU.ActiveCfg = Debug|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Proto|Any CPU.Build.0 = Debug|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Proto|x86.ActiveCfg = Debug|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Proto|x86.Build.0 = Debug|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Release|Any CPU.Build.0 = Release|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Release|x86.ActiveCfg = Release|Any CPU - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6}.Release|x86.Build.0 = Release|Any CPU {FAC5A3BF-C0D6-437A-868A-E962AA00B418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FAC5A3BF-C0D6-437A-868A-E962AA00B418}.Debug|Any CPU.Build.0 = Debug|Any CPU {FAC5A3BF-C0D6-437A-868A-E962AA00B418}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -344,9 +316,7 @@ Global {53C0DAAD-158C-4658-8EC7-D7341530239F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} {81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7} = {3840F2E7-3898-45F7-8CF7-1E6829E56DB8} {8B7BF62E-7D8C-4928-BE40-4E392A9EE851} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} - {6771860A-614D-4FDD-A655-4C70EBCC91B0} = {B8DDA694-7939-42E3-95E5-265C2217C142} {4FEDF286-0252-4EBC-9E75-879CCA3B85DC} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} - {B5A043F8-6D7F-4D4E-B8AD-5880070180B6} = {3058BC79-8E79-4645-B05D-48CC182FA8A6} {FAC5A3BF-C0D6-437A-868A-E962AA00B418} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} {292C4F92-A313-4CAF-9552-731F39C6C21F} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} {FF76050A-415A-4FB4-A0E5-13CBF38D83E0} = {292C4F92-A313-4CAF-9552-731F39C6C21F} diff --git a/VisualFSharp.sln b/VisualFSharp.sln index 561241a575716c1164f5b9e48602ae93105491c9..55dc1c07fed318e0f323d8b493e17b21a6c7f2d7 100644 --- a/VisualFSharp.sln +++ b/VisualFSharp.sln @@ -138,8 +138,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{647810D0 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler", "src\fsharp\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.csproj", "{04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting", "src\fsharp\FSharp.Compiler.Private.Scripting\FSharp.Compiler.Private.Scripting.fsproj", "{20B7BC36-CF51-4D75-9E13-66681C07977F}" -EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting.UnitTests", "tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj", "{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}" EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.DependencyManager.Nuget", "src\fsharp\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj", "{DFA30881-C0B1-4813-B087-C21B5AF9B77F}" @@ -154,8 +152,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryProject", "vsintegra EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TutorialProject", "vsintegration\ProjectTemplates\TutorialProject\TutorialProject.csproj", "{2937CBEC-262D-4C94-BE1D-291FAB72E3E8}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.DotNet.DependencyManager", "src\fsharp\Microsoft.DotNet.DependencyManager\Microsoft.DotNet.DependencyManager.fsproj", "{C2F38485-5F87-4986-985B-55D7ED96D5CE}" -EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.ComponentTests", "tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj", "{0610FB97-7C15-422A-86FD-32335C6DF14D}" EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Service", "src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj", "{B5A9BBD9-2F45-4722-A6CA-BAE3C64CD4E2}" @@ -820,18 +816,6 @@ Global {04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Release|Any CPU.Build.0 = Release|Any CPU {04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Release|x86.ActiveCfg = Release|Any CPU {04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8}.Release|x86.Build.0 = Release|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Debug|x86.ActiveCfg = Debug|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Debug|x86.Build.0 = Debug|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Proto|Any CPU.ActiveCfg = Debug|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Proto|Any CPU.Build.0 = Debug|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Proto|x86.ActiveCfg = Debug|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Proto|x86.Build.0 = Debug|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Release|Any CPU.Build.0 = Release|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Release|x86.ActiveCfg = Release|Any CPU - {20B7BC36-CF51-4D75-9E13-66681C07977F}.Release|x86.Build.0 = Release|Any CPU {09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|Any CPU.Build.0 = Debug|Any CPU {09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -904,18 +888,6 @@ Global {2937CBEC-262D-4C94-BE1D-291FAB72E3E8}.Release|Any CPU.Build.0 = Release|Any CPU {2937CBEC-262D-4C94-BE1D-291FAB72E3E8}.Release|x86.ActiveCfg = Release|Any CPU {2937CBEC-262D-4C94-BE1D-291FAB72E3E8}.Release|x86.Build.0 = Release|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Debug|x86.ActiveCfg = Debug|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Debug|x86.Build.0 = Debug|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Proto|Any CPU.ActiveCfg = Debug|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Proto|Any CPU.Build.0 = Debug|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Proto|x86.ActiveCfg = Debug|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Proto|x86.Build.0 = Debug|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Release|Any CPU.Build.0 = Release|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Release|x86.ActiveCfg = Release|Any CPU - {C2F38485-5F87-4986-985B-55D7ED96D5CE}.Release|x86.Build.0 = Release|Any CPU {0610FB97-7C15-422A-86FD-32335C6DF14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0610FB97-7C15-422A-86FD-32335C6DF14D}.Debug|Any CPU.Build.0 = Debug|Any CPU {0610FB97-7C15-422A-86FD-32335C6DF14D}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1016,7 +988,6 @@ Global {E93E7D28-1C6B-4E04-BE83-68428CF7E039} = {6235B3AF-774D-4EA1-8F37-789E767F6368} {9482211E-23D0-4BD0-9893-E4AA5559F67A} = {6235B3AF-774D-4EA1-8F37-789E767F6368} {04C59F6E-1C76-4F6A-AC21-2EA7F296A1B8} = {647810D0-5307-448F-99A2-E83917010DAE} - {20B7BC36-CF51-4D75-9E13-66681C07977F} = {B8DDA694-7939-42E3-95E5-265C2217C142} {09F56540-AFA5-4694-B7A6-0DBF6D4618C2} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} {DFA30881-C0B1-4813-B087-C21B5AF9B77F} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} {AA259A37-418F-4E18-87B2-C7D5F8C26CC4} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D} @@ -1024,7 +995,6 @@ Global {44155269-9B30-43DA-B97F-4F36F887B211} = {12EF27FD-A34B-4373-860A-F9FCE9651859} {B53D9D05-8EF7-43A6-9A5B-0B113CBC54F8} = {12EF27FD-A34B-4373-860A-F9FCE9651859} {2937CBEC-262D-4C94-BE1D-291FAB72E3E8} = {12EF27FD-A34B-4373-860A-F9FCE9651859} - {C2F38485-5F87-4986-985B-55D7ED96D5CE} = {3058BC79-8E79-4645-B05D-48CC182FA8A6} {0610FB97-7C15-422A-86FD-32335C6DF14D} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} {B5A9BBD9-2F45-4722-A6CA-BAE3C64CD4E2} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77} {14F3D3D6-5C8E-43C2-98A2-17EA704D4DEA} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449} diff --git a/docs/compiler-guide.md b/docs/compiler-guide.md index 7df7938540a8003d513193f171dbd5f3fb4f4d3f..44b06adb2e7100fc7bb8b7bdf4353aeb0550230c 100644 --- a/docs/compiler-guide.md +++ b/docs/compiler-guide.md @@ -70,10 +70,10 @@ The following are the key phases and high-level logical operations of the F# com * _Parsing_. Accepts a token stream and produces an AST per the grammar in the F# Language Specification. -* _Resolving references_. For .NET SDK generally references are resolved explicitly by external tooling. +* _Resolving references_. For .NET SDK generally references are resolved explicitly by external tooling. There is a legacy aspect to this if references use old .NET Framework references including for scripting. See [ReferenceResolver.fs](https://github.com/dotnet/fsharp/blob/master/src/fsharp/ReferenceResolver.fs) for the abstract definition of compiler reference resolution. See [LegacyMSBuildReferenceResolver.fs](https://github.com/dotnet/fsharp/blob/master/src/fsharp/LegacyMSBuildReferenceResolver.fs) for reference resolution used by the .NET Framework F# compiler when running on .NET Framework. See [SimulatedMSBuildReferenceResolver.fs](https://github.com/dotnet/fsharp/blob/master/src/fsharp/SimulatedMSBuildReferenceResolver.fs) when not using the .NET Framework F# compiler. - See [Microsoft.DotNet.DependencyManager](https://github.com/dotnet/fsharp/tree/master/src/fsharp/Microsoft.DotNet.DependencyManager) for reference resolution and package management used in `fsi`. + See [FSharp.Compiler.DependencyManager](https://github.com/dotnet/fsharp/tree/master/src/fsharp/FSharp.Compiler.DependencyManager) for reference resolution and package management used in `fsi`. * _Importing referenced .NET binaries_, see [import.fsi](https://github.com/dotnet/fsharp/blob/master/src/fsharp/import.fsi)/[import.fs](https://github.com/dotnet/fsharp/blob/master/src/fsharp/import.fs). Accepts file references and produces a Typed Tree node for each referenced assembly, including information about its type definitions (and type forwarders if any). diff --git a/eng/tests/UpToDate.ps1 b/eng/tests/UpToDate.ps1 index 545e149069a0ba166c410746b6bfe60156a4ea80..0a730ac48f339c578ab89e66b8765155d3a910e1 100644 --- a/eng/tests/UpToDate.ps1 +++ b/eng/tests/UpToDate.ps1 @@ -26,9 +26,8 @@ try { $FscAssemblyDir = Get-ChildItem -Path $ArtifactsBinDir -Filter "fsc" $FsiAssemblyDir = Get-ChildItem -Path $ArtifactsBinDir -Filter "fsi" $FsiAnyCpuAssemblyDir = Get-ChildItem -Path $ArtifactsBinDir -Filter "fsiAnyCpu" - $DmAssemblyDir = Get-ChildItem -Path $ArtifactsBinDir -Filter "Microsoft.DotNet.DependencyManager" $ProjectSystemAssemblyDirs = Get-ChildItem -Path $ArtifactsBinDir -Filter "ProjectSystem*" - $FSharpDirs = @($FSharpAssemblyDirs) + @($FscAssemblyDir) + @($FsiAssemblyDir) + @($FsiAnyCpuAssemblyDir) + @($DmAssemblyDir) + @($ProjectSystemAssemblyDirs) + $FSharpDirs = @($FSharpAssemblyDirs) + @($FscAssemblyDir) + @($FsiAssemblyDir) + @($FsiAnyCpuAssemblyDir) + @($ProjectSystemAssemblyDirs) $FSharpDllPaths = $FSharpDirs | ForEach-Object { Get-ChildItem -Path (Join-Path $ArtifactsBinDir $_) -Recurse -Filter "*.dll" } | ForEach-Object { $_.FullName } $FSharpExePaths = $FSharpDirs | ForEach-Object { Get-ChildItem -Path (Join-Path $ArtifactsBinDir $_) -Recurse -Filter "*.exe" } | ForEach-Object { $_.FullName } $FSharpAssemblyPaths = @($FSharpDllPaths) + @($FSharpExePaths) diff --git a/src/fsharp/CompilerConfig.fs b/src/fsharp/CompilerConfig.fs index a16be62e9bdc17bb50d0eb301efa6c57d97d75fc..4e69165898a16a25cb5ae9df195f99c4aa649926 100644 --- a/src/fsharp/CompilerConfig.fs +++ b/src/fsharp/CompilerConfig.fs @@ -22,6 +22,7 @@ open FSharp.Compiler.AbstractIL.ILPdbWriter open FSharp.Compiler.AbstractIL.Internal open FSharp.Compiler.AbstractIL.Internal.Library open FSharp.Compiler.AbstractIL.Internal.Utils +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.Features open FSharp.Compiler.Lib @@ -30,7 +31,6 @@ open FSharp.Compiler.Text open FSharp.Compiler.Text.Range open FSharp.Compiler.TypedTree -open Microsoft.DotNet.DependencyManager #if !NO_EXTENSIONTYPING open FSharp.Compiler.ExtensionTyping diff --git a/src/fsharp/CompilerConfig.fsi b/src/fsharp/CompilerConfig.fsi index 3a5c2b5a3446b82635873bb1e073414ed28eae43..a33b9276f5ff8d4ab9abd450f129b68ff5054be1 100644 --- a/src/fsharp/CompilerConfig.fsi +++ b/src/fsharp/CompilerConfig.fsi @@ -13,13 +13,12 @@ open FSharp.Compiler.AbstractIL.ILBinaryReader open FSharp.Compiler.AbstractIL.ILPdbWriter open FSharp.Compiler.AbstractIL.Internal open FSharp.Compiler.AbstractIL.Internal.Library +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.Features open FSharp.Compiler.SourceCodeServices open FSharp.Compiler.Text -open Microsoft.DotNet.DependencyManager - exception FileNameNotResolved of (*filename*) string * (*description of searched locations*) string * range exception LoadedSourceNotFoundIgnoring of (*filename*) string * range diff --git a/src/fsharp/CompilerImports.fs b/src/fsharp/CompilerImports.fs index b539b4fd99344948a02ab093f6bb0a55e290a592..f9ac0bbde923549b98104a007657fb06b4c766ad 100644 --- a/src/fsharp/CompilerImports.fs +++ b/src/fsharp/CompilerImports.fs @@ -25,6 +25,7 @@ open FSharp.Compiler.AbstractIL.Diagnostics open FSharp.Compiler.CheckDeclarations open FSharp.Compiler.CompilerGlobalState open FSharp.Compiler.CompilerConfig +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.Import open FSharp.Compiler.Lib @@ -40,8 +41,6 @@ open FSharp.Compiler.TypedTreeOps open FSharp.Compiler.TcGlobals open FSharp.Compiler.XmlDoc -open Microsoft.DotNet.DependencyManager - #if !NO_EXTENSIONTYPING open FSharp.Compiler.ExtensionTyping open FSharp.Core.CompilerServices diff --git a/src/fsharp/CompilerImports.fsi b/src/fsharp/CompilerImports.fsi index 0578626ba189b636428b8f5207f1e41fe97b2e44..365cc5d6f478529ed21916fd60ba79dad2111aab 100644 --- a/src/fsharp/CompilerImports.fsi +++ b/src/fsharp/CompilerImports.fsi @@ -11,6 +11,7 @@ open FSharp.Compiler.AbstractIL.IL open FSharp.Compiler.AbstractIL.Internal.Library open FSharp.Compiler.CheckExpressions open FSharp.Compiler.CompilerConfig +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.TypedTree open FSharp.Compiler.TypedTreeOps @@ -22,8 +23,6 @@ open FSharp.Core.CompilerServices open FSharp.Compiler.ExtensionTyping #endif -open Microsoft.DotNet.DependencyManager - /// This exception is an old-style way of reporting a diagnostic exception AssemblyNotResolved of (*originalName*) string * range diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/AssemblyResolveHandler.fs b/src/fsharp/DependencyManager/AssemblyResolveHandler.fs similarity index 98% rename from src/fsharp/Microsoft.DotNet.DependencyManager/AssemblyResolveHandler.fs rename to src/fsharp/DependencyManager/AssemblyResolveHandler.fs index f58170e3128e831fb59d1c38d21465e14a22586f..7092c92b6676bde59f4a4136545e18f322ac48a7 100644 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/AssemblyResolveHandler.fs +++ b/src/fsharp/DependencyManager/AssemblyResolveHandler.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.DotNet.DependencyManager +namespace FSharp.Compiler.DependencyManager open System open System.IO diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/AssemblyResolveHandler.fsi b/src/fsharp/DependencyManager/AssemblyResolveHandler.fsi similarity index 92% rename from src/fsharp/Microsoft.DotNet.DependencyManager/AssemblyResolveHandler.fsi rename to src/fsharp/DependencyManager/AssemblyResolveHandler.fsi index f6d84377a616a5e0c28882eaaff758a00647e9d9..5a16e640e5bb7271cffe366078944de4063514f4 100644 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/AssemblyResolveHandler.fsi +++ b/src/fsharp/DependencyManager/AssemblyResolveHandler.fsi @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.DotNet.DependencyManager +namespace FSharp.Compiler.DependencyManager + open System diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs b/src/fsharp/DependencyManager/DependencyProvider.fs similarity index 97% rename from src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs rename to src/fsharp/DependencyManager/DependencyProvider.fs index 9879ef415025f73d2a306adb511d8917981486e5..8d5d18b0901e992f6752b7876c8c18503cbc98b6 100644 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fs +++ b/src/fsharp/DependencyManager/DependencyProvider.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.DotNet.DependencyManager +namespace FSharp.Compiler.DependencyManager open System open System.IO @@ -315,7 +315,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr with | e -> let e = stripTieWrapper e - let n, m = DependencyManager.SR.couldNotLoadDependencyManagerExtension(path,e.Message) + let n, m = FSComp.SR.couldNotLoadDependencyManagerExtension(path,e.Message) reportError.Invoke(ErrorReportType.Warning, n, m) None) |> Seq.filter (fun a -> assemblyHasAttribute a dependencyManagerAttributeName) @@ -365,7 +365,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr member _.CreatePackageManagerUnknownError (compilerTools: string seq, outputDir: string, packageManagerKey: string, reportError: ResolvingErrorReport) = let registeredKeys = String.Join(", ", RegisteredDependencyManagers compilerTools (Option.ofString outputDir) reportError |> Seq.map (fun kv -> kv.Value.Key)) let searchPaths = assemblySearchPaths.Force() - DependencyManager.SR.packageManagerUnknown(packageManagerKey, String.Join(", ", searchPaths, compilerTools), registeredKeys) + FSComp.SR.packageManagerUnknown(packageManagerKey, String.Join(", ", searchPaths, compilerTools), registeredKeys) /// Fetch a dependencymanager that supports a specific key member this.TryFindDependencyManagerInPath (compilerTools: string seq, outputDir: string, reportError: ResolvingErrorReport, path: string): string * IDependencyManagerProvider = @@ -385,7 +385,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr with | e -> let e = stripTieWrapper e - let err, msg = DependencyManager.SR.packageManagerError(e.Message) + let err, msg = FSComp.SR.packageManagerError(e.Message) reportError.Invoke(ErrorReportType.Error, err, msg) null, Unchecked.defaultof @@ -399,7 +399,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr with | e -> let e = stripTieWrapper e - let err, msg = DependencyManager.SR.packageManagerError(e.Message) + let err, msg = FSComp.SR.packageManagerError(e.Message) reportError.Invoke(ErrorReportType.Error, err, msg) Unchecked.defaultof @@ -429,7 +429,7 @@ type DependencyProvider (assemblyProbingPaths: AssemblyResolutionProbe, nativePr with e -> let e = stripTieWrapper e - Error (DependencyManager.SR.packageManagerError(e.Message)) + Error (FSComp.SR.packageManagerError(e.Message)) )) match result with | Ok res -> diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fsi b/src/fsharp/DependencyManager/DependencyProvider.fsi similarity index 99% rename from src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fsi rename to src/fsharp/DependencyManager/DependencyProvider.fsi index 9b389aa53d015edd4dcf525e2f2289820a5a3f0a..8760c802b7cdadaed3ef862f9f97b04f46f349ce 100644 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyProvider.fsi +++ b/src/fsharp/DependencyManager/DependencyProvider.fsi @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. /// Helper members to integrate DependencyManagers into F# codebase -namespace Microsoft.DotNet.DependencyManager +namespace FSharp.Compiler.DependencyManager open System.Runtime.InteropServices diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/NativeDllResolveHandler.fs b/src/fsharp/DependencyManager/NativeDllResolveHandler.fs similarity index 99% rename from src/fsharp/Microsoft.DotNet.DependencyManager/NativeDllResolveHandler.fs rename to src/fsharp/DependencyManager/NativeDllResolveHandler.fs index e27a3cd0c6b9805053951399684190884ff6c5bd..24b50c2556829892660d8879655d242570b85529 100644 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/NativeDllResolveHandler.fs +++ b/src/fsharp/DependencyManager/NativeDllResolveHandler.fs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.DotNet.DependencyManager +namespace FSharp.Compiler.DependencyManager open System open System.Collections.Concurrent diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/NativeDllResolveHandler.fsi b/src/fsharp/DependencyManager/NativeDllResolveHandler.fsi similarity index 94% rename from src/fsharp/Microsoft.DotNet.DependencyManager/NativeDllResolveHandler.fsi rename to src/fsharp/DependencyManager/NativeDllResolveHandler.fsi index 05f5567cb366ec25529e4a8e87322456d603d536..d0845bb94f3d3ef8738117556dc380012e3498f2 100644 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/NativeDllResolveHandler.fsi +++ b/src/fsharp/DependencyManager/NativeDllResolveHandler.fsi @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.DotNet.DependencyManager +namespace FSharp.Compiler.DependencyManager open System diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.cs.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.cs.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.cs.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.cs.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.de.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.de.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.de.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.de.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.es.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.es.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.es.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.es.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.fr.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.fr.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.fr.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.fr.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.it.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.it.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.it.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.it.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.ja.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.ja.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.ja.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.ja.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.ko.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.ko.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.ko.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.ko.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.pl.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.pl.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.pl.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.pl.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.pt-BR.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.pt-BR.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.pt-BR.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.pt-BR.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.ru.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.ru.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.ru.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.ru.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.tr.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.tr.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.tr.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.tr.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.zh-Hans.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.zh-Hans.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.zh-Hans.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.zh-Hans.xlf diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.zh-Hant.xlf b/src/fsharp/DependencyManager/xlf/DependencyManager.txt.zh-Hant.xlf similarity index 100% rename from src/fsharp/Microsoft.DotNet.DependencyManager/xlf/DependencyManager.txt.zh-Hant.xlf rename to src/fsharp/DependencyManager/xlf/DependencyManager.txt.zh-Hant.xlf diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index 35001aedfed1fe9d9afeb89a6cdb581541324fb9..d4b14365a762d0be6b12d726f9cfd02a5008f307 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -1552,4 +1552,4 @@ forFormatInvalidForInterpolated4,"Interpolated strings used as type IFormattable 3390,xmlDocDuplicateParameter,"This XML comment is invalid: multiple documentation entries for parameter '%s'" 3390,xmlDocUnresolvedCrossReference,"This XML comment is invalid: unresolved cross-reference '%s'" 3390,xmlDocMissingParameter,"This XML comment is incomplete: no documentation for parameter '%s'" -3391,tcLiteralAttributeCannotUseActivePattern,"A [] declaration cannot use an active pattern for its identifier" \ No newline at end of file +3391,tcLiteralAttributeCannotUseActivePattern,"A [] declaration cannot use an active pattern for its identifier" diff --git a/src/fsharp/FSharp.Compiler.Private.Scripting/Directory.Build.props b/src/fsharp/FSharp.Compiler.Private.Scripting/Directory.Build.props deleted file mode 100644 index 7cd41381b5df865bd221aeb3799e59b35946c720..0000000000000000000000000000000000000000 --- a/src/fsharp/FSharp.Compiler.Private.Scripting/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - true - - - - - diff --git a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj b/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj deleted file mode 100644 index 64348ed32df8fcba67079a1782eca2c5e58a88e5..0000000000000000000000000000000000000000 --- a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - netstandard2.0 - true - Provides embedding F# language scripting. - /blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion) - FSharp.Compiler.Private.Scripting.nuspec - true - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec b/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec deleted file mode 100644 index 231fda050b6c00014b57c028bc4e160ad9cda23f..0000000000000000000000000000000000000000 --- a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec +++ /dev/null @@ -1,28 +0,0 @@ - - - - $CommonMetadataElements$ - en-US - - - - - - - - - - - - - $CommonFileElements$ - - - - - - - - - - diff --git a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharpScript.fs b/src/fsharp/FSharp.Compiler.Private.Scripting/FSharpScript.fs deleted file mode 100644 index db626e29f9f13ae9b53093764957290f35a20bb3..0000000000000000000000000000000000000000 --- a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharpScript.fs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. - -namespace FSharp.Compiler.Scripting - -open System -open System.Threading -open FSharp.Compiler -open FSharp.Compiler.SourceCodeServices -open FSharp.Compiler.Interactive.Shell - -[] -type LangVersion = - | V47 - | V50 - | Preview - -type FSharpScript(?additionalArgs: string[], ?quiet: bool, ?langVersion: LangVersion) = - - let additionalArgs = defaultArg additionalArgs [||] - let quiet = defaultArg quiet true - let langVersion = defaultArg langVersion LangVersion.Preview - - let config = FsiEvaluationSession.GetDefaultConfiguration() - - let computedProfile = - // If we are being executed on the desktop framework (we can tell because the assembly containing int is mscorlib) then profile must be mscorlib otherwise use netcore - if typeof.Assembly.GetName().Name = "mscorlib" then "mscorlib" - else "netcore" - - let baseArgs = [| - typeof.Assembly.Location; - "--noninteractive"; - "--targetprofile:" + computedProfile - if quiet then "--quiet" - match langVersion with - | LangVersion.V47 -> "--langversion:4.7" - | LangVersion.V50 -> "--langversion:5.0" - | LangVersion.Preview -> "--langversion:preview" - |] - - let argv = Array.append baseArgs additionalArgs - - let fsi = FsiEvaluationSession.Create (config, argv, stdin, stdout, stderr) - - member _.ValueBound = fsi.ValueBound - - member _.Fsi = fsi - - member _.Eval(code: string, ?cancellationToken: CancellationToken) = - let cancellationToken = defaultArg cancellationToken CancellationToken.None - let ch, errors = fsi.EvalInteractionNonThrowing(code, cancellationToken) - match ch with - | Choice1Of2 v -> Ok(v), errors - | Choice2Of2 ex -> Error(ex), errors - - /// Get the available completion items from the code at the specified location. - /// - /// The input text on which completions will be calculated - /// The 1-based line index - /// The 0-based column index - member _.GetCompletionItems(text: string, line: int, column: int) = - async { - let! parseResults, checkResults, _projectResults = fsi.ParseAndCheckInteraction(text) - let lineText = text.Split('\n').[line - 1] - let partialName = QuickParse.GetPartialLongNameEx(lineText, column - 1) - let declarationListInfos = checkResults.GetDeclarationListInfo(Some parseResults, line, lineText, partialName) - return declarationListInfos.Items - } - - interface IDisposable with - member _.Dispose() = - (fsi :> IDisposable).Dispose() diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index d093302b70ec1ab6a330e037dfd894097222b6b7..099709eae7eb4541a4d64ad3e8dae0168d164be1 100644 --- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -99,9 +99,6 @@ FSComp.txt - - DependencyManager.txt - FSIstrings.txt @@ -717,22 +714,22 @@ Driver\FxResolver.fs - + Driver\AssemblyResolveHandler.fsi - + Driver\AssemblyResolveHandler.fs - + Driver\NativeDllResolveHandler.fsi - + Driver\NativeDllResolveHandler.fs - + Driver\DependencyProvider.fsi - + Driver\DependencyProvider.fs diff --git a/src/fsharp/FSharp.DependencyManager.Nuget/README.md b/src/fsharp/FSharp.DependencyManager.Nuget/README.md index ed6d326231312cc6274f3d46b13d96741d15115b..01927f4edcbb8551d9d47517f5255dcc56a0c3da 100644 --- a/src/fsharp/FSharp.DependencyManager.Nuget/README.md +++ b/src/fsharp/FSharp.DependencyManager.Nuget/README.md @@ -13,5 +13,3 @@ let o = {| X = 2; Y = "Hello" |} printfn "%s" (JsonConvert.SerializeObject o)" ``` - -There are more Dependency Manager extensions, find more about them: [Microsoft.DotNet.DependencyManager](https://github.com/dotnet/fsharp/tree/main/src/fsharp/Microsoft.DotNet.DependencyManager) diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyManager.txt b/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyManager.txt deleted file mode 100644 index 28e90747182f416226e0416a5335943c1f802cbd..0000000000000000000000000000000000000000 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/DependencyManager.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Microsoft.DotNet.DependencyManager resource strings -3400,packageManagerUnknown,"Package manager key '%s' was not registered in %s. Currently registered: %s" -3401,packageManagerError,"%s" -3402,couldNotLoadDependencyManagerExtension,"The dependency manager extension %s could not be loaded. Message: %s" \ No newline at end of file diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/Directory.Build.props b/src/fsharp/Microsoft.DotNet.DependencyManager/Directory.Build.props deleted file mode 100644 index 7cd41381b5df865bd221aeb3799e59b35946c720..0000000000000000000000000000000000000000 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - true - - - - - diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/Microsoft.DotNet.DependencyManager.fsproj b/src/fsharp/Microsoft.DotNet.DependencyManager/Microsoft.DotNet.DependencyManager.fsproj deleted file mode 100644 index 6e700032fffc2b0ec533cfa300fcbbfdbaac8466..0000000000000000000000000000000000000000 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/Microsoft.DotNet.DependencyManager.fsproj +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - Library - netstandard2.0 - true - Microsoft.DotNet.DependencyManager - $(NoWarn);45;55;62;75;1204 - true - $(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1 - true - - - - - $(BaseOutputPath)\$(Configuration)\$(TargetFramework) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fsharp/Microsoft.DotNet.DependencyManager/README.md b/src/fsharp/Microsoft.DotNet.DependencyManager/README.md deleted file mode 100644 index 09d27d6dd348c5cba4ac038bdff8059d19fc9e7f..0000000000000000000000000000000000000000 --- a/src/fsharp/Microsoft.DotNet.DependencyManager/README.md +++ /dev/null @@ -1,44 +0,0 @@ -# `dotnet fsi` Dependency Manager Plugins - -Since .NET 5.0, `dotnet fsi` ships with dependency manager plugins support that can be called like so: - -```fsharp -#r "myextension: my extension parameters" -``` - -# `#r "nuget:"` [nuget](https://github.com/dotnet/fsharp/tree/main/src/fsharp/FSharp.DependencyManager.Nuget) - -Reference nuget packages, ships by default with `dotnet fsi`. - -```fsharp -#r "nuget: Newtonsoft.Json" -// Optionally, specify a version explicitly -// #r "nuget: Newtonsoft.Json,11.0.1" - -open Newtonsoft.Json - -let o = {| X = 2; Y = "Hello" |} - -printfn "%s" (JsonConvert.SerializeObject o) -``` - -# `#r "paket:"` [paket](https://fsprojects.github.io/Paket/fsi-integration.html) - -Reference dependencies (nuget, git, gist, github) through [Paket package manager](https://fsprojects.github.io/Paket). - -Learn how to use [Paket FSI integration](https://fsprojects.github.io/Paket/fsi-integration.html). - -```fsharp -#r "paket: nuget FSharp.Data" - -open FSharp.Data - -type MyCsv = CsvProvider<""" -X,Y -2,Hello -4,World -"""> - -for r in MyCsv.GetSample().Rows do - printfn "%i = %s" r.X r.Y -``` diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec index 65c303d968530e005f47969a40a33081df652e28..b98ef8ddd4aed69319f3b6252965d440bac1be82 100644 --- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec +++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec @@ -54,9 +54,7 @@ - - @@ -76,7 +74,5 @@ - diff --git a/src/fsharp/ParseAndCheckInputs.fsi b/src/fsharp/ParseAndCheckInputs.fsi index c54a156c78d1dce1268f2ea8706d95e63c067064..6d7a213db3ae0310c420172d194c3bc51fd88f6f 100644 --- a/src/fsharp/ParseAndCheckInputs.fsi +++ b/src/fsharp/ParseAndCheckInputs.fsi @@ -10,12 +10,12 @@ open FSharp.Compiler.CheckDeclarations open FSharp.Compiler.CompilerGlobalState open FSharp.Compiler.CompilerConfig open FSharp.Compiler.CompilerImports +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.SyntaxTree open FSharp.Compiler.TcGlobals open FSharp.Compiler.Text open FSharp.Compiler.TypedTree -open Microsoft.DotNet.DependencyManager val IsScript: string -> bool diff --git a/src/fsharp/ScriptClosure.fs b/src/fsharp/ScriptClosure.fs index 27bc6ec6b12411b551f8e8476cd736606b683448..c092f56c472ecbdb8a53122ba5c086f367dae2ce 100644 --- a/src/fsharp/ScriptClosure.fs +++ b/src/fsharp/ScriptClosure.fs @@ -14,6 +14,7 @@ open FSharp.Compiler.AbstractIL.Internal.Library open FSharp.Compiler.CompilerConfig open FSharp.Compiler.CompilerDiagnostics open FSharp.Compiler.CompilerImports +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.Lib open FSharp.Compiler.ParseAndCheckInputs @@ -22,8 +23,6 @@ open FSharp.Compiler.SyntaxTree open FSharp.Compiler.Text open FSharp.Compiler.Text.Range -open Microsoft.DotNet.DependencyManager - [] type LoadClosureInput = { FileName: string diff --git a/src/fsharp/ScriptClosure.fsi b/src/fsharp/ScriptClosure.fsi index e1d46a2a46ccb49a90a5ecb095555ed1d0066ca7..003bd83d9119590d8cc6e55179e07f6b91375a22 100644 --- a/src/fsharp/ScriptClosure.fsi +++ b/src/fsharp/ScriptClosure.fsi @@ -8,10 +8,10 @@ open FSharp.Compiler.AbstractIL.ILBinaryReader open FSharp.Compiler.AbstractIL.Internal.Library open FSharp.Compiler.CompilerConfig open FSharp.Compiler.CompilerImports +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.SyntaxTree open FSharp.Compiler.Text -open Microsoft.DotNet.DependencyManager [] type CodeContext = diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs index 8247b48805df1aed6e0360dc80dd03b83db591fb..c03360b03d2f21b9cd14a480d7370333676ed3e2 100644 --- a/src/fsharp/fsc.fs +++ b/src/fsharp/fsc.fs @@ -37,6 +37,7 @@ open FSharp.Compiler.CompilerImports open FSharp.Compiler.CompilerOptions open FSharp.Compiler.CompilerGlobalState open FSharp.Compiler.CreateILModule +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.IlxGen open FSharp.Compiler.InfoReader @@ -55,7 +56,6 @@ open FSharp.Compiler.TypedTreeOps open FSharp.Compiler.TcGlobals open FSharp.Compiler.XmlDocFileWriter open FSharp.Compiler.StaticLinking -open Microsoft.DotNet.DependencyManager //---------------------------------------------------------------------------- // Reporting - warnings, errors diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs index 2690d3e8da08f0728de1e0f0f4a8cb72757229dd..fd2f97ef3b2816036a30af2b7b4181aae658ea1a 100644 --- a/src/fsharp/fsi/fsi.fs +++ b/src/fsharp/fsi/fsi.fs @@ -36,6 +36,7 @@ open FSharp.Compiler.CompilerConfig open FSharp.Compiler.CompilerDiagnostics open FSharp.Compiler.CompilerImports open FSharp.Compiler.CompilerGlobalState +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.Features open FSharp.Compiler.IlxGen @@ -61,8 +62,6 @@ open FSharp.Compiler.TcGlobals open FSharp.Compiler.XmlDoc open Internal.Utilities -open Microsoft.DotNet.DependencyManager - // Prevents warnings of experimental APIs - we are using FSharpLexer #nowarn "57" diff --git a/src/fsharp/service/IncrementalBuild.fs b/src/fsharp/service/IncrementalBuild.fs index 24702b6d13b2fe6b9e77938c988f1d863f639806..199ff595c52ede4ba04a93cddafeb45ed6696128 100755 --- a/src/fsharp/service/IncrementalBuild.fs +++ b/src/fsharp/service/IncrementalBuild.fs @@ -22,6 +22,7 @@ open FSharp.Compiler.CompilerGlobalState open FSharp.Compiler.CompilerImports open FSharp.Compiler.CompilerOptions open FSharp.Compiler.CreateILModule +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.NameResolution open FSharp.Compiler.ParseAndCheckInputs @@ -33,8 +34,6 @@ open FSharp.Compiler.Text.Range open FSharp.Compiler.TypedTree open FSharp.Compiler.TypedTreeOps -open Microsoft.DotNet.DependencyManager - open Internal.Utilities open Internal.Utilities.Collections diff --git a/src/fsharp/service/IncrementalBuild.fsi b/src/fsharp/service/IncrementalBuild.fsi index 5c32077dd0ebaed9f4aee43c087adf98d9d7360f..515041091a18e1f40a24da46d96e6cb5eac24f32 100755 --- a/src/fsharp/service/IncrementalBuild.fsi +++ b/src/fsharp/service/IncrementalBuild.fsi @@ -10,6 +10,7 @@ open FSharp.Compiler.AbstractIL.Internal.Library open FSharp.Compiler.CheckDeclarations open FSharp.Compiler.CompilerConfig open FSharp.Compiler.CompilerImports +open FSharp.Compiler.DependencyManager open FSharp.Compiler.ErrorLogger open FSharp.Compiler.NameResolution open FSharp.Compiler.ParseAndCheckInputs @@ -20,8 +21,6 @@ open FSharp.Compiler.TcGlobals open FSharp.Compiler.Text open FSharp.Compiler.TypedTree -open Microsoft.DotNet.DependencyManager - /// Lookup the global static cache for building the FrameworkTcImports type internal FrameworkImportsCache = new : size: int -> FrameworkImportsCache diff --git a/src/fsharp/service/service.fs b/src/fsharp/service/service.fs index 5bcf17caa33e386cddc9455bf8937414a8352b6a..ca1aee411095cddc5b0711d812437ad5e83b26b9 100644 --- a/src/fsharp/service/service.fs +++ b/src/fsharp/service/service.fs @@ -18,6 +18,7 @@ open FSharp.Compiler.CompilerConfig open FSharp.Compiler.CompilerDiagnostics open FSharp.Compiler.CompilerImports open FSharp.Compiler.CompilerOptions +open FSharp.Compiler.DependencyManager open FSharp.Compiler.Driver open FSharp.Compiler.ErrorLogger open FSharp.Compiler.Lib @@ -28,8 +29,6 @@ open FSharp.Compiler.ScriptClosure open FSharp.Compiler.SyntaxTree open FSharp.Compiler.TcGlobals -open Microsoft.DotNet.DependencyManager - open Internal.Utilities open Internal.Utilities.Collections diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/CompletionTests.fs b/tests/FSharp.Compiler.Private.Scripting.UnitTests/CompletionTests.fs index 89c4cc2011610af924d09ff5bfc2b86d7b80d1ed..8355739c4a7e0f85018a8b62d05e19f5c1d76d7d 100644 --- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/CompletionTests.fs +++ b/tests/FSharp.Compiler.Private.Scripting.UnitTests/CompletionTests.fs @@ -4,7 +4,7 @@ namespace FSharp.Compiler.Scripting.UnitTests open System open System.Threading.Tasks -open FSharp.Compiler.Scripting +open FSharp.Test.ScriptHelpers open Xunit type CompletionTests() = diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/ConsoleHelpers.fs b/tests/FSharp.Compiler.Private.Scripting.UnitTests/ConsoleHelpers.fs deleted file mode 100644 index bba21114207e0b12b889ab7131be5f8a30d5d28a..0000000000000000000000000000000000000000 --- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/ConsoleHelpers.fs +++ /dev/null @@ -1,64 +0,0 @@ -namespace FSharp.Compiler.Scripting.UnitTests - -open System -open System.Collections.Generic -open System.IO -open System.Text - -type internal CapturedTextReader() = - inherit TextReader() - let queue = Queue() - member _.ProvideInput(text: string) = - for c in text.ToCharArray() do - queue.Enqueue(c) - override _.Peek() = - if queue.Count > 0 then queue.Peek() |> int else -1 - override _.Read() = - if queue.Count > 0 then queue.Dequeue() |> int else -1 - -type internal RedirectConsoleInput() = - let oldStdIn = Console.In - let newStdIn = new CapturedTextReader() - do Console.SetIn(newStdIn) - member _.ProvideInput(text: string) = - newStdIn.ProvideInput(text) - interface IDisposable with - member _.Dispose() = - Console.SetIn(oldStdIn) - newStdIn.Dispose() - -type internal EventedTextWriter() = - inherit TextWriter() - let sb = StringBuilder() - let lineWritten = Event() - member _.LineWritten = lineWritten.Publish - override _.Encoding = Encoding.UTF8 - override _.Write(c: char) = - if c = '\n' then - let line = - let v = sb.ToString() - if v.EndsWith("\r") then v.Substring(0, v.Length - 1) - else v - sb.Clear() |> ignore - lineWritten.Trigger(line) - else sb.Append(c) |> ignore - -type internal RedirectConsoleOutput() = - let outputProduced = Event() - let errorProduced = Event() - let oldStdOut = Console.Out - let oldStdErr = Console.Error - let newStdOut = new EventedTextWriter() - let newStdErr = new EventedTextWriter() - do newStdOut.LineWritten.Add outputProduced.Trigger - do newStdErr.LineWritten.Add errorProduced.Trigger - do Console.SetOut(newStdOut) - do Console.SetError(newStdErr) - member _.OutputProduced = outputProduced.Publish - member _.ErrorProduced = errorProduced.Publish - interface IDisposable with - member _.Dispose() = - Console.SetOut(oldStdOut) - Console.SetError(oldStdErr) - newStdOut.Dispose() - newStdErr.Dispose() diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs b/tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs index 06f5043328f0a05e3470f03c3237975912d89638..3b973aa06c2fe729120e4f1c57bacdfb9cd251d3 100644 --- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs +++ b/tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs @@ -9,11 +9,10 @@ open System.Runtime.InteropServices open System.Threading open FSharp.Compiler.Interactive.Shell -open FSharp.Compiler.Scripting open FSharp.Compiler.SourceCodeServices -open FSharp.Compiler.Scripting.UnitTests +open FSharp.Compiler.DependencyManager +open FSharp.Test.ScriptHelpers open FSharp.DependencyManager.Nuget -open Microsoft.DotNet.DependencyManager open Internal.Utilities @@ -814,7 +813,7 @@ x |> Seq.iter(fun r -> let report errorType code message = match errorType with | ErrorReportType.Error -> - if code = 3401 then foundCorrectError <- true + if code = 3217 then foundCorrectError <- true else foundWrongError <- true | ErrorReportType.Warning -> printfn "PackageManagementWarning %d : %s" code message ResolvingErrorReport (report) @@ -837,7 +836,7 @@ x |> Seq.iter(fun r -> let report errorType code message = match errorType with | ErrorReportType.Error -> - if code = 3401 then foundCorrectError <- true + if code = 3217 then foundCorrectError <- true else foundWrongError <- true | ErrorReportType.Warning -> printfn "PackageManagementWarning %d : %s" code message ResolvingErrorReport (report) diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj index a45c66c348fb92fdcacfa2e636b0d91955036b3c..dd354231cfb34e7ef16223b0017e074fbc616337 100644 --- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj +++ b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj @@ -11,9 +11,7 @@ - - @@ -26,10 +24,9 @@ + - - - + diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs index d928b886b84c77f9c619c6ce3a79ad9f75238fd8..c218cc2f408f015be4e27f85baa5d0764b70669a 100644 --- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs +++ b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharpScriptTests.fs @@ -10,7 +10,7 @@ open System.Runtime.InteropServices open System.Threading open System.Threading.Tasks open FSharp.Compiler.Interactive.Shell -open FSharp.Compiler.Scripting +open FSharp.Test.ScriptHelpers open Xunit diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/TestHelpers.fs b/tests/FSharp.Compiler.Private.Scripting.UnitTests/TestHelpers.fs deleted file mode 100644 index 6bb9cb04ce6405436d26a4c9c0facc495f4a4a06..0000000000000000000000000000000000000000 --- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/TestHelpers.fs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. - -namespace FSharp.Compiler.Scripting.UnitTests - -open System -open System.IO -open FSharp.Compiler.Interactive.Shell -open FSharp.Compiler.SourceCodeServices - -[] -module TestHelpers = - - let getValue ((value: Result), (errors: FSharpDiagnostic[])) = - if errors.Length > 0 then - failwith <| sprintf "Evaluation returned %d errors:\r\n\t%s" errors.Length (String.Join("\r\n\t", errors)) - match value with - | Ok(value) -> value - | Error ex -> raise ex - - let ignoreValue = getValue >> ignore - - let getTempDir () = - let sysTempDir = Path.GetTempPath() - let customTempDirName = Guid.NewGuid().ToString("D") - let fullDirName = Path.Combine(sysTempDir, customTempDirName) - let dirInfo = Directory.CreateDirectory(fullDirName) - { new Object() with - member _.ToString() = dirInfo.FullName - interface IDisposable with - member _.Dispose() = - dirInfo.Delete(true) - } diff --git a/tests/FSharp.Compiler.Service.Tests/SurfaceArea.netstandard.fs b/tests/FSharp.Compiler.Service.Tests/SurfaceArea.netstandard.fs index 2f2f63d424f2dd5aac1b8a704bfde8b79ec03430..432ad81890d4aa859788671c35a220b62adce5f6 100644 --- a/tests/FSharp.Compiler.Service.Tests/SurfaceArea.netstandard.fs +++ b/tests/FSharp.Compiler.Service.Tests/SurfaceArea.netstandard.fs @@ -9949,76 +9949,76 @@ FSharp.Compiler.XmlDoc+XmlDoc: XmlDoc Merge(XmlDoc, XmlDoc) FSharp.Compiler.XmlDoc+XmlDoc: XmlDoc get_Empty() FSharp.Compiler.XmlDoc: FSharp.Compiler.XmlDoc+PreXmlDoc FSharp.Compiler.XmlDoc: FSharp.Compiler.XmlDoc+XmlDoc -Microsoft.DotNet.DependencyManager.AssemblyResolutionProbe -Microsoft.DotNet.DependencyManager.AssemblyResolutionProbe: System.Collections.Generic.IEnumerable`1[System.String] EndInvoke(System.IAsyncResult) -Microsoft.DotNet.DependencyManager.AssemblyResolutionProbe: System.Collections.Generic.IEnumerable`1[System.String] Invoke() -Microsoft.DotNet.DependencyManager.AssemblyResolutionProbe: System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object) -Microsoft.DotNet.DependencyManager.AssemblyResolutionProbe: Void .ctor(System.Object, IntPtr) -Microsoft.DotNet.DependencyManager.AssemblyResolveHandler -Microsoft.DotNet.DependencyManager.AssemblyResolveHandler: Void .ctor(Microsoft.DotNet.DependencyManager.AssemblyResolutionProbe) -Microsoft.DotNet.DependencyManager.DependencyProvider -Microsoft.DotNet.DependencyManager.DependencyProvider: Microsoft.DotNet.DependencyManager.IDependencyManagerProvider TryFindDependencyManagerByKey(System.Collections.Generic.IEnumerable`1[System.String], System.String, Microsoft.DotNet.DependencyManager.ResolvingErrorReport, System.String) -Microsoft.DotNet.DependencyManager.DependencyProvider: Microsoft.DotNet.DependencyManager.IResolveDependenciesResult Resolve(Microsoft.DotNet.DependencyManager.IDependencyManagerProvider, System.String, System.Collections.Generic.IEnumerable`1[System.Tuple`2[System.String,System.String]], Microsoft.DotNet.DependencyManager.ResolvingErrorReport, System.String, System.String, System.String, System.String, System.String, Int32) -Microsoft.DotNet.DependencyManager.DependencyProvider: System.String[] GetRegisteredDependencyManagerHelpText(System.Collections.Generic.IEnumerable`1[System.String], System.String, Microsoft.DotNet.DependencyManager.ResolvingErrorReport) -Microsoft.DotNet.DependencyManager.DependencyProvider: System.Tuple`2[System.Int32,System.String] CreatePackageManagerUnknownError(System.Collections.Generic.IEnumerable`1[System.String], System.String, System.String, Microsoft.DotNet.DependencyManager.ResolvingErrorReport) -Microsoft.DotNet.DependencyManager.DependencyProvider: System.Tuple`2[System.String,Microsoft.DotNet.DependencyManager.IDependencyManagerProvider] TryFindDependencyManagerInPath(System.Collections.Generic.IEnumerable`1[System.String], System.String, Microsoft.DotNet.DependencyManager.ResolvingErrorReport, System.String) -Microsoft.DotNet.DependencyManager.DependencyProvider: Void .ctor() -Microsoft.DotNet.DependencyManager.DependencyProvider: Void .ctor(Microsoft.DotNet.DependencyManager.AssemblyResolutionProbe, Microsoft.DotNet.DependencyManager.NativeResolutionProbe) -Microsoft.DotNet.DependencyManager.DependencyProvider: Void .ctor(Microsoft.DotNet.DependencyManager.NativeResolutionProbe) -Microsoft.DotNet.DependencyManager.ErrorReportType -Microsoft.DotNet.DependencyManager.ErrorReportType+Tags: Int32 Error -Microsoft.DotNet.DependencyManager.ErrorReportType+Tags: Int32 Warning -Microsoft.DotNet.DependencyManager.ErrorReportType: Boolean Equals(Microsoft.DotNet.DependencyManager.ErrorReportType) -Microsoft.DotNet.DependencyManager.ErrorReportType: Boolean Equals(System.Object) -Microsoft.DotNet.DependencyManager.ErrorReportType: Boolean Equals(System.Object, System.Collections.IEqualityComparer) -Microsoft.DotNet.DependencyManager.ErrorReportType: Boolean IsError -Microsoft.DotNet.DependencyManager.ErrorReportType: Boolean IsWarning -Microsoft.DotNet.DependencyManager.ErrorReportType: Boolean get_IsError() -Microsoft.DotNet.DependencyManager.ErrorReportType: Boolean get_IsWarning() -Microsoft.DotNet.DependencyManager.ErrorReportType: Int32 CompareTo(Microsoft.DotNet.DependencyManager.ErrorReportType) -Microsoft.DotNet.DependencyManager.ErrorReportType: Int32 CompareTo(System.Object) -Microsoft.DotNet.DependencyManager.ErrorReportType: Int32 CompareTo(System.Object, System.Collections.IComparer) -Microsoft.DotNet.DependencyManager.ErrorReportType: Int32 GetHashCode() -Microsoft.DotNet.DependencyManager.ErrorReportType: Int32 GetHashCode(System.Collections.IEqualityComparer) -Microsoft.DotNet.DependencyManager.ErrorReportType: Int32 Tag -Microsoft.DotNet.DependencyManager.ErrorReportType: Int32 get_Tag() -Microsoft.DotNet.DependencyManager.ErrorReportType: Microsoft.DotNet.DependencyManager.ErrorReportType Error -Microsoft.DotNet.DependencyManager.ErrorReportType: Microsoft.DotNet.DependencyManager.ErrorReportType Warning -Microsoft.DotNet.DependencyManager.ErrorReportType: Microsoft.DotNet.DependencyManager.ErrorReportType get_Error() -Microsoft.DotNet.DependencyManager.ErrorReportType: Microsoft.DotNet.DependencyManager.ErrorReportType get_Warning() -Microsoft.DotNet.DependencyManager.ErrorReportType: Microsoft.DotNet.DependencyManager.ErrorReportType+Tags -Microsoft.DotNet.DependencyManager.ErrorReportType: System.String ToString() -Microsoft.DotNet.DependencyManager.IDependencyManagerProvider -Microsoft.DotNet.DependencyManager.IDependencyManagerProvider: Microsoft.DotNet.DependencyManager.IResolveDependenciesResult ResolveDependencies(System.String, System.String, System.String, System.String, System.Collections.Generic.IEnumerable`1[System.Tuple`2[System.String,System.String]], System.String, System.String, Int32) -Microsoft.DotNet.DependencyManager.IDependencyManagerProvider: System.String Key -Microsoft.DotNet.DependencyManager.IDependencyManagerProvider: System.String Name -Microsoft.DotNet.DependencyManager.IDependencyManagerProvider: System.String get_Key() -Microsoft.DotNet.DependencyManager.IDependencyManagerProvider: System.String get_Name() -Microsoft.DotNet.DependencyManager.IDependencyManagerProvider: System.String[] HelpMessages -Microsoft.DotNet.DependencyManager.IDependencyManagerProvider: System.String[] get_HelpMessages() -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: Boolean Success -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: Boolean get_Success() -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] Resolutions -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] Roots -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] SourceFiles -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] get_Resolutions() -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] get_Roots() -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] get_SourceFiles() -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.String[] StdError -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.String[] StdOut -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.String[] get_StdError() -Microsoft.DotNet.DependencyManager.IResolveDependenciesResult: System.String[] get_StdOut() -Microsoft.DotNet.DependencyManager.NativeDllResolveHandler -Microsoft.DotNet.DependencyManager.NativeDllResolveHandler: Void .ctor(Microsoft.DotNet.DependencyManager.NativeResolutionProbe) -Microsoft.DotNet.DependencyManager.NativeResolutionProbe -Microsoft.DotNet.DependencyManager.NativeResolutionProbe: System.Collections.Generic.IEnumerable`1[System.String] EndInvoke(System.IAsyncResult) -Microsoft.DotNet.DependencyManager.NativeResolutionProbe: System.Collections.Generic.IEnumerable`1[System.String] Invoke() -Microsoft.DotNet.DependencyManager.NativeResolutionProbe: System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object) -Microsoft.DotNet.DependencyManager.NativeResolutionProbe: Void .ctor(System.Object, IntPtr) -Microsoft.DotNet.DependencyManager.ResolvingErrorReport -Microsoft.DotNet.DependencyManager.ResolvingErrorReport: System.IAsyncResult BeginInvoke(Microsoft.DotNet.DependencyManager.ErrorReportType, Int32, System.String, System.AsyncCallback, System.Object) -Microsoft.DotNet.DependencyManager.ResolvingErrorReport: Void .ctor(System.Object, IntPtr) -Microsoft.DotNet.DependencyManager.ResolvingErrorReport: Void EndInvoke(System.IAsyncResult) -Microsoft.DotNet.DependencyManager.ResolvingErrorReport: Void Invoke(Microsoft.DotNet.DependencyManager.ErrorReportType, Int32, System.String)" +FSharp.Compiler.DependencyManager.AssemblyResolutionProbe +FSharp.Compiler.DependencyManager.AssemblyResolutionProbe: System.Collections.Generic.IEnumerable`1[System.String] EndInvoke(System.IAsyncResult) +FSharp.Compiler.DependencyManager.AssemblyResolutionProbe: System.Collections.Generic.IEnumerable`1[System.String] Invoke() +FSharp.Compiler.DependencyManager.AssemblyResolutionProbe: System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object) +FSharp.Compiler.DependencyManager.AssemblyResolutionProbe: Void .ctor(System.Object, IntPtr) +FSharp.Compiler.DependencyManager.AssemblyResolveHandler +FSharp.Compiler.DependencyManager.AssemblyResolveHandler: Void .ctor(FSharp.Compiler.DependencyManager.AssemblyResolutionProbe) +FSharp.Compiler.DependencyManager.DependencyProvider +FSharp.Compiler.DependencyManager.DependencyProvider: FSharp.Compiler.DependencyManager.IDependencyManagerProvider TryFindDependencyManagerByKey(System.Collections.Generic.IEnumerable`1[System.String], System.String, FSharp.Compiler.DependencyManager.ResolvingErrorReport, System.String) +FSharp.Compiler.DependencyManager.DependencyProvider: FSharp.Compiler.DependencyManager.IResolveDependenciesResult Resolve(FSharp.Compiler.DependencyManager.IDependencyManagerProvider, System.String, System.Collections.Generic.IEnumerable`1[System.Tuple`2[System.String,System.String]], FSharp.Compiler.DependencyManager.ResolvingErrorReport, System.String, System.String, System.String, System.String, System.String, Int32) +FSharp.Compiler.DependencyManager.DependencyProvider: System.String[] GetRegisteredDependencyManagerHelpText(System.Collections.Generic.IEnumerable`1[System.String], System.String, FSharp.Compiler.DependencyManager.ResolvingErrorReport) +FSharp.Compiler.DependencyManager.DependencyProvider: System.Tuple`2[System.Int32,System.String] CreatePackageManagerUnknownError(System.Collections.Generic.IEnumerable`1[System.String], System.String, System.String, FSharp.Compiler.DependencyManager.ResolvingErrorReport) +FSharp.Compiler.DependencyManager.DependencyProvider: System.Tuple`2[System.String,FSharp.Compiler.DependencyManager.IDependencyManagerProvider] TryFindDependencyManagerInPath(System.Collections.Generic.IEnumerable`1[System.String], System.String, FSharp.Compiler.DependencyManager.ResolvingErrorReport, System.String) +FSharp.Compiler.DependencyManager.DependencyProvider: Void .ctor() +FSharp.Compiler.DependencyManager.DependencyProvider: Void .ctor(FSharp.Compiler.DependencyManager.AssemblyResolutionProbe, FSharp.Compiler.DependencyManager.NativeResolutionProbe) +FSharp.Compiler.DependencyManager.DependencyProvider: Void .ctor(FSharp.Compiler.DependencyManager.NativeResolutionProbe) +FSharp.Compiler.DependencyManager.ErrorReportType +FSharp.Compiler.DependencyManager.ErrorReportType+Tags: Int32 Error +FSharp.Compiler.DependencyManager.ErrorReportType+Tags: Int32 Warning +FSharp.Compiler.DependencyManager.ErrorReportType: Boolean Equals(FSharp.Compiler.DependencyManager.ErrorReportType) +FSharp.Compiler.DependencyManager.ErrorReportType: Boolean Equals(System.Object) +FSharp.Compiler.DependencyManager.ErrorReportType: Boolean Equals(System.Object, System.Collections.IEqualityComparer) +FSharp.Compiler.DependencyManager.ErrorReportType: Boolean IsError +FSharp.Compiler.DependencyManager.ErrorReportType: Boolean IsWarning +FSharp.Compiler.DependencyManager.ErrorReportType: Boolean get_IsError() +FSharp.Compiler.DependencyManager.ErrorReportType: Boolean get_IsWarning() +FSharp.Compiler.DependencyManager.ErrorReportType: Int32 CompareTo(FSharp.Compiler.DependencyManager.ErrorReportType) +FSharp.Compiler.DependencyManager.ErrorReportType: Int32 CompareTo(System.Object) +FSharp.Compiler.DependencyManager.ErrorReportType: Int32 CompareTo(System.Object, System.Collections.IComparer) +FSharp.Compiler.DependencyManager.ErrorReportType: Int32 GetHashCode() +FSharp.Compiler.DependencyManager.ErrorReportType: Int32 GetHashCode(System.Collections.IEqualityComparer) +FSharp.Compiler.DependencyManager.ErrorReportType: Int32 Tag +FSharp.Compiler.DependencyManager.ErrorReportType: Int32 get_Tag() +FSharp.Compiler.DependencyManager.ErrorReportType: FSharp.Compiler.DependencyManager.ErrorReportType Error +FSharp.Compiler.DependencyManager.ErrorReportType: FSharp.Compiler.DependencyManager.ErrorReportType Warning +FSharp.Compiler.DependencyManager.ErrorReportType: FSharp.Compiler.DependencyManager.ErrorReportType get_Error() +FSharp.Compiler.DependencyManager.ErrorReportType: FSharp.Compiler.DependencyManager.ErrorReportType get_Warning() +FSharp.Compiler.DependencyManager.ErrorReportType: FSharp.Compiler.DependencyManager.ErrorReportType+Tags +FSharp.Compiler.DependencyManager.ErrorReportType: System.String ToString() +FSharp.Compiler.DependencyManager.IDependencyManagerProvider +FSharp.Compiler.DependencyManager.IDependencyManagerProvider: FSharp.Compiler.DependencyManager.IResolveDependenciesResult ResolveDependencies(System.String, System.String, System.String, System.String, System.Collections.Generic.IEnumerable`1[System.Tuple`2[System.String,System.String]], System.String, System.String, Int32) +FSharp.Compiler.DependencyManager.IDependencyManagerProvider: System.String Key +FSharp.Compiler.DependencyManager.IDependencyManagerProvider: System.String Name +FSharp.Compiler.DependencyManager.IDependencyManagerProvider: System.String get_Key() +FSharp.Compiler.DependencyManager.IDependencyManagerProvider: System.String get_Name() +FSharp.Compiler.DependencyManager.IDependencyManagerProvider: System.String[] HelpMessages +FSharp.Compiler.DependencyManager.IDependencyManagerProvider: System.String[] get_HelpMessages() +FSharp.Compiler.DependencyManager.IResolveDependenciesResult +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: Boolean Success +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: Boolean get_Success() +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] Resolutions +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] Roots +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] SourceFiles +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] get_Resolutions() +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] get_Roots() +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.Collections.Generic.IEnumerable`1[System.String] get_SourceFiles() +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.String[] StdError +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.String[] StdOut +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.String[] get_StdError() +FSharp.Compiler.DependencyManager.IResolveDependenciesResult: System.String[] get_StdOut() +FSharp.Compiler.DependencyManager.NativeDllResolveHandler +FSharp.Compiler.DependencyManager.NativeDllResolveHandler: Void .ctor(FSharp.Compiler.DependencyManager.NativeResolutionProbe) +FSharp.Compiler.DependencyManager.NativeResolutionProbe +FSharp.Compiler.DependencyManager.NativeResolutionProbe: System.Collections.Generic.IEnumerable`1[System.String] EndInvoke(System.IAsyncResult) +FSharp.Compiler.DependencyManager.NativeResolutionProbe: System.Collections.Generic.IEnumerable`1[System.String] Invoke() +FSharp.Compiler.DependencyManager.NativeResolutionProbe: System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object) +FSharp.Compiler.DependencyManager.NativeResolutionProbe: Void .ctor(System.Object, IntPtr) +FSharp.Compiler.DependencyManager.ResolvingErrorReport +FSharp.Compiler.DependencyManager.ResolvingErrorReport: System.IAsyncResult BeginInvoke(FSharp.Compiler.DependencyManager.ErrorReportType, Int32, System.String, System.AsyncCallback, System.Object) +FSharp.Compiler.DependencyManager.ResolvingErrorReport: Void .ctor(System.Object, IntPtr) +FSharp.Compiler.DependencyManager.ResolvingErrorReport: Void EndInvoke(System.IAsyncResult) +FSharp.Compiler.DependencyManager.ResolvingErrorReport: Void Invoke(FSharp.Compiler.DependencyManager.ErrorReportType, Int32, System.String)" SurfaceArea.verify expected "netstandard" (System.IO.Path.Combine(__SOURCE_DIRECTORY__,__SOURCE_FILE__)) \ No newline at end of file diff --git a/tests/FSharp.Test.Utilities/Compiler.fs b/tests/FSharp.Test.Utilities/Compiler.fs index d16ba1c9af82661b2fa9832005d51a6da51f636f..34368d3f67e3d01699c2b5b2cad07661b04ef8d5 100644 --- a/tests/FSharp.Test.Utilities/Compiler.fs +++ b/tests/FSharp.Test.Utilities/Compiler.fs @@ -3,11 +3,11 @@ namespace FSharp.Test.Utilities open FSharp.Compiler.Interactive.Shell -open FSharp.Compiler.Scripting open FSharp.Compiler.SourceCodeServices open FSharp.Test.Utilities open FSharp.Test.Utilities.Assert open FSharp.Test.Utilities.Utilities +open FSharp.Test.ScriptHelpers open Microsoft.CodeAnalysis open Microsoft.CodeAnalysis.CSharp open NUnit.Framework diff --git a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj index 504caaa67962be197fab8554c8a7b7c3663ca026..17bc403c6902b0bd96228f767572c6f15d7393b6 100644 --- a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj +++ b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj @@ -22,6 +22,7 @@ + @@ -32,7 +33,6 @@ - diff --git a/tests/FSharp.Test.Utilities/ScriptHelpers.fs b/tests/FSharp.Test.Utilities/ScriptHelpers.fs new file mode 100644 index 0000000000000000000000000000000000000000..4e686f50acec510af70cb0e02e4b46923f421186 --- /dev/null +++ b/tests/FSharp.Test.Utilities/ScriptHelpers.fs @@ -0,0 +1,157 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace FSharp.Test.ScriptHelpers + +open System +open System.Collections.Generic +open System.IO +open System.Text +open System.Threading +open FSharp.Compiler +open FSharp.Compiler.Interactive.Shell +open FSharp.Compiler.SourceCodeServices + +type CapturedTextReader() = + inherit TextReader() + let queue = Queue() + member _.ProvideInput(text: string) = + for c in text.ToCharArray() do + queue.Enqueue(c) + override _.Peek() = + if queue.Count > 0 then queue.Peek() |> int else -1 + override _.Read() = + if queue.Count > 0 then queue.Dequeue() |> int else -1 + +type RedirectConsoleInput() = + let oldStdIn = Console.In + let newStdIn = new CapturedTextReader() + do Console.SetIn(newStdIn) + member _.ProvideInput(text: string) = + newStdIn.ProvideInput(text) + interface IDisposable with + member _.Dispose() = + Console.SetIn(oldStdIn) + newStdIn.Dispose() + +type EventedTextWriter() = + inherit TextWriter() + let sb = StringBuilder() + let lineWritten = Event() + member _.LineWritten = lineWritten.Publish + override _.Encoding = Encoding.UTF8 + override _.Write(c: char) = + if c = '\n' then + let line = + let v = sb.ToString() + if v.EndsWith("\r") then v.Substring(0, v.Length - 1) + else v + sb.Clear() |> ignore + lineWritten.Trigger(line) + else sb.Append(c) |> ignore + +type RedirectConsoleOutput() = + let outputProduced = Event() + let errorProduced = Event() + let oldStdOut = Console.Out + let oldStdErr = Console.Error + let newStdOut = new EventedTextWriter() + let newStdErr = new EventedTextWriter() + do newStdOut.LineWritten.Add outputProduced.Trigger + do newStdErr.LineWritten.Add errorProduced.Trigger + do Console.SetOut(newStdOut) + do Console.SetError(newStdErr) + member _.OutputProduced = outputProduced.Publish + member _.ErrorProduced = errorProduced.Publish + interface IDisposable with + member _.Dispose() = + Console.SetOut(oldStdOut) + Console.SetError(oldStdErr) + newStdOut.Dispose() + newStdErr.Dispose() + + +[] +type LangVersion = + | V47 + | V50 + | Preview + +type FSharpScript(?additionalArgs: string[], ?quiet: bool, ?langVersion: LangVersion) = + + let additionalArgs = defaultArg additionalArgs [||] + let quiet = defaultArg quiet true + let langVersion = defaultArg langVersion LangVersion.Preview + let config = FsiEvaluationSession.GetDefaultConfiguration() + + let computedProfile = + // If we are being executed on the desktop framework (we can tell because the assembly containing int is mscorlib) then profile must be mscorlib otherwise use netcore + if typeof.Assembly.GetName().Name = "mscorlib" then "mscorlib" + else "netcore" + + let baseArgs = [| + typeof.Assembly.Location; + "--noninteractive"; + "--targetprofile:" + computedProfile + if quiet then "--quiet" + match langVersion with + | LangVersion.V47 -> "--langversion:4.7" + | LangVersion.V50 -> "--langversion:5.0" + | LangVersion.Preview -> "--langversion:preview" + |] + + let argv = Array.append baseArgs additionalArgs + + let fsi = FsiEvaluationSession.Create (config, argv, stdin, stdout, stderr) + + member _.ValueBound = fsi.ValueBound + + member _.Fsi = fsi + + member _.Eval(code: string, ?cancellationToken: CancellationToken) = + let cancellationToken = defaultArg cancellationToken CancellationToken.None + let ch, errors = fsi.EvalInteractionNonThrowing(code, cancellationToken) + match ch with + | Choice1Of2 v -> Ok(v), errors + | Choice2Of2 ex -> Error(ex), errors + + /// Get the available completion items from the code at the specified location. + /// + /// The input text on which completions will be calculated + /// The 1-based line index + /// The 0-based column index + member _.GetCompletionItems(text: string, line: int, column: int) = + async { + let! parseResults, checkResults, _projectResults = fsi.ParseAndCheckInteraction(text) + let lineText = text.Split('\n').[line - 1] + let partialName = QuickParse.GetPartialLongNameEx(lineText, column - 1) + let declarationListInfos = checkResults.GetDeclarationListInfo(Some parseResults, line, lineText, partialName) + return declarationListInfos.Items + } + + interface IDisposable with + member _.Dispose() = + (fsi :> IDisposable).Dispose() + +[] +module TestHelpers = + + let getValue ((value: Result), (errors: FSharpDiagnostic[])) = + if errors.Length > 0 then + failwith <| sprintf "Evaluation returned %d errors:\r\n\t%s" errors.Length (String.Join("\r\n\t", errors)) + match value with + | Ok(value) -> value + | Error ex -> raise ex + + let ignoreValue = getValue >> ignore + + let getTempDir () = + let sysTempDir = Path.GetTempPath() + let customTempDirName = Guid.NewGuid().ToString("D") + let fullDirName = Path.Combine(sysTempDir, customTempDirName) + let dirInfo = Directory.CreateDirectory(fullDirName) + { new Object() with + member _.ToString() = dirInfo.FullName + interface IDisposable with + member _.Dispose() = + dirInfo.Delete(true) + } diff --git a/tests/FSharp.Test.Utilities/TestFramework.fs b/tests/FSharp.Test.Utilities/TestFramework.fs index a27a140c981299389b1b6488bdf7ffd8e89a9acd..f2f8b2c567930e88969fc2d809a56553a73f4a7a 100644 --- a/tests/FSharp.Test.Utilities/TestFramework.fs +++ b/tests/FSharp.Test.Utilities/TestFramework.fs @@ -412,11 +412,6 @@ type public InitializeSuiteAttribute () = override x.Targets = ActionTargets.Test ||| ActionTargets.Suite - -[] -[] -() - let fsharpSuiteDirectory = __SOURCE_DIRECTORY__ let testConfig testDir = diff --git a/tests/fsharp/tools/fsharp41/net45/providerDesigner.dll b/tests/fsharp/tools/fsharp41/net45/providerDesigner.dll new file mode 100644 index 0000000000000000000000000000000000000000..cb79536e157facb1e7eb4a0b37657130a7e2937e Binary files /dev/null and b/tests/fsharp/tools/fsharp41/net45/providerDesigner.dll differ diff --git a/tests/fsharp/tools/fsharp41/net461/providerDesigner.dll b/tests/fsharp/tools/fsharp41/net461/providerDesigner.dll new file mode 100644 index 0000000000000000000000000000000000000000..1b581c260dc417aad57c74957f547cb50a9ec326 Binary files /dev/null and b/tests/fsharp/tools/fsharp41/net461/providerDesigner.dll differ diff --git a/tests/fsharp/tools/fsharp41/netstandard2.0/providerDesigner.dll b/tests/fsharp/tools/fsharp41/netstandard2.0/providerDesigner.dll new file mode 100644 index 0000000000000000000000000000000000000000..1b6a4ded584d05b043fcc4b3892ec7b76d92b6a6 Binary files /dev/null and b/tests/fsharp/tools/fsharp41/netstandard2.0/providerDesigner.dll differ diff --git a/tests/fsharp/typeProviders/fsharp41/net45/providerDesigner.dll b/tests/fsharp/typeProviders/fsharp41/net45/providerDesigner.dll new file mode 100644 index 0000000000000000000000000000000000000000..c033697fd002c06e56faa82597d0104b3d1016a3 Binary files /dev/null and b/tests/fsharp/typeProviders/fsharp41/net45/providerDesigner.dll differ diff --git a/tests/fsharp/typeProviders/fsharp41/net461/providerDesigner.dll b/tests/fsharp/typeProviders/fsharp41/net461/providerDesigner.dll new file mode 100644 index 0000000000000000000000000000000000000000..a26e114cc7427734e225cce2a831a04f744d6303 Binary files /dev/null and b/tests/fsharp/typeProviders/fsharp41/net461/providerDesigner.dll differ diff --git a/tests/fsharp/typeProviders/fsharp41/netstandard2.0/providerDesigner.dll b/tests/fsharp/typeProviders/fsharp41/netstandard2.0/providerDesigner.dll new file mode 100644 index 0000000000000000000000000000000000000000..4f0c61b8cea8e46812f92203d5470d66b4b2c328 Binary files /dev/null and b/tests/fsharp/typeProviders/fsharp41/netstandard2.0/providerDesigner.dll differ diff --git a/tests/fsharpqa/Source/InteractiveSession/Misc/UnknownDependencyManager/script1.fsx b/tests/fsharpqa/Source/InteractiveSession/Misc/UnknownDependencyManager/script1.fsx index b5365a617afe33f5fbeeeafc4bca802b76bb1ca2..2c30ed8ff151dc37dbe544320dd1d612cd4da70b 100644 --- a/tests/fsharpqa/Source/InteractiveSession/Misc/UnknownDependencyManager/script1.fsx +++ b/tests/fsharpqa/Source/InteractiveSession/Misc/UnknownDependencyManager/script1.fsx @@ -1,5 +1,5 @@ -//Package manager key 'unk' was not registered -//Processing of a script fragment has stopped because an exception has been raised +//Package manager key 'unk' was not registered +//Processing of a script fragment has stopped because an exception has been raised #r "unk: blubblub"