Skip to content

Commit

Permalink
Merge pull request dotnet#5548 from brettfo/sdk-package-15.8
Browse files Browse the repository at this point in the history 
[15.8] create the F# SDK package from all existing NuGet packages
  • Loading branch information
@brettfo
brettfo committed Aug 23, 2018
2 parents c55dd2c + 12df322 commit f2a253c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 25 deletions.
48 changes: 24 additions & 24 deletions setup/Swix/Microsoft.FSharp.SDK/Files.swr
View file
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
1 change: 0 additions & 1 deletion setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj
View file
Expand Up @@ -18,7 +18,6 @@
<Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />

<PropertyGroup>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder)</PackagePreprocessorDefinitions>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions setup/packages.config
View file
Expand Up @@ -11,4 +11,6 @@
<package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
<package id="System.ValueTuple" version="4.4.0" />
<package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
<package id="Microsoft.Portable.FSharp.Core" version="10.1.0" />
<package id="FSharp.Core" version="4.3.4" />
</packages>

0 comments on commit f2a253c

Please sign in to comment.