From 0fadd9e42ba61f1f77db23a1060f7b40f0325685 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Fri, 19 Apr 2019 12:26:08 -0700 Subject: [PATCH] rearrange order of SWR files to fix dependencies (#6582) --- .../Microsoft.FSharp.Dependencies.csproj | 2 +- setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr | 5 ----- setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj index 268f1d84dea..4dfc5e2ed60 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj @@ -12,8 +12,8 @@ - + diff --git a/setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr b/setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr index 9ed63a9ff0c..36882963903 100644 --- a/setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr +++ b/setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr @@ -12,8 +12,3 @@ vs.dependencies version=$(VsixVersion) type=Required when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community - - vs.dependency id=Microsoft.FSharp.VSIX.Full.Resources - version=$(VsixVersion) - type=Required - when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community diff --git a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj index e7226c491eb..8e89e6d364c 100644 --- a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj +++ b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj @@ -10,8 +10,8 @@ - +