rename SWIX packages and remove unnecessary SDK resources package

build/config/InsertionSignToolData.json

@@ -6,8 +6,7 @@
       "values": [
         "insertion\\Microsoft.FSharp.Compiler.vsix",
         "insertion\\Microsoft.FSharp.Compiler.Resources.*.vsix",
-        "insertion\\Microsoft.FSharp.SDK.Core.vsix",
-        "insertion\\Microsoft.FSharp.SDK.Resources.*.vsix"
+        "insertion\\Microsoft.FSharp.SDK.vsix"
       ]
     }
   ],

setup/Swix/Microsoft.FSharp.Compiler.Resources/Empty.swr

@@ -3,4 +3,3 @@ use vs
 package name=Microsoft.FSharp.Compiler.Resources
         version=$(FSharpPackageVersion)
         vs.package.language=$(LocaleSpecificCulture)
-        vs.package.providerKey=Microsoft.FSharp.Compiler.Resources,$(LocaleSpecificCulture),v4.1

setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr

@@ -3,7 +3,6 @@ use vs
 package name=Microsoft.FSharp.Compiler.Resources
         version=$(FSharpPackageVersion)
         vs.package.language=$(LocaleSpecificCulture)
-        vs.package.providerKey=Microsoft.FSharp.Compiler.Resources,$(LocaleSpecificCulture),v4.1
 
 folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\$(LocaleParentCulture)"
   file source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Build.resources.dll"

setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr

@@ -8,11 +8,7 @@ vs.dependencies
                 version=$(FSharpPackageVersion)
                 type=Required
 
-  vs.dependency id=Microsoft.FSharp.SDK.Core
-                version=$(FSharpPackageVersion)
-                type=Required
-
-  vs.dependency id=Microsoft.FSharp.SDK.Resources
+  vs.dependency id=Microsoft.FSharp.SDK
                 version=$(FSharpPackageVersion)
                 type=Required
 

setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr

-use vs
-
-package name=Microsoft.FSharp.SDK.Resources
-        version=$(FSharpPackageVersion)
-        vs.package.language=$(LocaleSpecificCulture)

setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr

-use vs
-
-package name=Microsoft.FSharp.SDK.Resources
-        version=$(FSharpPackageVersion)
-        vs.package.language=$(LocaleSpecificCulture)
-
-folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpCompiler\$(LocaleParentCulture)"
-  file "FSharp.Build.resources.dll" source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Build.resources.dll"
-  file "FSharp.Compiler.Private.resources.dll" source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Compiler.Private.resources.dll"
-  file "FSharp.Core.resources.dll" source="$(BinariesFolder)\net40\bin\$(LocaleParentCulture)\FSharp.Core.resources.dll"

setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
-    <OutputArchitecture>neutral</OutputArchitecture>
-    <OutputLocalized>false</OutputLocalized>
-    <OutputName>Microsoft.FSharp.SDK.Resources.$(LocaleCode)</OutputName>
-    <IsPackage>true</IsPackage>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
-    <OutputPath>$(BinariesFolder)\insertion</OutputPath>
-    <OutputType>vsix</OutputType>
-    <IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
-  </PropertyGroup>
-
-  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-
-  <PropertyGroup>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture)</PackagePreprocessorDefinitions>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture)</PackagePreprocessorDefinitions>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(IsLangPack)' != 'true'">
-    <Package Include="Empty.swr" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(IsLangPack)' == 'true'">
-    <Package Include="Files.swr" />
-  </ItemGroup>
-  <Target Name="CheckPropertiesArePassed">
-    <Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
-    <Error Condition="'$(LocaleSpecificCulture)' == ''" Text="A 'LocaleSpecificCulture' property must be passed to the project." />
-    <Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
-    <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
-  </Target>
-
-  <Target Name="SignFiles">
-    <!-- Signing is handled by the RoslynSignTool -->
-  </Target>
-</Project>

setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr → setup/Swix/Microsoft.FSharp.SDK/Files.swr

 use vs
 
-package name=Microsoft.FSharp.SDK.Core
+package name=Microsoft.FSharp.SDK
         version=$(FSharpPackageVersion)
 
 folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"

setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj → setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj

@@ -6,7 +6,7 @@
     <OutputArchitecture>neutral</OutputArchitecture>
     <OutputLocalized>false</OutputLocalized>
     <OutputType>vsix</OutputType>
-    <OutputName>Microsoft.FSharp.SDK.Core</OutputName>
+    <OutputName>Microsoft.FSharp.SDK</OutputName>
     <IsPackage>true</IsPackage>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>

setup/Swix/Microsoft.FSharp.vsmanproj

@@ -30,8 +30,7 @@
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Compiler.json" />
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Compiler.Resources.%(SetupLanguages.LocaleCode).json" />
 
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Core.json" />
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Resources.%(SetupLanguages.LocaleCode).json" />
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.json" />
 
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Core.json" />
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.Resources.%(SetupLanguages.LocaleCode).json" />

setup/build-insertion.proj

@@ -13,18 +13,14 @@
 
     <Target Name="CollectSetupProjects">
         <ItemGroup>
-            <SwixSetupProjects Include="Microsoft.FSharp.SDK.Core.swixproj">
-                <ProjectPath>Swix\Microsoft.FSharp.SDK.Core\Microsoft.FSharp.SDK.Core.swixproj</ProjectPath>
+            <SwixSetupProjects Include="Microsoft.FSharp.SDK.swixproj">
+                <ProjectPath>Swix\Microsoft.FSharp.SDK\Microsoft.FSharp.SDK.swixproj</ProjectPath>
             </SwixSetupProjects>
             <SwixSetupProjects Include="Microsoft.FSharp.Compiler.swixproj">
                 <ProjectPath>Swix\Microsoft.FSharp.Compiler\Microsoft.FSharp.Compiler.swixproj</ProjectPath>
             </SwixSetupProjects>
         </ItemGroup>
 
-        <CreateItem Include="@(SetupLanguages)"
-                    AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.SDK.Resources\Microsoft.FSharp.SDK.Resources.swixproj">
-            <Output ItemName="SwixSetupProjects" TaskParameter="Include"/>
-        </CreateItem>
         <CreateItem Include="@(SetupLanguages)"
                     AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Compiler.Resources\Microsoft.FSharp.Compiler.Resources.swixproj">
             <Output ItemName="SwixSetupProjects" TaskParameter="Include"/>