Reverse dependencies order to work around vsix v2/v3 mismatch

Author: Omar Tawfik

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

@@ -1,9 +1,18 @@
 use vs
 
-package name=Microsoft.FSharp.Dependencies
+package name=Microsoft.FSharp.Dependencies.$(VSSku)
         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"
   file "Microsoft.Portable.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets"

setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj

@@ -10,7 +10,7 @@
     <BinariesFolder>$(FSharpSourcesRoot)\..\$(Configuration)</BinariesFolder>
     <PackagesFolder>$(FSharpSourcesRoot)\..\packages</PackagesFolder>
     <OutputPath>$(BinariesFolder)\insertion</OutputPath>
-    <OutputName>Microsoft.FSharp.Dependencies</OutputName>
+    <OutputName>Microsoft.FSharp.Dependencies.$(VSSku)</OutputName>
     <IntermediateOutputPath>$(MSBuildThisFileDirectory)obj</IntermediateOutputPath>
   </PropertyGroup>
 
@@ -19,6 +19,7 @@
   <PropertyGroup>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);VSSku=$(VSSku)</PackagePreprocessorDefinitions>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,4 +29,8 @@
   <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
     <!-- SWIX plugin adds the built vsix to signing automatically -->
   </Target>
+  
+  <Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
+    <Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
+  </Target>
 </Project>

setup/Swix/Microsoft.FSharp.Vsix/Core.Files.swr

@@ -5,14 +5,5 @@ package name=Microsoft.FSharp.VSIX.$(VSSku)
         vs.package.type=vsix
         vs.package.language=$(LocaleRegion)
 
-vs.dependencies
-  vs.dependency id=Microsoft.FSharp.Dependencies
-                version=4.1
-                type=Required
-  
-  vs.dependency id=Microsoft.FSharp.SDK
-                version=4.1
-                type=Required
-
 vs.payloads
   vs.payload source="$(BinariesFolder)\net40\bin\VisualFSharp$(VSSku).vsix"

setup/Swix/Microsoft.FSharp.Vsix/LangPack.Files.swr

@@ -4,15 +4,6 @@ package name=Microsoft.FSharp.VSIX.$(VSSku)
         version=4.1
         vs.package.language=$(LocaleRegion)
 
-vs.dependencies
-  vs.dependency id=Microsoft.FSharp.Dependencies
-                version=4.1
-                type=Required
-  
-  vs.dependency id=Microsoft.FSharp.SDK
-                version=4.1
-                type=Required
-
 folder "InstallDir:Common7\IDE\PublicAssemblies\$(LocaleRegion)"
   file source="$(BinariesFolder)\net40\bin\localize\$(LocaleCode)\FSharp.Core.resources.dll" vs.file.ngen=yes
 

setup/Swix/Microsoft.FSharp.vsmanproj

@@ -10,15 +10,15 @@
         <IsPackage>true</IsPackage>
         <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\insertion</OutputPath>
     </PropertyGroup>
-
+    
     <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
 
     <Target Name="IncludeManifests" BeforeTargets="MergeManifests">
         <ItemGroup>
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.%(SetupLanguages.LocaleCode).json" />
-            <!-- TODO: Add Other SKUs for Microsoft.FSharp.Vsix.swixproj -->
+            <!-- TODO: Add Other SKUs for Microsoft.FSharp.Vsix and Microsoft.FSharp.Dependencies -->
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Vsix.Full.%(SetupLanguages.LocaleCode).json" />
-            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Dependencies.json" />
+            <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.Dependencies.Full.json" />
         </ItemGroup>
     </Target>
 </Project>

setup/fsharp-setup-build.proj

@@ -30,7 +30,7 @@
                     TaskParameter="Include"/>
         </CreateItem>     
 
-        <!-- TODO: Add Other SKUs for Microsoft.FSharp.Vsix.swixproj -->
+        <!-- TODO: Add Other SKUs for Microsoft.FSharp.Vsix -->
 
         <CreateItem Include="@(SetupLanguages)"
                     AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix\Microsoft.FSharp.Vsix.swixproj;VSSku=Full">
@@ -39,9 +39,13 @@
         </CreateItem>
 
         <ItemGroup>
+            <!-- TODO: Add Other SKUs for Microsoft.FSharp.Dependencies -->
+        
             <SetupProjects Include="Microsoft.FSharp.Dependencies.swixproj">
                 <ProjectPath>Swix\Microsoft.FSharp.Dependencies\Microsoft.FSharp.Dependencies.swixproj</ProjectPath>
+                <VSSku>Full</VSSku>
             </SetupProjects>            
+            
             <SetupProjects Include="Microsoft.FSharp.vsmanproj">
                 <ProjectPath>Swix\Microsoft.FSharp.vsmanproj</ProjectPath>
             </SetupProjects>