Use strong-name signed FSharp.Compiler.Interactive.Settings.dll in FSharp.Compiler.Tools package

dsyme · dsyme · commit 662492595a63 · 2018-02-14T15:13:02.000Z
diff --git a/CHANGELOG-fsharp.md b/CHANGELOG-fsharp.md
@@ -1,3 +1,6 @@
+4.1.34
+ * Use strong-name signed FSharp.Compiler.Interactive.Settings.dll in FSharp.Compiler.Tools package
+
 4.1.33
  * Cherry pick https://github.com/Microsoft/visualfsharp/pull/4348/
 
diff --git a/FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec b/FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec
@@ -35,8 +35,7 @@
     <file src="..\Release\net40\bin\FSharp.Compiler.Private.xml" target="tools\FSharp.Compiler.Private.xml" />
     <file src="..\Release\net40\bin\FSharp.Compiler.Server.Shared.dll" target="tools\FSharp.Compiler.Server.Shared.dll" />
     <file src="..\Release\net40\bin\FSharp.Compiler.Server.Shared.xml" target="tools\FSharp.Compiler.Server.Shared.xml" />
-    <file src="..\Release\net40\bin\FSharp.Compiler.Interactive.Settings.dll" target="tools\FSharp.Compiler.Interactive.Settings.dll" />
-    <file src="..\Release\net40\bin\FSharp.Compiler.Interactive.Settings.xml" target="tools\FSharp.Compiler.Interactive.Settings.xml" />
+    <file src="..\lib\bootstrap\signed\SDK\4.1\FSharp.Compiler.Interactive.Settings.dll" target="tools\FSharp.Compiler.Interactive.Settings.dll" />
     <file src="..\Release\net40\bin\fsiAnyCpu.exe" target="tools\fsiAnyCpu.exe" />
     <file src="..\Release\net40\bin\fsiAnyCpu.exe.config" target="tools\fsiAnyCpu.exe.config" />
     <file src="..\Release\net40\bin\fsiAnyCpu.xml" target="tools\fsiAnyCpu.xml" />
diff --git a/lib/bootstrap/signed/SDK/4.1/FSharp.Compiler.Interactive.Settings.dll b/lib/bootstrap/signed/SDK/4.1/FSharp.Compiler.Interactive.Settings.dll
diff --git a/mono/appveyor.ps1 b/mono/appveyor.ps1
@@ -1,6 +1,6 @@
 
 # the version under development, update after a release
-$version = '4.1.33'
+$version = '4.1.34'
 
 function isVersionTag($tag){
     $v = New-Object Version

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +4.1.34
 + * Use strong-name signed FSharp.Compiler.Interactive.Settings.dll in FSharp.Compiler.Tools package
++
 .1.33
  * Cherry pick https://github.com/Microsoft/visualfsharp/pull/4348/