Merge branch 'master' of github.com:fsprojects/Paket.VisualStudio

# Conflicts: # paket.lock # src/Paket.VisualStudio/Paket.VisualStudio.csproj
fsprojects · Nov 22, 2016 · 96c4b72 · 96c4b72
2 parents c174f67 + c2cdda3
commit 96c4b72
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 43 deletions.
diff --git a/build.fsx b/build.fsx
@@ -55,6 +55,8 @@ let release = parseReleaseNotes (IO.File.ReadAllLines "RELEASE_NOTES.md")
 let isAppVeyorBuild = environVar "APPVEYOR" <> null
 let buildVersion = sprintf "%s-a%s" release.NugetVersion (DateTime.UtcNow.ToString "yyMMddHHmm")
 
+let visualStudioVersion = getBuildParamOrDefault "VisualStudioVersion" "12" |> sprintf "%s.0"
+
 let buildDir = "bin"
 let vsixDir = "bin/vsix"
 let tempDir = "temp"
@@ -100,7 +102,7 @@ Target "CleanDocs" (fun _ ->
 Target "Build" (fun _ ->
  // We would like to build only one solution
  !! (solutionFile + ".sln")
- |> MSBuildReleaseExt "" ["VisualStudioVersion", "12.0"] "Rebuild"
+ |> MSBuildReleaseExt "" ["VisualStudioVersion", visualStudioVersion] "Rebuild"
  |> ignore
 )
 

diff --git a/paket.dependencies b/paket.dependencies
@@ -7,11 +7,11 @@ nuget Mono.Cecil prerelease redirects:force
 nuget VSSDK.DTE.8 copy_local: false
 nuget VSSDK.DTE.9 copy_local: false
 nuget VSSDK.DTE.10 copy_local: false
-nuget VSSDK.GraphModel.12 copy_local: false
+nuget VSSDK.GraphModel.12
 nuget VSSDK.Language.12 copy_local: false
-nuget VSSDK.Editor.12 copy_local: false
+nuget VSSDK.Editor.12
 nuget VSSDK.ComponentModelHost.12 copy_local: false
-nuget VSSDK.Shell.12 copy_local: false
+nuget VSSDK.Shell.12
 nuget VSSDK.Shell.Interop.12 copy_local: false
 nuget reactiveui 6.5.2
 nuget reactiveui-events 6.5.0

diff --git a/paket.lock b/paket.lock
@@ -141,9 +141,9 @@ NUGET
  VSSDK.ComponentModelHost.12 (12.0.4) - copy_local: false
  VSSDK.ComponentModelHost (>= 12.0.4 < 13.0)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
- VSSDK.CoreUtility (12.0.4) - copy_local: false
+ VSSDK.CoreUtility (12.0.4)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
- VSSDK.CoreUtility.12 (12.0.4) - copy_local: false
+ VSSDK.CoreUtility.12 (12.0.4)
  VSSDK.CoreUtility (>= 12.0.4 < 13.0)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
  VSSDK.DTE (7.0.4) - copy_local: false
@@ -160,26 +160,26 @@ NUGET
  VSSDK.DTE (>= 7.0.4 < 8.0)
  VSSDK.DTE.8 (>= 8.0.4 < 9.0)
  VSSDK.IDE.9 (>= 9.0.4 < 10.0)
- VSSDK.Editor (12.0.4) - copy_local: false
+ VSSDK.Editor (12.0.4)
  VSSDK.CoreUtility (>= 12.0.4)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
  VSSDK.OLE.Interop (>= 7.0.4 < 8.0)
  VSSDK.Text (>= 12.0.4)
  VSSDK.TextManager.Interop (>= 7.0.4 < 8.0)
  VSSDK.TextManager.Interop.8 (>= 8.0.4 < 9.0)
- VSSDK.Editor.12 (12.0.4) - copy_local: false
+ VSSDK.Editor.12 (12.0.4)
  VSSDK.CoreUtility.12 (>= 12.0.4 < 13.0)
  VSSDK.Editor (>= 12.0.4 < 13.0)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
  VSSDK.Text.12 (>= 12.0.4 < 13.0)
- VSSDK.GraphModel (12.0.4) - copy_local: false
+ VSSDK.GraphModel (12.0.4)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
- VSSDK.GraphModel.12 (12.0.4) - copy_local: false
+ VSSDK.GraphModel.12 (12.0.4)
  VSSDK.GraphModel (>= 12.0.4 < 13.0)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
  VSSDK.IDE (7.0.4) - copy_local: false
  VSSDK.IDE.10 (10.0.4) - copy_local: false
- VSSDK.IDE.11 (11.0.4) - copy_local: false
+ VSSDK.IDE.11 (11.0.4)
  VSSDK.IDE.12 (12.0.4) - copy_local: false
  VSSDK.IDE.8 (8.0.4) - copy_local: false
  VSSDK.IDE.9 (9.0.4) - copy_local: false
@@ -192,9 +192,9 @@ NUGET
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
  VSSDK.Language (>= 12.0.4 < 13.0)
  VSSDK.Text.12 (>= 12.0.4 < 13.0)
- VSSDK.OLE.Interop (7.0.4) - copy_local: false
+ VSSDK.OLE.Interop (7.0.4)
  VSSDK.IDE (>= 7.0.4 < 8.0)
- VSSDK.Shell.12 (12.0.4) - copy_local: false
+ VSSDK.Shell.12 (12.0.4)
  VSSDK.DTE (>= 7.0.4 < 8.0)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
  VSSDK.OLE.Interop (>= 7.0.4 < 8.0)
@@ -206,16 +206,16 @@ NUGET
  VSSDK.Shell.Interop.9 (>= 9.0.4 < 10.0)
  VSSDK.TextManager.Interop (>= 7.0.4 < 8.0)
  VSSDK.Threading.12 (>= 12.0.4 < 13.0)
- VSSDK.Shell.Immutable.10 (10.0.4) - copy_local: false
+ VSSDK.Shell.Immutable.10 (10.0.4)
  VSSDK.IDE.10 (>= 10.0.4 < 11.0)
- VSSDK.Shell.Immutable.11 (11.0.4) - copy_local: false
+ VSSDK.Shell.Immutable.11 (11.0.4)
  VSSDK.GraphModel (>= 11.0.4)
  VSSDK.IDE.11 (>= 11.0.4 < 12.0)
  VSSDK.OLE.Interop (>= 7.0.4 < 8.0)
  VSSDK.Shell.Interop (>= 7.0.4 < 8.0)
- VSSDK.Shell.Immutable.12 (12.0.4) - copy_local: false
+ VSSDK.Shell.Immutable.12 (12.0.4)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
- VSSDK.Shell.Interop (7.0.4) - copy_local: false
+ VSSDK.Shell.Interop (7.0.4)
  VSSDK.IDE (>= 7.0.4 < 8.0)
  VSSDK.OLE.Interop (>= 7.0.4 < 8.0)
  VSSDK.TextManager.Interop (>= 7.0.4 < 8.0)
@@ -239,35 +239,35 @@ NUGET
  VSSDK.Shell.Interop.11 (>= 11.0.4 < 12.0)
  VSSDK.Shell.Interop.8 (>= 8.0.4 < 9.0)
  VSSDK.Shell.Interop.9 (>= 9.0.4 < 10.0)
- VSSDK.Shell.Interop.8 (8.0.4) - copy_local: false
+ VSSDK.Shell.Interop.8 (8.0.4)
  VSSDK.IDE.8 (>= 8.0.4 < 9.0)
  VSSDK.OLE.Interop (>= 7.0.4 < 8.0)
  VSSDK.Shell.Interop (>= 7.0.4 < 8.0)
  VSSDK.TextManager.Interop (>= 7.0.4 < 8.0)
  VSSDK.TextManager.Interop.8 (>= 8.0.4 < 9.0)
- VSSDK.Shell.Interop.9 (9.0.4) - copy_local: false
+ VSSDK.Shell.Interop.9 (9.0.4)
  VSSDK.IDE.9 (>= 9.0.4 < 10.0)
  VSSDK.OLE.Interop (>= 7.0.4 < 8.0)
  VSSDK.Shell.Interop.8 (>= 8.0.4 < 9.0)
  VSSDK.TextManager.Interop (>= 7.0.4 < 8.0)
- VSSDK.Text (12.0.4) - copy_local: false
+ VSSDK.Text (12.0.4)
  VSSDK.CoreUtility (>= 12.0.4)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
- VSSDK.Text.12 (12.0.4) - copy_local: false
+ VSSDK.Text.12 (12.0.4)
  VSSDK.CoreUtility.12 (>= 12.0.4 < 13.0)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
  VSSDK.Text (>= 12.0.4 < 13.0)
- VSSDK.TextManager.Interop (7.0.4) - copy_local: false
+ VSSDK.TextManager.Interop (7.0.4)
  VSSDK.IDE (>= 7.0.4 < 8.0)
  VSSDK.OLE.Interop (>= 7.0.4 < 8.0)
- VSSDK.TextManager.Interop.8 (8.0.4) - copy_local: false
+ VSSDK.TextManager.Interop.8 (8.0.4)
  VSSDK.IDE.8 (>= 8.0.4 < 9.0)
  VSSDK.OLE.Interop (>= 7.0.4 < 8.0)
  VSSDK.Shell.Interop (>= 7.0.4 < 8.0)
  VSSDK.TextManager.Interop (>= 7.0.4 < 8.0)
- VSSDK.Threading (12.0.4) - copy_local: false
+ VSSDK.Threading (12.0.4)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
- VSSDK.Threading.12 (12.0.4) - copy_local: false
+ VSSDK.Threading.12 (12.0.4)
  VSSDK.IDE.12 (>= 12.0.4 < 13.0)
  VSSDK.Threading (>= 12.0.4 < 13.0)
 

diff --git a/src/Paket.VisualStudio/Paket.VisualStudio.csproj b/src/Paket.VisualStudio/Paket.VisualStudio.csproj
@@ -856,7 +856,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.CoreUtility">
  <HintPath>..\..\packages\VSSDK.CoreUtility\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -921,7 +921,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Editor">
  <HintPath>..\..\packages\VSSDK.Editor\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -932,7 +932,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.GraphModel">
  <HintPath>..\..\packages\VSSDK.GraphModel\lib\net45\Microsoft.VisualStudio.GraphModel.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -959,7 +959,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.OLE.Interop">
  <HintPath>..\..\packages\VSSDK.OLE.Interop\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -970,7 +970,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Shell.12.0">
  <HintPath>..\..\packages\VSSDK.Shell.12\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -981,7 +981,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0">
  <HintPath>..\..\packages\VSSDK.Shell.Immutable.10\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -992,7 +992,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0">
  <HintPath>..\..\packages\VSSDK.Shell.Immutable.11\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -1003,7 +1003,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0">
  <HintPath>..\..\packages\VSSDK.Shell.Immutable.12\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -1014,7 +1014,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Shell.Interop">
  <HintPath>..\..\packages\VSSDK.Shell.Interop\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -1058,7 +1058,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0">
  <HintPath>..\..\packages\VSSDK.Shell.Interop.8\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -1069,7 +1069,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0">
  <HintPath>..\..\packages\VSSDK.Shell.Interop.9\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -1080,22 +1080,22 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Text.Data">
  <HintPath>..\..\packages\VSSDK.Text\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  <Reference Include="Microsoft.VisualStudio.Text.Logic">
  <HintPath>..\..\packages\VSSDK.Text\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf">
  <HintPath>..\..\packages\VSSDK.Text\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  <Reference Include="Microsoft.VisualStudio.Text.UI">
  <HintPath>..\..\packages\VSSDK.Text\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -1106,7 +1106,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.TextManager.Interop">
  <HintPath>..\..\packages\VSSDK.TextManager.Interop\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -1117,7 +1117,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0">
  <HintPath>..\..\packages\VSSDK.TextManager.Interop.8\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>
@@ -1128,7 +1128,7 @@
  <ItemGroup>
  <Reference Include="Microsoft.VisualStudio.Threading">
  <HintPath>..\..\packages\VSSDK.Threading\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
  <Paket>True</Paket>
  </Reference>
  </ItemGroup>