Skip to content
This repository has been archived by the owner on Apr 2, 2020. It is now read-only.

Commit

Permalink
Prefer msbuild on Linux and macOS if available (Protobuild#242)
Browse files Browse the repository at this point in the history
* Prefer msbuild on Linux and macOS if available

Microsoft is deprecating xbuild in Mono in favour of MSBuild.  Since Mono 5, using xbuild emits a deprecation warning.  This updates Protobuild to use msbuild on Linux and macOS platforms if available, so that Protobuild will continue working when xbuild is eventually removed.

This commit also removes functional tests relating to the Protobuild package protocol, which has been deprecated for months in favour of NuGet.

* Remove unit test dependent on protobuild.org

* Disable resolution during ModuleInfoGetsUpgradedTest
  • Loading branch information
hach-que authored May 12, 2017
1 parent b17a9c9 commit be4706f
Show file tree
Hide file tree
Showing 30 changed files with 28 additions and 402 deletions.
24 changes: 0 additions & 24 deletions Build/Projects/Protobuild.FunctionalTests.definition
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,6 @@
<Compile Include="PackageNuGetHTTPResolvesSecondTimeTest.cs" />
<Compile Include="PackageNuGetHTTPSResolvesNewTest.cs" />
<Compile Include="PackageNuGetHTTPSResolvesSecondTimeTest.cs" />
<Compile Include="PackageProtobuildHTTPResolvesNewForSourceAndBinaryTest.cs" />
<Compile Include="PackageProtobuildHTTPResolvesNewForSourceOnlyTest.cs" />
<Compile Include="PackageProtobuildHTTPResolvesSecondTimeForSourceAndBinaryTest.cs" />
<Compile Include="PackageProtobuildHTTPResolvesSecondTimeForSourceOnlyTest.cs" />
<Compile Include="PackageProtobuildHTTPSResolvesNewForSourceAndBinaryTest.cs" />
<Compile Include="PackageProtobuildHTTPSResolvesNewForSourceOnlyTest.cs" />
<Compile Include="PackageProtobuildHTTPSResolvesSecondTimeForSourceAndBinaryTest.cs" />
<Compile Include="PackageProtobuildHTTPSResolvesSecondTimeForSourceOnlyTest.cs" />
<Compile Include="PackageProtobuildLocalResolvesNewForBinaryOnlyTest.cs" />
<Compile Include="PackageProtobuildLocalResolvesSecondTimeForBinaryOnlyTest.cs" />
<Compile Include="PackageRedirectionToLocalPathTest.cs" />
Expand Down Expand Up @@ -515,22 +507,6 @@
<SubType>Designer</SubType>
</None>
<None Include="TestData\PackageNuGetHTTPSResolvesSecondTime\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildHTTPResolvesNewForSourceAndBinary\Build\Module.xml" />
<None Include="TestData\PackageProtobuildHTTPResolvesNewForSourceAndBinary\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildHTTPResolvesNewForSourceOnly\Build\Module.xml" />
<None Include="TestData\PackageProtobuildHTTPResolvesNewForSourceOnly\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildHTTPResolvesSecondTimeForSourceAndBinary\Build\Module.xml" />
<None Include="TestData\PackageProtobuildHTTPResolvesSecondTimeForSourceAndBinary\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildHTTPResolvesSecondTimeForSourceOnly\Build\Module.xml" />
<None Include="TestData\PackageProtobuildHTTPResolvesSecondTimeForSourceOnly\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildHTTPSResolvesNewForSourceAndBinary\Build\Module.xml" />
<None Include="TestData\PackageProtobuildHTTPSResolvesNewForSourceAndBinary\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildHTTPSResolvesNewForSourceOnly\Build\Module.xml" />
<None Include="TestData\PackageProtobuildHTTPSResolvesNewForSourceOnly\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildHTTPSResolvesSecondTimeForSourceAndBinary\Build\Module.xml" />
<None Include="TestData\PackageProtobuildHTTPSResolvesSecondTimeForSourceAndBinary\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildHTTPSResolvesSecondTimeForSourceOnly\Build\Module.xml" />
<None Include="TestData\PackageProtobuildHTTPSResolvesSecondTimeForSourceOnly\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildLocalResolvesNewForBinaryOnly\Build\Module.xml" />
<None Include="TestData\PackageProtobuildLocalResolvesNewForBinaryOnly\Build\Projects\empty.txt" />
<None Include="TestData\PackageProtobuildLocalResolvesSecondTimeForBinaryOnly\Build\Module.xml">
Expand Down
2 changes: 1 addition & 1 deletion Protobuild.FunctionalTests/ModuleInfoGetsUpgradedTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void GenerationIsCorrect()
GetPath(Path.Combine("Build", "ModuleUnconverted.xml")),
GetPath(Path.Combine("Build", "Module.xml")));

this.Generate("Windows");
this.Generate("Windows", "--no-resolve");

_assert.True(File.Exists(GetPath(Path.Combine("Build", "Module.xml"))));
_assert.Equal(@"<?xml version=""1.0"" encoding=""utf-8""?>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit be4706f

Please sign in to comment.