Merge pull request #6591 from Microsoft/merges/master-to-fsharp5

Merge master to fsharp5
dotnet · Apr 20, 2019 · efd92ee · efd92ee
2 parents 50552a6 + c4c1d9c
commit efd92ee
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 32 deletions.
diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr
diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj
@@ -12,8 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <SwrFile Include="Files.swr" />
-    <SwrFile Include="Dependencies.swr" />
+    <SwrFile Include="Package.swr" />
   </ItemGroup>
 
 </Project>
diff --git a/...x/Microsoft.FSharp.Dependencies/Files.swr → ...Microsoft.FSharp.Dependencies/Package.swr b/...x/Microsoft.FSharp.Dependencies/Files.swr → ...Microsoft.FSharp.Dependencies/Package.swr
@@ -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"

diff --git a/setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr b/setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr
diff --git a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj
@@ -10,8 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <SwrFile Include="Files.swr" />
-    <SwrFile Include="Dependencies.swr" />
+    <SwrFile Include="Package.swr" />
   </ItemGroup>
 
 </Project>
diff --git a/setup/Swix/Microsoft.FSharp.IDE/Files.swr → setup/Swix/Microsoft.FSharp.IDE/Package.swr b/setup/Swix/Microsoft.FSharp.IDE/Files.swr → setup/Swix/Microsoft.FSharp.IDE/Package.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"