Scripting package (#8173)

Author: KevinRansom

src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj

@@ -21,6 +21,7 @@
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.DependencyManager\FSharp.DependencyManager.fsproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
   </ItemGroup>
 
 </Project>

src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec

@@ -5,17 +5,20 @@
         <language>en-US</language>
         <dependencies>
             <group targetFramework=".NETStandard2.0">
-                <dependency id="FSharp.Core" version="$FSharpCoreVersion$" exclude="Build,Analyzers" />
             </group>
         </dependencies>
     </metadata>
     <files>
         $CommonFileElements$
+        <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Core.dll" target="lib\netstandard2.0" />
+        <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Core.xml" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Private.Scripting.dll" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Private.Scripting.xml" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Private.dll" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Private.xml" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.DependencyManager.dll" target="lib\netstandard2.0" />
         <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.DependencyManager.xml" target="lib\netstandard2.0" />
+        <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Interactive.Settings.dll" target="lib\netstandard2.0" />
+        <file src="FSharp.Compiler.Private.Scripting\$Configuration$\$TargetFramework$\FSharp.Compiler.Interactive.Settings.xml" target="lib\netstandard2.0" />
     </files>
 </package>

src/utils/CompilerLocationUtils.fs

@@ -182,10 +182,6 @@ module internal FSharpEnvironment =
     //     - default location of fsi.exe in FSharp.VS.FSI.dll (REVIEW: check this)
     //     - default F# binaries directory in (project system) Project.fs
     let BinFolderOfDefaultFSharpCompiler(probePoint:string option) =
-#if FX_NO_WIN_REGISTRY
-        ignore probePoint
-        Some AppDomain.CurrentDomain.BaseDirectory
-#else
         // Check for an app.config setting to redirect the default compiler location
         // Like fsharp-compiler-location
         try
@@ -200,18 +196,17 @@ module internal FSharpEnvironment =
             // Look in the probePoint if given, e.g. look for a compiler alongside of FSharp.Build.dll
             match probePoint with 
             | Some p when safeExists (Path.Combine(p,"FSharp.Core.dll")) -> Some p 
-            | _ -> 
-
-            // We let you set FSHARP_COMPILER_BIN. I've rarely seen this used and its not documented in the install instructions.
-            let result = Environment.GetEnvironmentVariable("FSHARP_COMPILER_BIN")
-            if not (String.IsNullOrEmpty(result)) then
-                Some result
-            else
-                // For the prototype compiler, we can just use the current domain
-                tryCurrentDomain()
+            | _ ->
+                // We let you set FSHARP_COMPILER_BIN. I've rarely seen this used and its not documented in the install instructions.
+                let result = Environment.GetEnvironmentVariable("FSHARP_COMPILER_BIN")
+                if not (String.IsNullOrEmpty(result)) then
+                    Some result
+                else
+                    // For the prototype compiler, we can just use the current domain
+                    tryCurrentDomain()
         with e -> None
 
-
+#if !FX_NO_WIN_REGISTRY
     // Apply the given function to the registry entry corresponding to the subKey.
     // The reg key is disposed at the end of the scope.
     let useKey subKey f =
@@ -236,7 +231,7 @@ module internal FSharpEnvironment =
         IsNetFx45OrAboveInstalledAt @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" ||
         IsNetFx45OrAboveInstalledAt @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" ||
         runningOnMono
-
+    
     // Check if the running framework version is 4.5 or above.
     // Use the presence of v4.5.x in the registry to distinguish between 4.0 and 4.5
     let IsRunningOnNetFx45OrAbove =