diff --git a/setup/Swix/Microsoft.FSharp.SDK/Files.swr b/setup/Swix/Microsoft.FSharp.SDK/Files.swr
index 271db6961cd..228bc933437 100644
--- a/setup/Swix/Microsoft.FSharp.SDK/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.SDK/Files.swr
@@ -17,10 +17,10 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.sigdata"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.xml"
folder "3.7.41.0"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45\FSharp.Core.dll"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45\FSharp.Core.optdata"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45\FSharp.Core.sigdata"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45\FSharp.Core.xml"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.dll"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.optdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.sigdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.xml"
folder "3.78.3.1"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.dll"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.optdata"
@@ -32,10 +32,10 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.sigdata"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.xml"
folder "3.78.41.0"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wp8\FSharp.Core.dll"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wp8\FSharp.Core.optdata"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wp8\FSharp.Core.sigdata"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wp8\FSharp.Core.xml"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.dll"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.optdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.sigdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.xml"
folder "3.259.3.1"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.dll"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.optdata"
@@ -47,10 +47,10 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.sigdata"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.xml"
folder "3.259.41.0"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.optdata"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.sigdata"
- file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.xml"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.optdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.sigdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.xml"
folder ".NETFramework\v4.0"
folder "4.3.0.0"
@@ -69,15 +69,15 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.sigdata"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.xml"
folder "4.4.1.0"
- file source="$(BinariesFolder)\versions\4.4.1.0\FSharp.Core.dll"
- file source="$(BinariesFolder)\versions\4.4.1.0\FSharp.Core.optdata"
- file source="$(BinariesFolder)\versions\4.4.1.0\FSharp.Core.sigdata"
- file source="$(BinariesFolder)\versions\4.4.1.0\FSharp.Core.xml"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\versions\4.4.1.0\FSharp.Core.dll"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\versions\4.4.1.0\FSharp.Core.optdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\versions\4.4.1.0\FSharp.Core.sigdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\versions\4.4.1.0\FSharp.Core.xml"
folder "4.4.3.0"
- file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll"
- file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
- file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
- file source="$(BinariesFolder)\net40\bin\FSharp.Core.xml"
+ file source="$(PackagesFolder)\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll"
+ file source="$(PackagesFolder)\FSharp.Core.4.3.4\lib\net45\FSharp.Core.optdata"
+ file source="$(PackagesFolder)\FSharp.Core.4.3.4\lib\net45\FSharp.Core.sigdata"
+ file source="$(PackagesFolder)\FSharp.Core.4.3.4\lib\net45\FSharp.Core.xml"
folder ".NETPortable"
folder "2.3.5.0"
@@ -96,7 +96,7 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.sigdata"
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.xml"
folder "3.47.41.0"
- file source="$(BinariesFolder)\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll"
- file source="$(BinariesFolder)\profiles\portable-net45+sl5+netcore45\FSharp.Core.optdata"
- file source="$(BinariesFolder)\profiles\portable-net45+sl5+netcore45\FSharp.Core.sigdata"
- file source="$(BinariesFolder)\profiles\portable-net45+sl5+netcore45\FSharp.Core.xml"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.optdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.sigdata"
+ file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.xml"
diff --git a/setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj b/setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj
index bde4a368d4f..9256eadc32f 100644
--- a/setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj
+++ b/setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj
@@ -18,7 +18,6 @@
- $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)
$(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder)
$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)
diff --git a/setup/packages.config b/setup/packages.config
index 930e870e4bf..938236f7d99 100644
--- a/setup/packages.config
+++ b/setup/packages.config
@@ -11,4 +11,6 @@
+
+