Skip to content

Commit

Permalink
Only run GitLink in Windows builds due to bug[s] on travis-ci builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
jthelin committed Aug 9, 2017
1 parent a558ad1 commit 3cab343
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions ServerHost.xunit/ServerHost.xunit.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.props')" />
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.props') and '$(OS)' == 'Windows_NT' " />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -50,10 +50,10 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.props'))" />
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.targets'))" />
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.props') and '$(OS)' == 'Windows_NT' " Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.props'))" />
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.targets') and '$(OS)' == 'Windows_NT' " Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.targets'))" />
</Target>
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.targets" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.targets')" />
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.targets" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.targets') and '$(OS)' == 'Windows_NT' " />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
8 changes: 4 additions & 4 deletions ServerHost/ServerHost.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.props')" />
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.props') and '$(OS)' == 'Windows_NT' " />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -74,8 +74,8 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.props'))" />
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.targets'))" />
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.props') and '$(OS)' == 'Windows_NT' " Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.props'))" />
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.targets') and '$(OS)' == 'Windows_NT' " Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.targets'))" />
</Target>
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.targets" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.targets')" />
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.targets" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.targets') and '$(OS)' == 'Windows_NT' " />
</Project>

0 comments on commit 3cab343

Please sign in to comment.