rename SWIX packages and remove unnecessary SDK resources package

brettfo · brettfo · commit ceffd871d9ad · 2018-05-24T13:18:11.000-07:00
diff --git a/build/config/InsertionSignToolData.json b/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"
       ]
     }
   ],
diff --git a/setup/Swix/Microsoft.FSharp.Compiler.Resources/Empty.swr b/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
diff --git a/setup/Swix/Microsoft.FSharp.Compiler.Resources/Files.swr b/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"
diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr b/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
 
diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
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
diff --git a/setup/Swix/Microsoft.FSharp.SDK/Files.swr b/setup/Swix/Microsoft.FSharp.SDK/Files.swr
@@ -1,6 +1,6 @@
 use vs
 
-package name=Microsoft.FSharp.SDK.Core
+package name=Microsoft.FSharp.SDK
         version=$(FSharpPackageVersion)
 
 folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
diff --git a/setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj b/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>
diff --git a/setup/Swix/Microsoft.FSharp.vsmanproj b/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" />
diff --git a/setup/build-insertion.proj b/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"/>

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@`
`6`	`6`	`"values": [`
`7`	`7`	`"insertion\\Microsoft.FSharp.Compiler.vsix",`
`8`	`8`	`"insertion\\Microsoft.FSharp.Compiler.Resources.*.vsix",`
`9`		`- "insertion\\Microsoft.FSharp.SDK.Core.vsix",`
`10`		`- "insertion\\Microsoft.FSharp.SDK.Resources.*.vsix"`
	`9`	`+ "insertion\\Microsoft.FSharp.SDK.vsix"`
`11`	`10`	`]`
`12`	`11`	`}`
`13`	`12`	`],`