From 76c82a0d8af5a84c8a787b9491c18a8129e746f7 Mon Sep 17 00:00:00 2001 From: Omar Tawfik Date: Mon, 29 Aug 2016 16:44:19 -0700 Subject: [PATCH 1/9] Build other VS SKUs --- setup/Swix/Microsoft.FSharp.vsmanproj | 5 ++++- setup/fsharp-setup-build.proj | 28 ++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/setup/Swix/Microsoft.FSharp.vsmanproj b/setup/Swix/Microsoft.FSharp.vsmanproj index 736ea5bdb51..d3e84452711 100644 --- a/setup/Swix/Microsoft.FSharp.vsmanproj +++ b/setup/Swix/Microsoft.FSharp.vsmanproj @@ -16,9 +16,12 @@ - + + + + \ No newline at end of file diff --git a/setup/fsharp-setup-build.proj b/setup/fsharp-setup-build.proj index 87ca1c6d400..2ad86745eb4 100644 --- a/setup/fsharp-setup-build.proj +++ b/setup/fsharp-setup-build.proj @@ -30,21 +30,39 @@ TaskParameter="Include"/> - - - - + + + + + + + + Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj Full - + + + + Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj + Desktop + + + + Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj + Web + Swix\Microsoft.FSharp.vsmanproj From 8ec741e48261eeac36b0a4f4a1bb1b9a8bd7fd68 Mon Sep 17 00:00:00 2001 From: Omar Tawfik Date: Mon, 29 Aug 2016 17:47:18 -0700 Subject: [PATCH 2/9] Fix localization by producing core + resources packages --- setup/FSharp.SDK/FSharp.SDK.wixproj | 5 +- .../Dependencies.swr | 43 +++++++++++++ .../Microsoft.FSharp.Dependencies/Files.swr | 12 +--- .../Microsoft.FSharp.Dependencies.swixproj | 8 +-- .../Swix/Microsoft.FSharp.SDK.Core/Files.swr | 8 +++ .../Microsoft.FSharp.SDK.Core.swixproj | 28 +++++++++ .../Microsoft.FSharp.SDK.Resources/Empty.swr | 6 ++ .../Files.swr | 4 +- .../Microsoft.FSharp.SDK.Resources.swixproj} | 8 ++- .../Files.swr} | 3 +- .../Microsoft.FSharp.Vsix.Core.swixproj | 34 +++++++++++ .../Desktop.Templates.swr} | 2 +- .../Microsoft.FSharp.Vsix.Resources/Empty.swr | 5 ++ .../Files.swr} | 2 +- .../Full.Templates.swr} | 2 +- .../Microsoft.FSharp.Vsix.Resources.swixproj} | 19 ++---- .../Web.Templates.swr} | 2 +- setup/Swix/Microsoft.FSharp.vsmanproj | 20 +++--- setup/fsharp-setup-build.proj | 61 +++++++++++-------- 19 files changed, 196 insertions(+), 76 deletions(-) create mode 100644 setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr create mode 100644 setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr create mode 100644 setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj create mode 100644 setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr rename setup/Swix/{Microsoft.FSharp.SDK => Microsoft.FSharp.SDK.Resources}/Files.swr (70%) rename setup/Swix/{Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj => Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj} (89%) rename setup/Swix/{Microsoft.FSharp.Vsix/Core.Files.swr => Microsoft.FSharp.Vsix.Core/Files.swr} (67%) create mode 100644 setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj rename setup/Swix/{Microsoft.FSharp.Vsix/LangPack.Desktop.Templates.swr => Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr} (96%) create mode 100644 setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr rename setup/Swix/{Microsoft.FSharp.Vsix/LangPack.Files.swr => Microsoft.FSharp.Vsix.Resources/Files.swr} (96%) rename setup/Swix/{Microsoft.FSharp.Vsix/LangPack.Full.Templates.swr => Microsoft.FSharp.Vsix.Resources/Full.Templates.swr} (98%) rename setup/Swix/{Microsoft.FSharp.Vsix/Microsoft.FSharp.Vsix.swixproj => Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj} (85%) rename setup/Swix/{Microsoft.FSharp.Vsix/LangPack.Web.Templates.swr => Microsoft.FSharp.Vsix.Resources/Web.Templates.swr} (95%) diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj index 04e76713f4e..552ba996035 100644 --- a/setup/FSharp.SDK/FSharp.SDK.wixproj +++ b/setup/FSharp.SDK/FSharp.SDK.wixproj @@ -10,7 +10,8 @@ - Microsoft.FSharp.SDK + Microsoft.FSharp.SDK.Core + Microsoft.FSharp.SDK.Resources.$(LocaleCode) da0da41f-0e00-4598-8eee-b29d31b0ca04 Package net @@ -74,6 +75,6 @@ - + \ No newline at end of file diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr new file mode 100644 index 00000000000..af47f6b3c1f --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr @@ -0,0 +1,43 @@ +use vs + +package name=Microsoft.FSharp.Dependencies + version=4.1 + +vs.dependencies + vs.dependency id=Microsoft.FSharp.SDK.Core + version=4.1 + type=Required + + vs.dependency id=Microsoft.FSharp.SDK.Resources + version=4.1 + type=Required + + vs.dependency id=Microsoft.FSharp.VSIX.Full.Core + version=4.1 + type=Required + when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community + + vs.dependency id=Microsoft.FSharp.VSIX.Full.Resources + version=4.1 + type=Required + when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community + + vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Core + version=4.1 + type=Required + when=Microsoft.VisualStudio.Product.DesktopExpress + + vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Resources + version=4.1 + type=Required + when=Microsoft.VisualStudio.Product.DesktopExpress + + vs.dependency id=Microsoft.FSharp.VSIX.Web.Core + version=4.1 + type=Required + when=Microsoft.VisualStudio.Product.WebExpress + + vs.dependency id=Microsoft.FSharp.VSIX.Web.Resources + version=4.1 + type=Required + when=Microsoft.VisualStudio.Product.WebExpress diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr index bf639935d7a..cc027e4bbe0 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr @@ -1,17 +1,7 @@ use vs -package name=Microsoft.FSharp.Dependencies.$(VSSku) +package name=Microsoft.FSharp.Dependencies version=4.1 - vs.package.language=neutral - -vs.dependencies - vs.dependency id=Microsoft.FSharp.VSIX.$(VSSku) - version=4.1 - type=Required - - vs.dependency id=Microsoft.FSharp.SDK - version=4.1 - type=Required folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp" file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets" diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj index 071b86deb08..40f510c7f0f 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj @@ -10,7 +10,7 @@ $(FSharpSourcesRoot)\..\$(Configuration) $(FSharpSourcesRoot)\..\packages $(BinariesFolder)\insertion - Microsoft.FSharp.Dependencies.$(VSSku) + Microsoft.FSharp.Dependencies $(MSBuildThisFileDirectory)obj @@ -19,18 +19,14 @@ $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) $(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder) - $(PackagePreprocessorDefinitions);VSSku=$(VSSku) + - - - - diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr new file mode 100644 index 00000000000..a3b0e1c7558 --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr @@ -0,0 +1,8 @@ +use vs + +package name=Microsoft.FSharp.SDK.Core + version=4.1 + vs.package.type=msi + +vs.payloads + vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Core.msi" diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj new file mode 100644 index 00000000000..03062b5d636 --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj @@ -0,0 +1,28 @@ + + + + ..\..\..\src + neutral + false + manifest + Microsoft.FSharp.SDK.Core + true + Debug + $(FSharpSourcesRoot)\..\$(Configuration) + $(BinariesFolder)\insertion + + + + + + $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) + + + + + + + + + + diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr new file mode 100644 index 00000000000..3ffac485287 --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr @@ -0,0 +1,6 @@ +use vs + +package name=Microsoft.FSharp.SDK.Resources + version=4.1 + vs.package.type=msi + vs.package.language=$(LocaleRegion) \ No newline at end of file diff --git a/setup/Swix/Microsoft.FSharp.SDK/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr similarity index 70% rename from setup/Swix/Microsoft.FSharp.SDK/Files.swr rename to setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr index d161ff0fb99..26c9847538e 100644 --- a/setup/Swix/Microsoft.FSharp.SDK/Files.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr @@ -1,9 +1,9 @@ use vs -package name=Microsoft.FSharp.SDK +package name=Microsoft.FSharp.SDK.Resources version=4.1 vs.package.type=msi vs.package.language=$(LocaleRegion) vs.payloads - vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.$(LocaleCode).msi" + vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Resources.$(LocaleCode).msi" diff --git a/setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj similarity index 89% rename from setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj rename to setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj index 3e836ccb657..3ae84ecb8de 100644 --- a/setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj @@ -5,7 +5,7 @@ neutral false manifest - Microsoft.FSharp.SDK.$(LocaleCode) + Microsoft.FSharp.SDK.Resources.$(LocaleCode) true Debug $(FSharpSourcesRoot)\..\$(Configuration) @@ -22,7 +22,11 @@ $(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack) - + + + + + diff --git a/setup/Swix/Microsoft.FSharp.Vsix/Core.Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr similarity index 67% rename from setup/Swix/Microsoft.FSharp.Vsix/Core.Files.swr rename to setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr index 2cd1df4fd55..5d2bc8383ef 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix/Core.Files.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr @@ -1,9 +1,8 @@ use vs -package name=Microsoft.FSharp.VSIX.$(VSSku) +package name=Microsoft.FSharp.VSIX.$(VSSku).Core version=4.1 vs.package.type=vsix - vs.package.language=$(LocaleRegion) vs.package.vsixId=VisualFSharp vs.payloads diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj new file mode 100644 index 00000000000..ffb10deb955 --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj @@ -0,0 +1,34 @@ + + + + ..\..\..\src + neutral + false + true + Debug + $(FSharpSourcesRoot)\..\$(Configuration) + $(BinariesFolder)\insertion + Microsoft.FSharp.VSIX.$(VSSku).Core + $(MSBuildThisFileDirectory)obj + manifest + + + + + + $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) + $(PackagePreprocessorDefinitions);VSSku=$(VSSku) + + + + + + + + + + + + + + diff --git a/setup/Swix/Microsoft.FSharp.Vsix/LangPack.Desktop.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr similarity index 96% rename from setup/Swix/Microsoft.FSharp.Vsix/LangPack.Desktop.Templates.swr rename to setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr index a3977cc67f0..264ac22d2fc 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix/LangPack.Desktop.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr @@ -1,6 +1,6 @@ use vs -package name=Microsoft.FSharp.VSIX.$(VSSku) +package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=4.1 vs.package.language=$(LocaleRegion) diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr new file mode 100644 index 00000000000..5b1acc40bd4 --- /dev/null +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr @@ -0,0 +1,5 @@ +use vs + +package name=Microsoft.FSharp.VSIX.$(VSSku).Resources + version=4.1 + vs.package.language=$(LocaleRegion) diff --git a/setup/Swix/Microsoft.FSharp.Vsix/LangPack.Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr similarity index 96% rename from setup/Swix/Microsoft.FSharp.Vsix/LangPack.Files.swr rename to setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr index fa907fa0edf..64a7212159d 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix/LangPack.Files.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr @@ -1,6 +1,6 @@ use vs -package name=Microsoft.FSharp.VSIX.$(VSSku) +package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=4.1 vs.package.language=$(LocaleRegion) diff --git a/setup/Swix/Microsoft.FSharp.Vsix/LangPack.Full.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr similarity index 98% rename from setup/Swix/Microsoft.FSharp.Vsix/LangPack.Full.Templates.swr rename to setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr index fa876a3fef3..176ff8c8e98 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix/LangPack.Full.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr @@ -1,6 +1,6 @@ use vs -package name=Microsoft.FSharp.VSIX.$(VSSku) +package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=4.1 vs.package.language=$(LocaleRegion) diff --git a/setup/Swix/Microsoft.FSharp.Vsix/Microsoft.FSharp.Vsix.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj similarity index 85% rename from setup/Swix/Microsoft.FSharp.Vsix/Microsoft.FSharp.Vsix.swixproj rename to setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj index 9cc2d0f1199..01bb34505d2 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix/Microsoft.FSharp.Vsix.swixproj +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj @@ -8,18 +8,11 @@ Debug $(FSharpSourcesRoot)\..\$(Configuration) $(BinariesFolder)\insertion - Microsoft.FSharp.VSIX.$(VSSku).$(LocaleCode) + Microsoft.FSharp.VSIX.$(VSSku).Resources.$(LocaleCode) $(MSBuildThisFileDirectory)obj - - - - manifest - - - vsix - + @@ -30,14 +23,14 @@ $(PackagePreprocessorDefinitions);LocaleRegion=$(LocaleRegion) $(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack) - + - + - - + + diff --git a/setup/Swix/Microsoft.FSharp.Vsix/LangPack.Web.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr similarity index 95% rename from setup/Swix/Microsoft.FSharp.Vsix/LangPack.Web.Templates.swr rename to setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr index e9756006478..4eed84e98b1 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix/LangPack.Web.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr @@ -1,6 +1,6 @@ use vs -package name=Microsoft.FSharp.VSIX.$(VSSku) +package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=4.1 vs.package.language=$(LocaleRegion) diff --git a/setup/Swix/Microsoft.FSharp.vsmanproj b/setup/Swix/Microsoft.FSharp.vsmanproj index d3e84452711..25e55147a3a 100644 --- a/setup/Swix/Microsoft.FSharp.vsmanproj +++ b/setup/Swix/Microsoft.FSharp.vsmanproj @@ -15,13 +15,19 @@ - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/setup/fsharp-setup-build.proj b/setup/fsharp-setup-build.proj index 2ad86745eb4..208209368cf 100644 --- a/setup/fsharp-setup-build.proj +++ b/setup/fsharp-setup-build.proj @@ -15,54 +15,61 @@ FSharp.Wix.Extensions\FSharp.Wix.Extensions.csproj - + - + + + + Swix\Microsoft.FSharp.SDK.Core\Microsoft.FSharp.SDK.Core.swixproj + + + - + AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.SDK.Resources\Microsoft.FSharp.SDK.Resources.swixproj"> + + + + Swix\Microsoft.FSharp.Vsix.Core\Microsoft.FSharp.Vsix.Core.swixproj + Full + + + + Swix\Microsoft.FSharp.Vsix.Core\Microsoft.FSharp.Vsix.Core.swixproj + Desktop + + + + Swix\Microsoft.FSharp.Vsix.Core\Microsoft.FSharp.Vsix.Core.swixproj + Web + + + - + AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj;VSSku=Full"> + - + AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj;VSSku=Desktop"> + - + AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj;VSSku=Web"> + Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj - Full - - - - Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj - Desktop - - - - Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj - Web - + Swix\Microsoft.FSharp.vsmanproj From 98d2711197bf656c8c5b2ffa0a66c1594780bdfc Mon Sep 17 00:00:00 2001 From: Omar Tawfik Date: Tue, 30 Aug 2016 12:23:35 -0700 Subject: [PATCH 3/9] Address PR comments --- setup/FSharp.SDK/FSharp.SDK.wixproj | 2 +- setup/FSharp.Setup.props | 1 + .../Dependencies.swr | 18 +++++++++--------- .../Microsoft.FSharp.Dependencies/Files.swr | 2 +- .../Microsoft.FSharp.Dependencies.swixproj | 1 + setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr | 2 +- .../Microsoft.FSharp.SDK.Core.swixproj | 1 + .../Microsoft.FSharp.SDK.Resources/Empty.swr | 2 +- .../Microsoft.FSharp.SDK.Resources/Files.swr | 2 +- .../Microsoft.FSharp.SDK.Resources.swixproj | 3 ++- .../Swix/Microsoft.FSharp.Vsix.Core/Files.swr | 2 +- .../Microsoft.FSharp.Vsix.Core.swixproj | 1 + .../Desktop.Templates.swr | 2 +- .../Microsoft.FSharp.Vsix.Resources/Empty.swr | 2 +- .../Microsoft.FSharp.Vsix.Resources/Files.swr | 2 +- .../Full.Templates.swr | 2 +- .../Microsoft.FSharp.Vsix.Resources.swixproj | 3 ++- .../Web.Templates.swr | 2 +- setup/fsharp-setup-build.proj | 6 +++--- 19 files changed, 31 insertions(+), 25 deletions(-) diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj index 552ba996035..77a21295e2f 100644 --- a/setup/FSharp.SDK/FSharp.SDK.wixproj +++ b/setup/FSharp.SDK/FSharp.SDK.wixproj @@ -10,7 +10,7 @@ - Microsoft.FSharp.SDK.Core + Microsoft.FSharp.SDK.Core Microsoft.FSharp.SDK.Resources.$(LocaleCode) da0da41f-0e00-4598-8eee-b29d31b0ca04 Package diff --git a/setup/FSharp.Setup.props b/setup/FSharp.Setup.props index 683a8929c52..b865b1f2e04 100644 --- a/setup/FSharp.Setup.props +++ b/setup/FSharp.Setup.props @@ -4,6 +4,7 @@ 2.0 3.10 + 4.1 3.10.0.1503 $(SetupRootFolder)\..\packages\WiX.Toolset.2015.$(WiXToolset2015Version)\tools\wix $(SetupRootFolder)\..\packages diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr index af47f6b3c1f..406eb671e33 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr @@ -1,43 +1,43 @@ use vs package name=Microsoft.FSharp.Dependencies - version=4.1 + version=$(FSharpPackageVersion) vs.dependencies vs.dependency id=Microsoft.FSharp.SDK.Core - version=4.1 + version=$(FSharpPackageVersion) type=Required vs.dependency id=Microsoft.FSharp.SDK.Resources - version=4.1 + version=$(FSharpPackageVersion) type=Required vs.dependency id=Microsoft.FSharp.VSIX.Full.Core - version=4.1 + version=$(FSharpPackageVersion) type=Required when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community vs.dependency id=Microsoft.FSharp.VSIX.Full.Resources - version=4.1 + version=$(FSharpPackageVersion) type=Required when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Core - version=4.1 + version=$(FSharpPackageVersion) type=Required when=Microsoft.VisualStudio.Product.DesktopExpress vs.dependency id=Microsoft.FSharp.VSIX.Desktop.Resources - version=4.1 + version=$(FSharpPackageVersion) type=Required when=Microsoft.VisualStudio.Product.DesktopExpress vs.dependency id=Microsoft.FSharp.VSIX.Web.Core - version=4.1 + version=$(FSharpPackageVersion) type=Required when=Microsoft.VisualStudio.Product.WebExpress vs.dependency id=Microsoft.FSharp.VSIX.Web.Resources - version=4.1 + version=$(FSharpPackageVersion) type=Required when=Microsoft.VisualStudio.Product.WebExpress diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr index cc027e4bbe0..04eeec577a8 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr @@ -1,7 +1,7 @@ use vs package name=Microsoft.FSharp.Dependencies - version=4.1 + version=$(FSharpPackageVersion) folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp" file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets" diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj index 40f510c7f0f..2ba832036eb 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj @@ -19,6 +19,7 @@ $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) $(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder) + $(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion) diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr index a3b0e1c7558..03c9dab29b7 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr @@ -1,7 +1,7 @@ use vs package name=Microsoft.FSharp.SDK.Core - version=4.1 + version=$(FSharpPackageVersion) vs.package.type=msi vs.payloads diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj index 03062b5d636..b1f5d3a1d11 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj +++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj @@ -16,6 +16,7 @@ $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) + $(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion) diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr index 3ffac485287..1764f4975d8 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr @@ -1,6 +1,6 @@ use vs package name=Microsoft.FSharp.SDK.Resources - version=4.1 + version=$(FSharpPackageVersion) vs.package.type=msi vs.package.language=$(LocaleRegion) \ No newline at end of file diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr index 26c9847538e..515c2113cff 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr @@ -1,7 +1,7 @@ use vs package name=Microsoft.FSharp.SDK.Resources - version=4.1 + version=$(FSharpPackageVersion) vs.package.type=msi vs.package.language=$(LocaleRegion) diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj index 3ae84ecb8de..36e770c5a5f 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj @@ -16,13 +16,14 @@ $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) + $(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion) $(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode) $(PackagePreprocessorDefinitions);LocaleId=$(LocaleId) $(PackagePreprocessorDefinitions);LocaleRegion=$(LocaleRegion) $(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack) - + diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr index 5d2bc8383ef..34048ab6dbb 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr @@ -1,7 +1,7 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Core - version=4.1 + version=$(FSharpPackageVersion) vs.package.type=vsix vs.package.vsixId=VisualFSharp diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj index ffb10deb955..5f95bcfcfa6 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj +++ b/setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj @@ -17,6 +17,7 @@ $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) + $(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion) $(PackagePreprocessorDefinitions);VSSku=$(VSSku) diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr index 264ac22d2fc..c3a5051eb9b 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr @@ -1,7 +1,7 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources - version=4.1 + version=$(FSharpPackageVersion) vs.package.language=$(LocaleRegion) folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject" diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr index 5b1acc40bd4..e5f6b32bba1 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr @@ -1,5 +1,5 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources - version=4.1 + version=$(FSharpPackageVersion) vs.package.language=$(LocaleRegion) diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr index 64a7212159d..2d4b526661c 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr @@ -1,7 +1,7 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources - version=4.1 + version=$(FSharpPackageVersion) vs.package.language=$(LocaleRegion) folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleRegion)" diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr index 176ff8c8e98..863641f0646 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr @@ -1,7 +1,7 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources - version=4.1 + version=$(FSharpPackageVersion) vs.package.language=$(LocaleRegion) folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject" diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj index 01bb34505d2..57f2350108a 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj @@ -17,6 +17,7 @@ $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) + $(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion) $(PackagePreprocessorDefinitions);VSSku=$(VSSku) $(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode) $(PackagePreprocessorDefinitions);LocaleId=$(LocaleId) @@ -24,7 +25,7 @@ $(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack) - + diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr index 4eed84e98b1..e2c399c6445 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr @@ -1,7 +1,7 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources - version=4.1 + version=$(FSharpPackageVersion) vs.package.language=$(LocaleRegion) folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject" diff --git a/setup/fsharp-setup-build.proj b/setup/fsharp-setup-build.proj index 208209368cf..3468defdb64 100644 --- a/setup/fsharp-setup-build.proj +++ b/setup/fsharp-setup-build.proj @@ -81,19 +81,19 @@ + Properties="LocaleCode=%(SetupProjects.LocaleCode);LocaleId=%(SetupProjects.LocaleId);LocaleRegion=%(SetupProjects.LocaleRegion);IsLangPack=%(SetupProjects.IsLangPack);VSSku=%(SetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/> + Properties="LocaleCode=%(SetupProjects.LocaleCode);LocaleId=%(SetupProjects.LocaleId);LocaleRegion=%(SetupProjects.LocaleRegion);IsLangPack=%(SetupProjects.IsLangPack);VSSku=%(SetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/> + Properties="LocaleCode=%(SetupProjects.LocaleCode);LocaleId=%(SetupProjects.LocaleId);LocaleRegion=%(SetupProjects.LocaleRegion);IsLangPack=%(SetupProjects.IsLangPack);VSSku=%(SetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/> From 2ca18939f89b9cb24508ac49c6aa9b09a314ffd9 Mon Sep 17 00:00:00 2001 From: Omar Tawfik Date: Tue, 30 Aug 2016 21:28:46 -0700 Subject: [PATCH 4/9] Fix Core SDK empty msi error --- setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr | 1 - .../Microsoft.FSharp.SDK.Resources.swixproj | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr index 1764f4975d8..033e87965f0 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr @@ -2,5 +2,4 @@ use vs package name=Microsoft.FSharp.SDK.Resources version=$(FSharpPackageVersion) - vs.package.type=msi vs.package.language=$(LocaleRegion) \ No newline at end of file diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj index 36e770c5a5f..7c97051d864 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj @@ -4,12 +4,13 @@ ..\..\..\src neutral false - manifest Microsoft.FSharp.SDK.Resources.$(LocaleCode) true Debug $(FSharpSourcesRoot)\..\$(Configuration) $(BinariesFolder)\insertion + vsix + manifest From fc4f4b0870f22f1ba3a0ffc81f8d39279c5c6e41 Mon Sep 17 00:00:00 2001 From: Omar Tawfik Date: Wed, 31 Aug 2016 01:16:31 -0700 Subject: [PATCH 5/9] Place localized templates in F# extension folder --- .../Desktop.Templates.swr | 6 +++--- .../Full.Templates.swr | 14 +++++++------- .../Web.Templates.swr | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr index c3a5051eb9b..5a13ea95b15 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr @@ -4,21 +4,21 @@ package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=$(FSharpPackageVersion) vs.package.language=$(LocaleRegion) -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\App.config" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\ConsoleProject\AssemblyInfo.fs" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\ConsoleApplication.fsproj" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\ConsoleApplication.vstemplate" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\ConsoleProject\Program.fs" -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\AssemblyInfo.fs" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library.fsproj" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library.vstemplate" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library1.fs" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\Script.fsx" -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\TutorialProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\TutorialProject" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\TutorialProject\Tutorial.fsproj" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\TutorialProject\Tutorial.fsx" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\TutorialProject\Tutorial.vstemplate" diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr index 863641f0646..e695cfb6289 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr @@ -4,49 +4,49 @@ package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=$(FSharpPackageVersion) vs.package.language=$(LocaleRegion) -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\App.config" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\ConsoleProject\AssemblyInfo.fs" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\ConsoleApplication.fsproj" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\ConsoleApplication.vstemplate" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\ConsoleProject\Program.fs" -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\AssemblyInfo.fs" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library.fsproj" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library.vstemplate" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library1.fs" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\Script.fsx" -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\NetCore259Project" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\NetCore259Project" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCore259Project\AssemblyInfo.fs" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore259Project\NETCore259PortableLibrary.vstemplate" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore259Project\PortableLibrary.fsproj" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore259Project\PortableLibrary1.fs" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCore259Project\Script.fsx" -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\NetCore78Project" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\NetCore78Project" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCore78Project\AssemblyInfo.fs" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore78Project\NETCore78PortableLibrary.vstemplate" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore78Project\PortableLibrary.fsproj" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCore78Project\PortableLibrary1.fs" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCore78Project\Script.fsx" -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\NetCoreProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\NetCoreProject" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCoreProject\AssemblyInfo.fs" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCoreProject\NETCore7PortableLibrary.vstemplate" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCoreProject\PortableLibrary.fsproj" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\NetCoreProject\PortableLibrary1.fs" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\NetCoreProject\Script.fsx" -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\PortableLibraryProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\PortableLibraryProject" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\PortableLibraryProject\AssemblyInfo.fs" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\PortableLibraryProject\PortableLibrary.fsproj" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\PortableLibraryProject\PortableLibrary.vstemplate" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\PortableLibraryProject\PortableLibrary1.fs" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\PortableLibraryProject\Script.fsx" -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\TutorialProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\TutorialProject" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\TutorialProject\Tutorial.fsproj" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\TutorialProject\Tutorial.fsx" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\TutorialProject\Tutorial.vstemplate" diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr index e2c399c6445..4629530a98a 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr @@ -4,14 +4,14 @@ package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=$(FSharpPackageVersion) vs.package.language=$(LocaleRegion) -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\AssemblyInfo.fs" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library.fsproj" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library.vstemplate" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\LibraryProject\Library1.fs" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\Script.fsx" -folder "InstallDir:Common7\IDE\ProjectTemplates\FSharp\$(LocaleId)\TutorialProject" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\TutorialProject" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\TutorialProject\Tutorial.fsproj" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\TutorialProject\Tutorial.fsx" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\TutorialProject\Tutorial.vstemplate" From acf614e1ca8021da2ed0292b26bc13a62c46462d Mon Sep 17 00:00:00 2001 From: Omar Tawfik Date: Wed, 31 Aug 2016 11:55:26 -0700 Subject: [PATCH 6/9] Fix signing build error --- .../Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj | 1 + .../Microsoft.FSharp.SDK.Resources.swixproj | 1 + 2 files changed, 2 insertions(+) diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj index b1f5d3a1d11..de6979f0a7c 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj +++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj @@ -10,6 +10,7 @@ Debug $(FSharpSourcesRoot)\..\$(Configuration) $(BinariesFolder)\insertion + $(MSBuildThisFileDirectory)obj diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj index 7c97051d864..3fc1717b294 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj @@ -11,6 +11,7 @@ $(BinariesFolder)\insertion vsix manifest + $(MSBuildThisFileDirectory)obj From e5c0230d57caba837d34059dbeec8ce1cff32428 Mon Sep 17 00:00:00 2001 From: Omar Tawfik Date: Thu, 15 Sep 2016 17:03:06 -0700 Subject: [PATCH 7/9] Fixed Sattelite Assemblies folder names --- setup/FSharp.SDK/Common.Wix.Properties.wxs | 36 ++++++++-------- setup/FSharp.SDK/FSharp.SDK.wixproj | 6 ++- .../component-groups/Runtime_LangPack.wxs | 2 +- setup/FSharp.Setup.props | 42 ++++++++++++------- .../Microsoft.FSharp.SDK.Resources/Empty.swr | 2 +- .../Microsoft.FSharp.SDK.Resources/Files.swr | 2 +- .../Microsoft.FSharp.SDK.Resources.swixproj | 8 ++-- .../Desktop.Templates.swr | 2 +- .../Microsoft.FSharp.Vsix.Resources/Empty.swr | 2 +- .../Microsoft.FSharp.Vsix.Resources/Files.swr | 6 +-- .../Full.Templates.swr | 2 +- .../Microsoft.FSharp.Vsix.Resources.swixproj | 6 ++- .../Web.Templates.swr | 2 +- setup/fsharp-setup-build.proj | 6 +-- 14 files changed, 72 insertions(+), 52 deletions(-) diff --git a/setup/FSharp.SDK/Common.Wix.Properties.wxs b/setup/FSharp.SDK/Common.Wix.Properties.wxs index 5afdc6bcca3..f44251c1fdb 100644 --- a/setup/FSharp.SDK/Common.Wix.Properties.wxs +++ b/setup/FSharp.SDK/Common.Wix.Properties.wxs @@ -12,64 +12,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -81,7 +81,7 @@ - + diff --git a/setup/FSharp.SDK/FSharp.SDK.wixproj b/setup/FSharp.SDK/FSharp.SDK.wixproj index 77a21295e2f..12843effde0 100644 --- a/setup/FSharp.SDK/FSharp.SDK.wixproj +++ b/setup/FSharp.SDK/FSharp.SDK.wixproj @@ -24,7 +24,8 @@ $(DefineConstants);LocaleCode=$(LocaleCode) $(DefineConstants);LocaleId=$(LocaleId) - $(DefineConstants);LocaleRegion=$(LocaleRegion) + $(DefineConstants);LocaleParentCulture=$(LocaleParentCulture) + $(DefineConstants);LocaleSpecificCulture=$(LocaleSpecificCulture) $(DefineConstants);IsLangPack=$(IsLangPack) $(DefineConstants);BinariesDir=$(BinariesDir) @@ -66,7 +67,8 @@ - + + diff --git a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs index acd7f104fc9..633cb063bb8 100644 --- a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs +++ b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs @@ -4,7 +4,7 @@ - + diff --git a/setup/FSharp.Setup.props b/setup/FSharp.Setup.props index b865b1f2e04..0ead30f9770 100644 --- a/setup/FSharp.Setup.props +++ b/setup/FSharp.Setup.props @@ -27,85 +27,99 @@ ENU 1033 - en-us + en + en-US false CHT 1028 - zh-tw + zh-Hant + zh-TW true CSY 1029 - cs-cz + cs + cs-CZ true DEU 1031 - de-de + de + de-DE true FRA 1036 - fr-fr + fr + fr-FR true ITA 1040 - it-it + it + it-IT true JPN 1041 - ja-jp + ja + ja-JP true KOR 1042 - ko-kr + ko + ko-KR true PLK 1045 - pl-pl + pl + pl-PL true PTB 1046 - pt-br + pt-BR + pt-BR true RUS 1049 - ru-ru + ru + ru-RU true TRK 1055 - tr-tr + tr + tr-TR true CHS 2052 - zh-cn + zh-Hans + zh-CN true ESN 3082 - es-es + es + es-ES true diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr index 033e87965f0..fa3af6a1adb 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr @@ -2,4 +2,4 @@ use vs package name=Microsoft.FSharp.SDK.Resources version=$(FSharpPackageVersion) - vs.package.language=$(LocaleRegion) \ No newline at end of file + vs.package.language=$(LocaleSpecificCulture) \ No newline at end of file diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr index 515c2113cff..5e7c02d2980 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr @@ -3,7 +3,7 @@ use vs package name=Microsoft.FSharp.SDK.Resources version=$(FSharpPackageVersion) vs.package.type=msi - vs.package.language=$(LocaleRegion) + vs.package.language=$(LocaleSpecificCulture) vs.payloads vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Resources.$(LocaleCode).msi" diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj index 3fc1717b294..a91de00cb73 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj @@ -20,8 +20,9 @@ $(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder) $(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion) $(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode) - $(PackagePreprocessorDefinitions);LocaleId=$(LocaleId) - $(PackagePreprocessorDefinitions);LocaleRegion=$(LocaleRegion) + $(PackagePreprocessorDefinitions);LocaleId=$(LocaleId) + $(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture) + $(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture) $(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack) @@ -40,7 +41,8 @@ - + + diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr index 5a13ea95b15..f918abc7334 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Desktop.Templates.swr @@ -2,7 +2,7 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=$(FSharpPackageVersion) - vs.package.language=$(LocaleRegion) + vs.package.language=$(LocaleSpecificCulture) folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\App.config" diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr index e5f6b32bba1..2203e272e19 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Empty.swr @@ -2,4 +2,4 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=$(FSharpPackageVersion) - vs.package.language=$(LocaleRegion) + vs.package.language=$(LocaleSpecificCulture) diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr index 2d4b526661c..749b461e814 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Files.swr @@ -2,12 +2,12 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=$(FSharpPackageVersion) - vs.package.language=$(LocaleRegion) + vs.package.language=$(LocaleSpecificCulture) -folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleRegion)" +folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleParentCulture)" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes -folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\$(LocaleRegion)" +folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\$(LocaleParentCulture)" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Compiler.resources.dll" vs.file.ngen=yes file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.LanguageService.Base.resources.dll" vs.file.ngen=yes diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr index e695cfb6289..fec68497438 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Full.Templates.swr @@ -2,7 +2,7 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=$(FSharpPackageVersion) - vs.package.language=$(LocaleRegion) + vs.package.language=$(LocaleSpecificCulture) folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\ConsoleProject" file source="$(BinariesFolder)\net40\bin\ProjectTemplates\ConsoleProject\App.config" diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj index 57f2350108a..e2371d1d5d7 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj @@ -21,7 +21,8 @@ $(PackagePreprocessorDefinitions);VSSku=$(VSSku) $(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode) $(PackagePreprocessorDefinitions);LocaleId=$(LocaleId) - $(PackagePreprocessorDefinitions);LocaleRegion=$(LocaleRegion) + $(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture) + $(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture) $(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack) @@ -42,7 +43,8 @@ - + + diff --git a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr index 4629530a98a..8f0cdd660ef 100644 --- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr +++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Web.Templates.swr @@ -2,7 +2,7 @@ use vs package name=Microsoft.FSharp.VSIX.$(VSSku).Resources version=$(FSharpPackageVersion) - vs.package.language=$(LocaleRegion) + vs.package.language=$(LocaleSpecificCulture) folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp\ProjectTemplates\FSharp\$(LocaleId)\LibraryProject" file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\ProjectTemplates\LibraryProject\AssemblyInfo.fs" diff --git a/setup/fsharp-setup-build.proj b/setup/fsharp-setup-build.proj index 3468defdb64..85b6ffb1dad 100644 --- a/setup/fsharp-setup-build.proj +++ b/setup/fsharp-setup-build.proj @@ -81,19 +81,19 @@ + Properties="LocaleCode=%(SetupProjects.LocaleCode);LocaleId=%(SetupProjects.LocaleId);LocaleParentCulture=%(SetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SetupProjects.LocaleSpecificCulture);IsLangPack=%(SetupProjects.IsLangPack);VSSku=%(SetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/> + Properties="LocaleCode=%(SetupProjects.LocaleCode);LocaleId=%(SetupProjects.LocaleId);LocaleParentCulture=%(SetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SetupProjects.LocaleSpecificCulture);IsLangPack=%(SetupProjects.IsLangPack);VSSku=%(SetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/> + Properties="LocaleCode=%(SetupProjects.LocaleCode);LocaleId=%(SetupProjects.LocaleId);LocaleParentCulture=%(SetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SetupProjects.LocaleSpecificCulture);IsLangPack=%(SetupProjects.IsLangPack);VSSku=%(SetupProjects.VSSku);FSharpPackageVersion=$(FSharpPackageVersion)"/> From 77ed7305a6e5432ec4f5d692d46e7ce982ae0e4c Mon Sep 17 00:00:00 2001 From: Omar Tawfik Date: Tue, 20 Sep 2016 14:14:21 -0700 Subject: [PATCH 8/9] Added VisualFSharpOpenSource project --- VisualFSharp.sln | 19 +- .../Source.extension.vsixmanifest | 63 ++++ .../VisualFSharpOpenSource.csproj | 316 ++++++++++++++++++ .../fsharp-vsintegration-vsix-build.proj | 1 + 4 files changed, 396 insertions(+), 3 deletions(-) create mode 100644 vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest create mode 100644 vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj diff --git a/VisualFSharp.sln b/VisualFSharp.sln index 0dd516a06bd..d70655386d3 100644 --- a/VisualFSharp.sln +++ b/VisualFSharp.sln @@ -1,9 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.25302.0 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 15.0.25618.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler", "src\fsharp\FSharp.Compiler\FSharp.Compiler.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}" EndProject @@ -131,6 +129,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpFull", "vsinteg EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpWeb", "vsintegration\Vsix\VisualFSharpWeb\VisualFSharpWeb.csproj", "{58730C8B-16F5-4956-9291-BB68E17C9142}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpOpenSource", "vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj", "{E6A45CDF-B408-420F-B475-74611BEFC52B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -728,6 +728,18 @@ Global {58730C8B-16F5-4956-9291-BB68E17C9142}.Release|Any CPU.Build.0 = Release|Any CPU {58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.ActiveCfg = Release|Any CPU {58730C8B-16F5-4956-9291-BB68E17C9142}.Release|x86.Build.0 = Release|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.ActiveCfg = Debug|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.Build.0 = Debug|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.ActiveCfg = Proto|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.Build.0 = Proto|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.ActiveCfg = Proto|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.Build.0 = Proto|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.Build.0 = Release|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|x86.ActiveCfg = Release|Any CPU + {E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -787,5 +799,6 @@ Global {E7EC4A3E-9D57-45B8-83F5-EDDFD6CEF090} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F} {59ADCE46-9740-4079-834D-9A03A3494EBC} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F} {58730C8B-16F5-4956-9291-BB68E17C9142} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F} + {E6A45CDF-B408-420F-B475-74611BEFC52B} = {141F6C23-E1B1-4D89-9F10-F0B8AD58E71F} EndGlobalSection EndGlobal diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest new file mode 100644 index 00000000000..d8f04529fb4 --- /dev/null +++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest @@ -0,0 +1,63 @@ + + + + + + Visual F# Tools + Deploy Visual F# Tools templates to Visual Studio + ..\CommonExtensions\Microsoft\FSharp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj new file mode 100644 index 00000000000..a4c64175707 --- /dev/null +++ b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj @@ -0,0 +1,316 @@ + + + + + ..\..\..\src + net40 + 15.0 + 11.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + 15.0 + 2.0 + true + {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + publish\ + true + Disk + false + Foreground + 7 + Days + true + false + true + 0 + v4.6 + false + false + false + false + false + false + false + false + true + None + Debug + AnyCPU + Library + Properties + FSharpDev + true + False + False + {E6A45CDF-B408-420F-B475-74611BEFC52B} + true + VisualFSharpOpenSource + $(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin + VisualFSharpOpenSource + $(RootBinPath) + 15.4.1.0 + cs + + + Program + $(DevEnvDir)devenv.exe + /rootsuffix $(VSRootSuffix) /log + $(VSRootSuffix) + true + + + Program + $(DevEnvDir)devenv.exe + true + /rootsuffix $(VSRootSuffix) /log + $(VSRootSuffix) + + + + Designer + + + Always + true + RegisterFsharpPackage.pkgdef + + + PreserveNewest + true + + + + + False + Microsoft .NET Framework 4.6 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + + + {649FA588-F02E-457C-9FCF-87E46407481E} + FSharp.Compiler.Interactive.Settings + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06} + FSharp.Compiler.Server.Shared + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} + FSharp.Compiler + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {DED3BBD7-53F4-428A-8C9F-27968E768605} + FSharp.Core + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {A437A6EC-5323-47C2-8F86-E2CAC54FF152} + FSharp.LanguageService.Compiler + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {8B3E283D-B5FE-4055-9D80-7E3A32F3967B} + FsiAnyCPU + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {D0E98C0D-490B-4C61-9329-0862F6E87645} + Fsi + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {65e0e82a-eace-4787-8994-888674c2fe87} + FSharp.Editor + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {1C5C163C-37EA-4A3C-8CCC-0D34B74BF8EF} + FSharp.LanguageService.Base + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {EE85AAB7-CDA0-4C4E-BDA0-A64CCC413E3F} + FSharp.LanguageService + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7} + ProjectSystem.Base + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {6196B0F8-CAEA-4CF1-AF82-1B520F77FE44} + ProjectSystem + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {FCFB214C-462E-42B3-91CA-FC557EFEE74F} + FSharp.PropertiesPages + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {991DCF75-C2EB-42B6-9A0D-AA1D2409D519} + FSharp.VS.FSI + BuiltProjectOutputGroup%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgDefProjectOutputGroup%3b + DebugSymbolsProjectOutputGroup%3b + True + + + {6ba13aa4-c25f-480f-856b-8e8000299a72} + AppConfig + ItemTemplates + TemplateProjectOutputGroup%3b + false + True + + + {12ac2813-e895-4aaa-ae6c-94e21da09f64} + CodeFile + ItemTemplates + TemplateProjectOutputGroup%3b + false + True + + + {a333b85a-dc23-49b6-9797-b89a7951e92d} + ScriptFile + ItemTemplates + TemplateProjectOutputGroup%3b + false + True + + + {e3fdd4ac-46b6-4b9f-b672-317d1202cc50} + SignatureFile + ItemTemplates + TemplateProjectOutputGroup%3b + false + True + + + {d11fc318-8f5d-4c8c-9287-ab40a016d13c} + TextFile + ItemTemplates + TemplateProjectOutputGroup%3b + false + True + + + {1fb1dd07-06aa-45b4-b5ac-20ff5bee98b6} + XMLFile + ItemTemplates + TemplateProjectOutputGroup%3b + false + True + + + {604f0daa-2d33-48dd-b162-edf0b672803d} + ConsoleProject + ProjectTemplates + TemplateProjectOutputGroup%3b + false + True + + + {01678cda-a11f-4dee-9344-2edf91cf1ae7} + LibraryProject + ProjectTemplates + TemplateProjectOutputGroup%3b + false + True + + + {d9d95330-3626-4199-b7af-17b8e4af6d87} + NetCore259Project + ProjectTemplates + TemplateProjectOutputGroup%3b + false + True + + + {1a8dbf70-4178-4ae3-af5f-39ddd5692210} + NetCore78Project + ProjectTemplates + TemplateProjectOutputGroup%3b + false + True + + + {5b739cf3-1116-4eb4-b598-6c16bea81ce5} + NetCoreProject + ProjectTemplates + TemplateProjectOutputGroup%3b + false + True + + + {db374a0c-7560-479f-9b21-d37c81f7624f} + PortableLibraryProject + ProjectTemplates + TemplateProjectOutputGroup%3b + false + True + + + {2facee44-48bd-40b5-a2ee-b54a0c9bb7c4} + TutorialProject + ProjectTemplates + TemplateProjectOutputGroup%3b + false + True + + + + + + + + + VsixSHA2 + + + + \ No newline at end of file diff --git a/vsintegration/fsharp-vsintegration-vsix-build.proj b/vsintegration/fsharp-vsintegration-vsix-build.proj index 96cc78da026..d2588f7bd66 100644 --- a/vsintegration/fsharp-vsintegration-vsix-build.proj +++ b/vsintegration/fsharp-vsintegration-vsix-build.proj @@ -8,6 +8,7 @@ + From 87bf48a176a80ee0757bafd597075410ba320c8d Mon Sep 17 00:00:00 2001 From: Omar Tawfik Date: Tue, 20 Sep 2016 16:53:28 -0700 Subject: [PATCH 9/9] Added Experimental flag on VisualFSharpOpenSource --- .../Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest index d8f04529fb4..714758ace3b 100644 --- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest @@ -7,7 +7,7 @@ Deploy Visual F# Tools templates to Visual Studio ..\CommonExtensions\Microsoft\FSharp - +