Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 4701f8e

Browse files
committed
Install in version of VS targeted by StartProgram
Automatically detect Visual Studio 2015 and set VisualStudioVersion property to 14.0.
1 parent 8526d40 commit 4701f8e

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
33
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" />
4-
<Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="$(StartProgram.Contains('Microsoft Visual Studio 14.0')) And Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
5-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="!($(StartProgram.Contains('Microsoft Visual Studio 14.0'))) And Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
4+
5+
<!-- When StartProgram is set to Visual Studio 2015, install extension in this version -->
6+
<Import Project="GitHub.VisualStudio.csproj.user" />
7+
<PropertyGroup Condition=" $(StartProgram.Contains('Microsoft Visual Studio 14.0')) ">
8+
<VisualStudioVersion>14.0</VisualStudioVersion>
9+
</PropertyGroup>
10+
11+
<Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="'$(VisualStudioVersion)' == '14.0' And Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
12+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="'$(VisualStudioVersion)' == '15.0' And Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
613
<PropertyGroup>
714
<!-- This is added to prevent forced migrations in Visual Studio 2012 and newer -->
815
<MinimumVisualStudioVersion>$(MSBuildToolsVersion)</MinimumVisualStudioVersion>
@@ -27,7 +34,7 @@
2734
<RootNamespace>GitHub.VisualStudio</RootNamespace>
2835
<AssemblyName>GitHub.VisualStudio</AssemblyName>
2936
<StartAction>Program</StartAction>
30-
<StartProgram Condition=" '$(StartProgram)' == '' ">$(DevEnvDir)\devenv.exe</StartProgram>
37+
<StartProgram Condition="' $(StartProgram)' == '' ">$(DevEnvDir)\devenv.exe</StartProgram>
3138
<StartArguments>/rootsuffix Exp</StartArguments>
3239
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
3340
<ZipPackageCompressionLevel>Normal</ZipPackageCompressionLevel>
@@ -800,6 +807,6 @@
800807
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props'))" />
801808
</Target>
802809
<Import Project="..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets" Condition="Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" />
803-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="!($(StartProgram.Contains('Microsoft Visual Studio 14.0'))) And Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
804-
<Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="$(StartProgram.Contains('Microsoft Visual Studio 14.0')) And Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
810+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="'$(VisualStudioVersion)' == '15.0' And Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
811+
<Import Project="..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="'$(VisualStudioVersion)' == '14.0' And Exists('..\..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.215\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
805812
</Project>

0 commit comments

Comments
 (0)