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

Commit 0249605

Browse files
authored
Merge pull request #680 from github/make-deploy-work
Make CI builds works
2 parents a98c74a + 7d5c025 commit 0249605

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

script

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
3+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25901-RC\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25901-RC\build\Microsoft.VSSDK.BuildTools.props')" />
34
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" />
45
<PropertyGroup>
56
<MinimumVisualStudioVersion>$(MSBuildToolsVersion)</MinimumVisualStudioVersion>
@@ -721,9 +722,12 @@
721722
<Error Condition="!Exists('..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\build\net45\SQLitePCL.raw_basic.targets'))" />
722723
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props'))" />
723724
<Error Condition="!Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
725+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25901-RC\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25901-RC\build\Microsoft.VSSDK.BuildTools.props'))" />
726+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25901-RC\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25901-RC\build\Microsoft.VSSDK.BuildTools.targets'))" />
724727
</Target>
725728
<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')" />
726729
<Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
730+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25901-RC\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.0.25901-RC\build\Microsoft.VSSDK.BuildTools.targets')" />
727731
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
728732
Other similar extension points exist, see Microsoft.Common.targets.
729733
<Target Name="BeforeBuild">

src/GitHub.VisualStudio/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<package id="Microsoft.VisualStudio.Threading" version="14.1.131" targetFramework="net461" />
2828
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net461" />
2929
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net461" />
30+
<package id="Microsoft.VSSDK.BuildTools" version="15.0.25901-RC" targetFramework="net461" developmentDependency="true" />
3031
<package id="Microsoft.VSSDK.Vsixsigntool" version="14.1.24720" targetFramework="net45" />
3132
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
3233
<package id="NLog" version="3.1.0" targetFramework="net45" />

src/common/t4.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(SolutionDir)\lib\Microsoft.TextTemplating.targets" />
44
<PropertyGroup>
5-
<TransformOnBuild Condition="'$(VisualStudioVersion)'!='15.0'">true</TransformOnBuild>
5+
<TransformOnBuild>false</TransformOnBuild>
66
<TransformOutOfDateOnly>true</TransformOutOfDateOnly>
77
<PackageDir>$(SolutionDir)\packages</PackageDir>
88
</PropertyGroup>

0 commit comments

Comments
 (0)