Fix build

dotnet · Sep 9, 2019 · 0fcfe15 · 0fcfe15
1 parent 78bfdac
commit 0fcfe15
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 42 deletions.
diff --git a/FSharp.sln b/FSharp.sln
@@ -13,13 +13,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Build", "src\fsharp\FSharp.Build\FSharp.Build.fsproj", "{702A7979-BCF9-4C41-853E-3ADFC9897890}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fsc", "src\fsharp\Fsc\Fsc.fsproj", "{C94C257C-3C0A-4858-B5D8-D746498D1F08}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fsc", "src\fsharp\fsc\fsc.fsproj", "{C94C257C-3C0A-4858-B5D8-D746498D1F08}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Interactive.Settings", "src\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj", "{649FA588-F02E-457C-9FCF-87E46407481E}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsi", "src\fsharp\fsi\fsi.fsproj", "{D0E98C0D-490B-4C61-9329-0862F6E87645}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsiAnyCPU", "src\fsharp\fsiAnyCpu\FsiAnyCPU.fsproj", "{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsiAnyCpu", "src\fsharp\fsiAnyCpu\fsiAnyCpu.fsproj", "{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{649FA588-F02E-457C-9FCF-87E46407481E} = {649FA588-F02E-457C-9FCF-87E46407481E}
 	EndProjectSection
@@ -28,8 +28,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpSuite.Tests", "tests\
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Tests.FSharpSuite", "tests\fsharp\FSharp.Tests.FSharpSuite.fsproj", "{4E7B9500-6DEF-4C33-BF18-246F7E2C0BC6}"
-EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core.UnitTests", "tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
@@ -47,6 +45,7 @@ EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer", "src\fsharp\FSharp.Compiler.LanguageServer\FSharp.Compiler.LanguageServer.fsproj", "{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer.UnitTests", "tests\FSharp.Compiler.LanguageServer.UnitTests\FSharp.Compiler.LanguageServer.UnitTests.fsproj", "{C97819B0-B428-4B96-9CD7-497D2D1C738C}"
+EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.DependencyManager", "src\fsharp\FSharp.DependencyManager\FSharp.DependencyManager.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}"

diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -1,5 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
-<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
+<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\netfx.props" />
   <Import Project="..\..\src\buildtools\buildtools.targets" />
@@ -519,9 +518,6 @@
     <Compile Include="$(FSharpSourcesRoot)/fsharp/DotNetFrameworkDependencies.fs">
       <Link>Driver\DotNetFrameworkDependencies.fs</Link>
     </Compile>
-    <Compile Include="$(FSharpSourcesRoot)/fsharp/CompileOps.fsi">
-    <Compile Include="$(FSharpSourcesRoot)\fsharp\DependencyManager.Integration.fsi">
-      <Link>Driver\DependencyManager.Integration.fsi</Link>
     <Compile Include="$(FSharpSourcesRoot)/fsharp/DependencyManager.Integration.fsi">
       <Link>Driver/DependencyManager.Integration.fsi</Link>
     </Compile>

diff --git a/src/fsharp/DotNetFrameworkDependencies.fs b/src/fsharp/DotNetFrameworkDependencies.fs
@@ -83,11 +83,15 @@ module internal FSharp.Compiler.DotNetFrameworkDependencies
     let netcoreTfm =
         let file =
             try
-                let depsJsonPath = Path.ChangeExtension(Assembly.GetEntryAssembly().Location, "deps.json")
-                if File.Exists(depsJsonPath) then
-                    File.ReadAllText(depsJsonPath)
-                else
-                    ""
+                let asm = Assembly.GetEntryAssembly()
+                match asm with
+                | null -> ""
+                | asm ->
+                    let depsJsonPath = Path.ChangeExtension(asm.Location, "deps.json")
+                    if File.Exists(depsJsonPath) then
+                        File.ReadAllText(depsJsonPath)
+                    else
+                        ""
             with _ -> ""
 
         let tfmPrefix=".NETCoreApp,Version=v"

diff --git a/tests/FSharp.Compiler.UnitTests/ProductVersion.fs b/tests/FSharp.Compiler.UnitTests/ProductVersion.fs
@@ -85,31 +85,3 @@ module ProductVersionTest =
     let ``should zero starting from first invalid version part`` () = 
         for (v, expected) in  invalidValues() do
             v |> productVersionToILVersionInfo |> Assert.areEqual expected
-
-module TypeProviderDesignTimeComponentLoading =
-
-
-    [<Test>]
-    let ``check tooling paths for type provider design time component loading`` () =
-        let expected =
-          [
-#if NET472 // only available on net472
-            Path.Combine("typeproviders", "fsharp41", "net461")
-            Path.Combine("tools", "fsharp41", "net461")
-            Path.Combine("typeproviders", "fsharp41", "net452")
-            Path.Combine("tools", "fsharp41", "net452")
-            Path.Combine("typeproviders", "fsharp41", "net451")
-            Path.Combine("tools", "fsharp41", "net451")
-            Path.Combine("typeproviders", "fsharp41", "net45")
-            Path.Combine("tools", "fsharp41", "net45")
-#else // only available on netcoreapp2.0
-            Path.Combine("typeproviders", "fsharp41", "netcoreapp2.0")
-            Path.Combine("tools", "fsharp41", "netcoreapp2.0")
-#endif // available in both
-            Path.Combine("typeproviders", "fsharp41", "netstandard2.0")
-            Path.Combine("tools", "fsharp41", "netstandard2.0")
-          ]
-        let actual = FSharp.Compiler.ExtensionTyping.toolingCompatiblePaths()
-        printfn "actual = %A" actual
-        printfn "expected = %A" expected
-        Assert.True((expected=actual))