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

Commit 8234954

Browse files
authored
Merge pull request #1726 from jcansdale/fixes/1725-build-2017-target-2015
Use VS2015 SDK tasks when StartProgram is VS2015
2 parents 0c5e175 + 12b0775 commit 8234954

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
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+
5+
<!-- When StartProgram is set to Visual Studio 2015 in .user file, install extension in the same version -->
6+
<Import Project="GitHub.VisualStudio.csproj.user" Condition=" Exists('GitHub.VisualStudio.csproj.user') " />
7+
<PropertyGroup Condition=" $(StartProgram.Contains('Microsoft Visual Studio 14.0')) ">
8+
<VisualStudioVersion>14.0</VisualStudioVersion>
9+
</PropertyGroup>
10+
411
<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')" />
512
<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>
@@ -27,7 +34,7 @@
2734
<RootNamespace>GitHub.VisualStudio</RootNamespace>
2835
<AssemblyName>GitHub.VisualStudio</AssemblyName>
2936
<StartAction>Program</StartAction>
30-
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
37+
<StartProgram Condition="' $(StartProgram)' == '' ">$(DevEnvDir)\devenv.exe</StartProgram>
3138
<StartArguments>/rootsuffix Exp</StartArguments>
3239
<LangVersion>6</LangVersion>
3340
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

0 commit comments

Comments
 (0)