Skip to content

Commit

Permalink
Don't run Microsoft.SourceLink.GitHub in Debug builds. (#53)
Browse files Browse the repository at this point in the history
Don't run Microsoft.SourceLink.GitHub in Debug builds.

Visual Studio for Mac cleaned up some project / package references.

Fixes bug #52 - `Build fails on MacOS with "Microsoft.Build.Tasks.Git.LocateRepository" task failed unexpectedly.`
  • Loading branch information
jthelin authored Oct 13, 2018
1 parent 94ee5ca commit 413799a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 51 deletions.
6 changes: 3 additions & 3 deletions ServerHost.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2006
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerHost", "ServerHost\ServerHost.csproj", "{98D61E3E-76A7-4664-BAF7-FBBF41A798D9}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerHost", "ServerHost\ServerHost.csproj", "{98D61E3E-76A7-4664-BAF7-FBBF41A798D9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A20AA77B-112B-4786-BDC1-7ADC8CE32C40}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.Net46", "Tests\Tests.Net46\Tests.Net46.csproj", "{DB6BD075-C56F-4335-83FD-DD4CEF140FED}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Net46", "Tests\Tests.Net46\Tests.Net46.csproj", "{DB6BD075-C56F-4335-83FD-DD4CEF140FED}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServer", "Tests\TestServer\TestServer.csproj", "{3C8985C0-B0EC-4EB6-8EA3-DCB7D770F3FC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "Tests\TestServer\TestServer.csproj", "{3C8985C0-B0EC-4EB6-8EA3-DCB7D770F3FC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{64DBC33D-89B0-4F25-8E6D-3A4FAA8F4AE0}"
ProjectSection(SolutionItems) = preProject
Expand Down
10 changes: 5 additions & 5 deletions ServerHost/ServerHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="log4net">
<Version>2.0.5</Version>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub">
<Version>1.0.0-beta-63127-02</Version>
<PackageReference Include="log4net" Version="2.0.5" />
</ItemGroup>

<ItemGroup Condition=" '$(Configuration)' == 'Release' ">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 1 addition & 3 deletions Tests/TestServer/TestServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="log4net">
<Version>2.0.5</Version>
</PackageReference>
<PackageReference Include="log4net" Version="2.0.5" />
</ItemGroup>
</Project>
53 changes: 13 additions & 40 deletions Tests/Tests.Net46/Tests.Net46.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,62 +10,35 @@

<ItemGroup>
<ProjectReference Include="..\..\ServerHost\ServerHost.csproj">
<Project>{98D61E3E-76A7-4664-BAF7-FBBF41A798D9}</Project>
<Name>ServerHost</Name>
</ProjectReference>
<ProjectReference Include="..\TestServer\TestServer.csproj">
<Project>{3c8985c0-b0ec-4eb6-8ea3-dcb7d770f3fc}</Project>
<Name>TestServer</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions">
<Version>5.4.2</Version>
</PackageReference>
<PackageReference Include="log4net">
<Version>2.0.5</Version>
</PackageReference>
<PackageReference Include="System.ValueTuple">
<Version>4.5.0</Version>
</PackageReference>
<PackageReference Include="Validation">
<Version>2.4.18</Version>
</PackageReference>
<PackageReference Include="xunit">
<Version>2.4.0</Version>
</PackageReference>
<PackageReference Include="xunit.abstractions">
<Version>2.0.3</Version>
</PackageReference>
<PackageReference Include="xunit.analyzers">
<Version>0.10.0</Version>
</PackageReference>
<PackageReference Include="xunit.core">
<Version>2.4.0</Version>
</PackageReference>
<PackageReference Include="xunit.runner.console">
<Version>2.4.0</Version>
<PackageReference Include="FluentAssertions" Version="5.4.2" />
<PackageReference Include="log4net" Version="2.0.5" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Validation" Version="2.4.18" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
<PackageReference Include="xunit.core" Version="2.4.0" />
<PackageReference Include="xunit.runner.console" Version="2.4.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.runner.msbuild">
<Version>2.4.0</Version>
<PackageReference Include="xunit.runner.msbuild" Version="2.4.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="xunit.runner.reporters">
<Version>2.4.0</Version>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio">
<Version>2.4.0</Version>
<PackageReference Include="xunit.runner.reporters" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Xunit.SkippableFact">
<Version>1.3.12</Version>
</PackageReference>
<PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
</ItemGroup>
</Project>

0 comments on commit 413799a

Please sign in to comment.