From 755d2afece6445fefc7c049270f9952a9c2e9e67 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter@hotmail.com>
Date: Sun, 2 Aug 2020 21:37:21 -0700
Subject: [PATCH 1/3] Fix Package Scripting nuget package

---
 .../FSharp.Compiler.Private.Scripting.fsproj                   | 3 ++-
 .../FSharp.Compiler.Private.Scripting.nuspec                   | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

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
index 58472c59e37..3adf2846f79 100644
--- a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.fsproj
@@ -13,7 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <NuspecProperty Include="FSharpCoreVersion=$(FSCorePackageVersion)-$(VersionSuffix)" />
+    <NuspecProperty Include="FsharpCorePackageVersion=$(FSCorePackageVersion)" Condition="'$(VersionSuffix)'==''" />
+    <NuspecProperty Include="FsharpCorePackageVersion=$(FSCorePackageVersion)-$(VersionSuffix)" Condition="'$(VersionSuffix)'!=''" />
     <NuspecProperty Include="TargetFramework=$(TargetFramework)" />
   </ItemGroup>
 
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
index 0e52e1b4300..00485262264 100644
--- a/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec
+++ b/src/fsharp/FSharp.Compiler.Private.Scripting/FSharp.Compiler.Private.Scripting.nuspec
@@ -5,13 +5,12 @@
         <language>en-US</language>
         <dependencies>
             <group targetFramework=".NETStandard2.0">
+                <dependency id="FSharp.Core" version="$FSharpCorePackageVersion$" />
             </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" />

From 3f9fb4df28644dd877d2fada095409221474cf29 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter@hotmail.com>
Date: Wed, 5 Aug 2020 18:46:06 -0700
Subject: [PATCH 2/3] Compose

---
 tests/FSharp.Test.Utilities/Compiler.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/FSharp.Test.Utilities/Compiler.fs b/tests/FSharp.Test.Utilities/Compiler.fs
index 4e1850dbdc8..ceb0ab2a688 100644
--- a/tests/FSharp.Test.Utilities/Compiler.fs
+++ b/tests/FSharp.Test.Utilities/Compiler.fs
@@ -178,7 +178,7 @@ module rec Compiler =
 
     let withPreview (cUnit: CompilationUnit) : CompilationUnit =
         match cUnit with
-        | FS fs -> FS { fs with Options = [ "--langversion:preview" ] }
+        | FS fs -> FS { fs with Options = fs.Options @ [ "--langversion:preview" ] }
         | _ -> failwith "withPreview is only supported in F#"
 
     let asLibrary (cUnit: CompilationUnit) : CompilationUnit =

From 314019c98740e9ac3ab3053a6e0c14543a7d0d8a Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter@hotmail.com>
Date: Wed, 5 Aug 2020 18:55:18 -0700
Subject: [PATCH 3/3] Phillip suggested options should compose too

---
 tests/FSharp.Test.Utilities/Compiler.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/FSharp.Test.Utilities/Compiler.fs b/tests/FSharp.Test.Utilities/Compiler.fs
index ceb0ab2a688..18676f5893d 100644
--- a/tests/FSharp.Test.Utilities/Compiler.fs
+++ b/tests/FSharp.Test.Utilities/Compiler.fs
@@ -173,7 +173,7 @@ module rec Compiler =
 
     let withOptions (options: string list) (cUnit: CompilationUnit) : CompilationUnit =
         match cUnit with
-        | FS fs -> FS { fs with Options = options }
+        | FS fs -> FS { fs with Options = fs.Options @ options }
         | _ -> failwith "withOptions is only supported n F#"
 
     let withPreview (cUnit: CompilationUnit) : CompilationUnit =