diff --git a/build.cmd b/build.cmd index 17d433701be..f8786b3b5f8 100644 --- a/build.cmd +++ b/build.cmd @@ -771,8 +771,8 @@ if "%BUILD_NET40%" == "1" ( echo ---------------- Done with assembly version checks, starting assembly signing --------------- if not "%SIGN_TYPE%" == "" ( - echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json - call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json + echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json + call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json if ERRORLEVEL 1 echo Error running sign tool && goto :failure ) @@ -783,20 +783,8 @@ echo %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BU if ERRORLEVEL 1 echo Error building NuGet packages && goto :failure if not "%SIGN_TYPE%" == "" ( - echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json - call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json - if ERRORLEVEL 1 echo Error running sign tool && goto :failure -) - -if "%BUILD_SETUP%" == "1" ( - echo %_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG% - %_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG% - if ERRORLEVEL 1 echo Error building MSI && goto :failure -) - -if not "%SIGN_TYPE%" == "" ( - echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json - call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json + echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json + call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json if ERRORLEVEL 1 echo Error running sign tool && goto :failure ) @@ -807,8 +795,8 @@ if "%BUILD_SETUP%" == "1" ( ) if not "%SIGN_TYPE%" == "" ( - echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json - call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json + echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json + call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json if ERRORLEVEL 1 echo Error running sign tool && goto :failure ) diff --git a/build/config/InsertionSignToolData.json b/build/config/InsertionSignToolData.json index bf034ce4f84..657ad973d1f 100644 --- a/build/config/InsertionSignToolData.json +++ b/build/config/InsertionSignToolData.json @@ -1,14 +1,37 @@ { - "sign": [ - { - "certificate": "VsixSHA2", - "strongName": null, - "values": [ - "insertion\\Microsoft.FSharp.SDK.Resources.ENU.vsix" - ] - } - ], - "exclude": [ - ] - } - \ No newline at end of file + "sign": [ + { + "certificate": "VsixSHA2", + "strongName": null, + "values": [ + "insertion\\Microsoft.FSharp.Compiler.vsix", + "insertion\\Microsoft.FSharp.Compiler.Resources.*.vsix", + "insertion\\Microsoft.FSharp.SDK.vsix" + ] + } + ], + "exclude": [ + "fsc.exe", + "FSharp.Build.dll", + "FSharp.Build.resources.dll", + "FSharp.Core.dll", + "FSharp.Core.resources.dll", + "FSharp.Compiler.Private.dll", + "FSharp.Compiler.Private.resources.dll", + "FSharp.Compiler.Server.Shared.dll", + "FSharp.Compiler.Interactive.Settings.dll", + "FSharp.Compiler.Interactive.Settings.resources.dll", + "fsi.exe", + "fsiAnyCpu.exe", + "FSharp.Data.TypeProviders.dll", + "Microsoft.Build.dll", + "Microsoft.Build.Conversion.Core.dll", + "Microsoft.Build.Engine.dll", + "Microsoft.Build.Framework.dll", + "Microsoft.Build.Tasks.Core.dll", + "Microsoft.Build.Utilities.Core.dll", + "System.Collections.Immutable.dll", + "System.Reflection.Metadata.dll", + "System.ValueTuple.dll" + ] +} diff --git a/build/config/MsiSignToolData.json b/build/config/MsiSignToolData.json deleted file mode 100644 index 47f969c5ffe..00000000000 --- a/build/config/MsiSignToolData.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "sign": [ - { - "certificate": "Microsoft400", - "strongName": null, - "values": [ - "msi\\Microsoft.FSharp.SDK.Core.msi", - "msi\\Microsoft.FSharp.SDK.Resources.*.msi" - ] - } - ], - "exclude": [ - ] - } - \ No newline at end of file diff --git a/build/scripts/run-signtool.cmd b/build/scripts/run-signtool.cmd index 4a3be550e94..15ae3420693 100644 --- a/build/scripts/run-signtool.cmd +++ b/build/scripts/run-signtool.cmd @@ -26,6 +26,10 @@ if /i "%arg%" == "-SignType" ( set SignType=%argv% shift ) +if /i "%arg%" == "-Configuration" ( + set Configuration=%argv% + shift +) if /i "%arg%" == "-ConfigFile" ( set ConfigFile=%argv% shift @@ -50,7 +54,7 @@ set SignToolArgs=%SignToolArgs% -test :runsigntool if not exist "%_signtoolexe%" echo The signing tool could not be found at location '%_signtoolexe%' && goto error -set SignToolArgs=%SignToolArgs% "%scriptdir%..\..\release" +set SignToolArgs=%SignToolArgs% "%scriptdir%..\..\%Configuration%" echo "%_signtoolexe%" %SignToolArgs% "%_signtoolexe%" %SignToolArgs% if errorlevel 1 goto error diff --git a/fcs/FSharp.Compiler.Service/.gitignore b/fcs/FSharp.Compiler.Service/.gitignore new file mode 100644 index 00000000000..722f2e9b839 --- /dev/null +++ b/fcs/FSharp.Compiler.Service/.gitignore @@ -0,0 +1,2 @@ +net4*/ +netstandard*/ diff --git a/setup/FSharp.SDK/Common.Wix.Properties.wxs b/setup/FSharp.SDK/Common.Wix.Properties.wxs deleted file mode 100644 index 5a3f1cd1b35..00000000000 --- a/setup/FSharp.SDK/Common.Wix.Properties.wxs +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj deleted file mode 100644 index a1540272f4a..00000000000 --- a/setup/FSharp.SDK/FSharp.SDK.wixproj +++ /dev/null @@ -1,77 +0,0 @@ - - - - - $(MSBuildProjectDirectory)\..\.. - $(FSharpTreeRoot)\setup - - - - - - - Microsoft.FSharp.SDK.Core - Microsoft.FSharp.SDK.Resources.$(LocaleCode) - da0da41f-0e00-4598-8eee-b29d31b0ca04 - Package - net - true - false - true - false - - - - $(DefineConstants);LocaleCode=$(LocaleCode) - $(DefineConstants);LocaleId=$(LocaleId) - $(DefineConstants);LocaleParentId=$(LocaleParentId) - $(DefineConstants);LocaleParentCulture=$(LocaleParentCulture) - $(DefineConstants);LocaleSpecificCulture=$(LocaleSpecificCulture) - $(DefineConstants);IsLangPack=$(IsLangPack) - - $(DefineConstants);BinariesDir=$(BinariesDir) - $(DefineConstants);FSharpTreeRoot=$(FSharpTreeRoot) - $(DefineConstants);NugetPackagesDir=$(NugetPackagesDir) - - - - - WixNetFxExtension - - - FSharp.Wix.Extensions - $(BinariesDir)\setup\FSharp.Wix.Extensions.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/setup/FSharp.SDK/FSharp.SDK.wxs b/setup/FSharp.SDK/FSharp.SDK.wxs deleted file mode 100644 index 21faef5e33e..00000000000 --- a/setup/FSharp.SDK/FSharp.SDK.wxs +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs b/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs deleted file mode 100644 index 81dc3124845..00000000000 --- a/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs deleted file mode 100644 index abb5c064c8b..00000000000 --- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs deleted file mode 100644 index de1467d1bd4..00000000000 --- a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs b/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs deleted file mode 100644 index bf7e2b793c3..00000000000 --- a/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/setup/FSharp.Wix.Extensions/AssemblyInfo.cs b/setup/FSharp.Wix.Extensions/AssemblyInfo.cs deleted file mode 100644 index 42523fa3840..00000000000 --- a/setup/FSharp.Wix.Extensions/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. - -using FSharp.WIX.Extensions; -using Microsoft.Tools.WindowsInstallerXml; - -[assembly: AssemblyDefaultWixExtension(typeof(FSharpWixExtension))] diff --git a/setup/FSharp.Wix.Extensions/FSharp.Wix.Extensions.csproj b/setup/FSharp.Wix.Extensions/FSharp.Wix.Extensions.csproj deleted file mode 100644 index d21a4f209d0..00000000000 --- a/setup/FSharp.Wix.Extensions/FSharp.Wix.Extensions.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - - $(MSBuildProjectDirectory)\.. - - - - - - - CSharp - 15.0 - $(FSCoreVersion) - cs - - - - Library - FSharp.Wix.Extensions - {321E6C2C-9E1C-4506-B1C0-1F81DCAEF207} - v4.5 - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/setup/FSharp.Wix.Extensions/FSharpPreprocessorExtension.cs b/setup/FSharp.Wix.Extensions/FSharpPreprocessorExtension.cs deleted file mode 100644 index 48973850a9b..00000000000 --- a/setup/FSharp.Wix.Extensions/FSharpPreprocessorExtension.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. - -using Microsoft.Tools.WindowsInstallerXml; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Security.Cryptography; -using System.Text; - -namespace FSharp.WIX.Extensions -{ - public class FSharpPreprocessorExtension : PreprocessorExtension - { - private readonly string[] prefixes = new string[] { "fsharp" }; - - public override string[] Prefixes - { - get { return this.prefixes; } - } - - public override string EvaluateFunction(string prefix, string function, string[] args) - { - if (prefixes.Contains(prefix)) - { - switch (function) - { - case "guid": - return this.Guid(args); - } - } - - return null; - } - - private string Guid(string[] args) - { - var input = string.Join("|", args); - var bytes = Encoding.Default.GetBytes(input); - var output = MD5.Create().ComputeHash(bytes); - - return new Guid(output).ToString(); - } - } -} diff --git a/setup/FSharp.Wix.Extensions/FSharpWixExtension.cs b/setup/FSharp.Wix.Extensions/FSharpWixExtension.cs deleted file mode 100644 index 4273e1812a1..00000000000 --- a/setup/FSharp.Wix.Extensions/FSharpWixExtension.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. - -using System; -using Microsoft.Tools.WindowsInstallerXml; - -namespace FSharp.WIX.Extensions -{ - public class FSharpWixExtension : WixExtension - { - private readonly Lazy preprocessorExtension = new Lazy(); - - public override PreprocessorExtension PreprocessorExtension - { - get { return this.preprocessorExtension.Value; } - } - } -} diff --git a/setup/Swix/Microsoft.FSharp.Compiler.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Empty.swr new file mode 100644 index 00000000000..32da88c9291 --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Empty.swr @@ -0,0 +1,5 @@ +use vs + +package name=Microsoft.FSharp.Compiler.Resources + version=$(FSharpPackageVersion) + vs.package.language=$(LocaleSpecificCulture) diff --git a/setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr new file mode 100644 index 00000000000..464fdd774ee --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr @@ -0,0 +1,11 @@ +use vs + +package name=Microsoft.FSharp.Compiler.Resources + version=$(FSharpPackageVersion) + vs.package.language=$(LocaleSpecificCulture) + +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\$(LocaleParentCulture)" + file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Build.resources.dll" + file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Compiler.Interactive.Settings.resources.dll" + file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Compiler.Private.resources.dll" + file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Core.resources.dll" diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Microsoft.FSharp.Compiler.Resources.swixproj similarity index 63% rename from setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj rename to setup/Swix/Microsoft.FSharp.Compiler.Resources/Microsoft.FSharp.Compiler.Resources.swixproj index 9ded9e162b6..d722fb0293e 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj +++ b/setup/Swix/Microsoft.FSharp.Compiler.Resources/Microsoft.FSharp.Compiler.Resources.swixproj @@ -5,13 +5,12 @@ ..\..\..\src neutral false - Microsoft.FSharp.SDK.Resources.$(LocaleCode) + vsix true - Debug + Debug $(FSharpSourcesRoot)\..\$(Configuration) $(BinariesFolder)\insertion - vsix - manifest + Microsoft.FSharp.Compiler.Resources.$(LocaleCode) $(MSBuildThisFileDirectory)obj @@ -20,28 +19,20 @@ $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) $(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion) - $(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode) - $(PackagePreprocessorDefinitions);LocaleId=$(LocaleId) - $(PackagePreprocessorDefinitions);LocaleParentId=$(LocaleParentId) $(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture) $(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture) - $(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack) - - + + + - - - - - + - diff --git a/setup/Swix/Microsoft.FSharp.Compiler/Files.swr b/setup/Swix/Microsoft.FSharp.Compiler/Files.swr new file mode 100644 index 00000000000..ab7bdc27ca4 --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.Compiler/Files.swr @@ -0,0 +1,34 @@ +use vs + +package name=Microsoft.FSharp.Compiler + version=$(FSharpPackageVersion) + +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler" + file source="$(BinariesFolder)\net40\bin\fsc.exe" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\fsc.exe.config" + file source="$(BinariesFolder)\net40\bin\FSharp.Build.dll" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Interactive.Settings.dll" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Private.dll" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\FSharp.Compiler.Server.Shared.dll" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata" + file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Type.Providers.Redist.$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion)\content\4.3.0.0\FSharp.Data.TypeProviders.dll" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\fsi.exe" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\fsi.exe.config" + file source="$(BinariesFolder)\net40\bin\fsiAnyCpu.exe" vs.file.ngen=yes + file source="$(BinariesFolder)\net40\bin\fsiAnyCpu.exe.config" + file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Conversion.Core.dll" + file source="$(BinariesFolder)\net40\bin\Microsoft.Build.dll" + file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Engine.dll" + file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Framework.dll" + file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Tasks.Core.dll" + file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Utilities.Core.dll" + file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.props" + file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.targets" + file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Targets" + file source="$(BinariesFolder)\net40\bin\Microsoft.Portable.FSharp.Targets" + file source="$(FSharpTreeRoot)\vsintegration\src\SupportedRuntimes\SupportedRuntimes.xml" + file source="$(BinariesFolder)\net40\bin\System.Collections.Immutable.dll" + file source="$(BinariesFolder)\net40\bin\System.Reflection.Metadata.dll" + file source="$(BinariesFolder)\net40\bin\System.ValueTuple.dll" diff --git a/setup/Swix/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.swixproj b/setup/Swix/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.swixproj new file mode 100644 index 00000000000..a692c0ac029 --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.swixproj @@ -0,0 +1,41 @@ + + + + + $(MSBuildThisFileDirectory)..\..\..\src + $(FSharpSourcesRoot)\.. + neutral + false + vsix + true + Debug + $(FSharpSourcesRoot)\..\$(Configuration) + $(FSharpSourcesRoot)\..\packages + $(BinariesFolder)\insertion + Microsoft.FSharp.Compiler + $(MSBuildThisFileDirectory)obj + + + + + + + $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) + $(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder) + $(PackagePreprocessorDefinitions);FSharpTreeRoot=$(FSharpTreeRoot) + $(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion) + $(PackagePreprocessorDefinitions);MicrosoftVisualFSharpTypeProvidersRedistPackageVersion=$(MicrosoftVisualFSharpTypeProvidersRedistPackageVersion) + + + + + + + + + + + + + + diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr index fdd884965a7..6779f232d16 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr @@ -4,11 +4,11 @@ package name=Microsoft.FSharp.Dependencies version=$(FSharpPackageVersion) vs.dependencies - vs.dependency id=Microsoft.FSharp.SDK.Core + vs.dependency id=Microsoft.FSharp.Compiler version=$(FSharpPackageVersion) type=Required - vs.dependency id=Microsoft.FSharp.SDK.Resources + vs.dependency id=Microsoft.FSharp.SDK version=$(FSharpPackageVersion) type=Required diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr index 346d1be98e7..44434fbee11 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr @@ -4,8 +4,8 @@ package name=Microsoft.FSharp.Dependencies version=$(FSharpPackageVersion) folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp" - file "Microsoft.FSharp.Targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets" - file "Microsoft.Portable.FSharp.Targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets" + file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets" + file "Microsoft.Portable.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets" file "Microsoft.FSharp.NetSdk.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.targets" file "Microsoft.FSharp.NetSdk.Overrides.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Overrides.NetSdk.Shim.targets" file "Microsoft.FSharp.NetSdk.props" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.props" diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/fsharp.bat b/setup/Swix/Microsoft.FSharp.Dependencies/fsharp.bat index 9d5d7f7d77d..aaccb9e8d61 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/fsharp.bat +++ b/setup/Swix/Microsoft.FSharp.Dependencies/fsharp.bat @@ -1,7 +1,8 @@ if "%VSCMD_TEST%" NEQ "" goto :test if "%VSCMD_ARG_CLEAN_ENV%" NEQ "" goto :clean_env -if "%FSHARPINSTALLDIR%" NEQ "" set "PATH=%FSHARPINSTALLDIR%;%PATH%" +set FSHARPINSTALLDIR=%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\ +set "PATH=%FSHARPINSTALLDIR%;%PATH%" goto :end diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr deleted file mode 100644 index 2ce5288a192..00000000000 --- a/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr +++ /dev/null @@ -1,14 +0,0 @@ -use vs - -package name=Microsoft.FSharp.SDK.Core - version=$(FSharpPackageVersion) - vs.package.type=msi - vs.package.providerKey=Microsoft.FSharp.SDK.Core,v10.1 - -vs.installSize - SystemDrive=194670592 - TargetDrive=0 - SharedDrive=0 - -vs.payloads - vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Core.msi" diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr deleted file mode 100644 index bfb98e57231..00000000000 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr +++ /dev/null @@ -1,7 +0,0 @@ -use vs - -package name=Microsoft.FSharp.SDK.Resources - version=$(FSharpPackageVersion) - vs.package.language=$(LocaleSpecificCulture) - vs.package.installSize=1 - vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.1 diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr deleted file mode 100644 index d68202aac64..00000000000 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr +++ /dev/null @@ -1,15 +0,0 @@ -use vs - -package name=Microsoft.FSharp.SDK.Resources - version=$(FSharpPackageVersion) - vs.package.type=msi - vs.package.language=$(LocaleSpecificCulture) - vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.1 - -vs.installSize - SystemDrive=12681438 - TargetDrive=0 - SharedDrive=0 - -vs.payloads - vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Resources.$(LocaleCode).msi" diff --git a/setup/Swix/Microsoft.FSharp.SDK/Files.swr b/setup/Swix/Microsoft.FSharp.SDK/Files.swr new file mode 100644 index 00000000000..271db6961cd --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.SDK/Files.swr @@ -0,0 +1,102 @@ +use vs + +package name=Microsoft.FSharp.SDK + version=$(FSharpPackageVersion) + +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk" + + folder ".NETCore" + folder "3.3.1.0" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.optdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.sigdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.3.1.0\FSharp.Core.xml" + folder "3.7.4.0" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.optdata" + 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" + 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" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.sigdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.xml" + folder "3.78.4.0" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.optdata" + 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" + 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" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.sigdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.xml" + folder "3.259.4.0" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.optdata" + 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" + + folder ".NETFramework\v4.0" + folder "4.3.0.0" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.optdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.sigdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.0.0\FSharp.Core.xml" + folder "4.3.1.0" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.optdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.sigdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.3.1.0\FSharp.Core.xml" + folder "4.4.0.0" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.optdata" + 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" + 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" + + folder ".NETPortable" + folder "2.3.5.0" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.optdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.sigdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.0\FSharp.Core.xml" + folder "2.3.5.1" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.optdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.sigdata" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\2.3.5.1\FSharp.Core.xml" + folder "3.47.4.0" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.dll" + file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.optdata" + 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" diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj b/setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj similarity index 84% rename from setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj rename to setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj index e606b3e79eb..bde4a368d4f 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj +++ b/setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj @@ -5,11 +5,12 @@ ..\..\..\src neutral false - manifest - Microsoft.FSharp.SDK.Core + vsix + Microsoft.FSharp.SDK true Debug $(FSharpSourcesRoot)\..\$(Configuration) + $(FSharpSourcesRoot)\..\packages $(BinariesFolder)\insertion $(MSBuildThisFileDirectory)obj @@ -18,6 +19,7 @@ $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) + $(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder) $(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion) diff --git a/setup/Swix/Microsoft.FSharp.vsmanproj b/setup/Swix/Microsoft.FSharp.vsmanproj index 3bda018b34f..f5a1bef6d1a 100644 --- a/setup/Swix/Microsoft.FSharp.vsmanproj +++ b/setup/Swix/Microsoft.FSharp.vsmanproj @@ -27,8 +27,10 @@ - - + + + + diff --git a/setup/build-insertion.proj b/setup/build-insertion.proj index 2752719d87d..35496258dee 100644 --- a/setup/build-insertion.proj +++ b/setup/build-insertion.proj @@ -13,13 +13,16 @@ - - Swix\Microsoft.FSharp.SDK.Core\Microsoft.FSharp.SDK.Core.swixproj + + Swix\Microsoft.FSharp.SDK\Microsoft.FSharp.SDK.swixproj + + + Swix\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.swixproj + AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Compiler.Resources\Microsoft.FSharp.Compiler.Resources.swixproj"> @@ -30,7 +33,7 @@ + Properties="Configuration=$(Configuration);LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentId=%(SwixSetupProjects.LocaleParentId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);$(CustomProps)"/> diff --git a/setup/build-msi.proj b/setup/build-msi.proj deleted file mode 100644 index 37477963954..00000000000 --- a/setup/build-msi.proj +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - . - net40 - Debug - - - - - - - - FSharp.Wix.Extensions\FSharp.Wix.Extensions.csproj - - - - - - - - - - - AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName} - - - - - - - - - - - - - diff --git a/setup/packages.config b/setup/packages.config index fff4f7e86e7..f62527d8caf 100644 --- a/setup/packages.config +++ b/setup/packages.config @@ -6,7 +6,6 @@ - diff --git a/setup/resources/Microsoft.FSharp.NetSdk.Shim.props b/setup/resources/Microsoft.FSharp.NetSdk.Shim.props index f70ace49bf3..b5d4d5ea505 100644 --- a/setup/resources/Microsoft.FSharp.NetSdk.Shim.props +++ b/setup/resources/Microsoft.FSharp.NetSdk.Shim.props @@ -1,5 +1,5 @@ - + diff --git a/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets b/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets index 10844657e73..500eeb3c823 100644 --- a/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets +++ b/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets @@ -1,5 +1,5 @@ - + diff --git a/setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets b/setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets index 76fb5cd8119..fb7579c53ac 100644 --- a/setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets +++ b/setup/resources/Microsoft.FSharp.Overrides.NetSdk.Shim.targets @@ -1,5 +1,5 @@ - + diff --git a/setup/resources/Microsoft.FSharp.Shim.targets b/setup/resources/Microsoft.FSharp.Shim.targets index 406acd5d36a..2871f4bd202 100644 --- a/setup/resources/Microsoft.FSharp.Shim.targets +++ b/setup/resources/Microsoft.FSharp.Shim.targets @@ -1,5 +1,5 @@ - + diff --git a/setup/resources/Microsoft.Portable.FSharp.Shim.targets b/setup/resources/Microsoft.Portable.FSharp.Shim.targets index 0a0d927347d..6908ba24cef 100644 --- a/setup/resources/Microsoft.Portable.FSharp.Shim.targets +++ b/setup/resources/Microsoft.Portable.FSharp.Shim.targets @@ -1,5 +1,5 @@ - + diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets index ba24014c937..ecb35fc9663 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.Targets @@ -400,6 +400,60 @@ this file. + + + + <_OldRootSdkLocation>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp + <_NewRootSdkLocation>$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\FSharpSdk + + <_CoreRelativeSuffix>.NETCore\$(TargetFSharpCoreVersion)\FSharp.Core.dll + <_FrameworkRelativeSuffix>.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll + <_PortableRelativeSuffix>.NETPortable\$(TargetFSharpCoreVersion)\FSharp.Core.dll + + + <_OldCoreSdkPath>$(_OldRootSdkLocation)\$(_CoreRelativeSuffix) + <_NewCoreSdkPath>$(_NewRootSdkLocation)\$(_CoreRelativeSuffix) + + + <_OldFrameworkSdkPath>$(_OldRootSdkLocation)\$(_FrameworkRelativeSuffix) + <_NewFrameworkSdkPath>$(_NewRootSdkLocation)\$(_FrameworkRelativeSuffix) + + + <_OldPortableSdkPath>$(_OldRootSdkLocation)\$(_PortableRelativeSuffix) + <_NewPortableSdkPath>$(_NewRootSdkLocation)\$(_PortableRelativeSuffix) + + + + + + $(_NewCoreSdkPath) + + + + + $(_NewFrameworkSdkPath) + + + + + $(_NewPortableSdkPath) + + + +