combine swr files (#6587)

Author: brettfo

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

@@ -12,8 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <SwrFile Include="Dependencies.swr" />
-    <SwrFile Include="Files.swr" />
+    <SwrFile Include="Package.swr" />
   </ItemGroup>
 
 </Project>

setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj

@@ -3,6 +3,11 @@ use vs
 package name=Microsoft.FSharp.Dependencies
         version=$(VsixVersion)
 
+vs.dependencies
+  vs.dependency id=Microsoft.FSharp.SDK
+                version=$(VsixVersion)
+                type=Required
+
 folder "InstallDir:MSBuild\Microsoft\VisualStudio\v$(VSGeneralVersion)\FSharp"
   file "Microsoft.FSharp.targets" source="$(SetupShimsDir)\Microsoft.FSharp.Shim.targets"
   file "Microsoft.Portable.FSharp.targets" source="$(SetupShimsDir)\Microsoft.Portable.FSharp.Shim.targets"

…/Microsoft.FSharp.Dependencies/Files.swr …icrosoft.FSharp.Dependencies/Package.swrsetup/Swix/Microsoft.FSharp.Dependencies/Files.swr renamed to setup/Swix/Microsoft.FSharp.Dependencies/Package.swr setup/Swix/Microsoft.FSharp.Dependencies/Files.swr renamed to setup/Swix/Microsoft.FSharp.Dependencies/Package.swr

@@ -10,8 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <SwrFile Include="Dependencies.swr" />
-    <SwrFile Include="Files.swr" />
+    <SwrFile Include="Package.swr" />
   </ItemGroup>
 
 </Project>

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

@@ -3,6 +3,16 @@ use vs
 package name=Microsoft.FSharp.IDE
         version=$(VsixVersion)
 
+vs.dependencies
+  vs.dependency id=Microsoft.FSharp.Dependencies
+                version=$(VsixVersion)
+                type=Required
+
+  vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
+                version=$(VsixVersion)
+                type=Required
+                when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
+
 folder "InstallDir:Common7\IDE\NewScriptItems"
   file source="$(SetupResourcesDir)\NewFileDialog\Script\NewFSharpScriptItems.vsdir"
   file source="$(SetupResourcesDir)\NewFileDialog\Script\Script.fsx"