Skip to content

Commit

Permalink
Update GitVersionTask
Browse files Browse the repository at this point in the history
Use default GitVersionTask instead of our patched one. Version
5.0.1 in combination with the current Mono 6 seems to work.
  • Loading branch information
ermshiperete committed Aug 28, 2019
1 parent f933858 commit cc3c0d4
Show file tree
Hide file tree
Showing 40 changed files with 44 additions and 40 deletions.
2 changes: 1 addition & 1 deletion AddSortKey/AddSortKey.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ExtractCopyright.Tests/ExtractCopyright.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
2 changes: 1 addition & 1 deletion ExtractCopyright/ExtractCopyright.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SIL.Archiving.Tests/SIL.Archiving.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="DotNetZip" Version="1.13.3" />
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Archiving/SIL.Archiving.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<ItemGroup>
<PackageReference Include="DotNetZip" Version="1.13.3" />
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="L10NSharp" Version="4.0.0" />
Expand Down
6 changes: 5 additions & 1 deletion SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NDesk.DBus" Version="0.15.0" />
Expand All @@ -30,4 +30,8 @@
<ProjectReference Include="..\SIL.TestUtilities\SIL.TestUtilities.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion SIL.Core.Desktop/SIL.Core.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NDesk.DBus" Version="0.15.0" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Core/SIL.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SIL.ReleaseTasks" Version="[2.2.0,)">
Expand Down
2 changes: 1 addition & 1 deletion SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="DotNetZip" Version="1.13.3" />
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.DblBundle/SIL.DblBundle.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SIL.ReleaseTasks" Version="[2.2.0,)">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.DictionaryServices/SIL.DictionaryServices.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SIL.ReleaseTasks" Version="[2.2.0,)">
Expand Down
2 changes: 1 addition & 1 deletion SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Lexicon/SIL.Lexicon.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SIL.ReleaseTasks" Version="[2.2.0,)">
Expand Down
2 changes: 1 addition & 1 deletion SIL.Lift.Tests/SIL.Lift.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Moq" Version="4.0.10827" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Lift/SIL.Lift.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="RelaxNG" Version="3.2.3" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Linux.Logging/SIL.Linux.Logging.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Mono.Posix" Version="5.4.0.201" Condition="'$(OS)' == 'Windows_NT'" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Media.Tests/SIL.Media.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NAudio" Version="1.8.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Media/SIL.Media.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NAudio" Version="1.8.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.NUnit3Compatibility/SIL.NUnit3Compatibility.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Scripture.Tests/SIL.Scripture.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Scripture/SIL.Scripture.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SIL.ReleaseTasks" Version="[2.2.0,)">
Expand Down
2 changes: 1 addition & 1 deletion SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.TestUtilities/SIL.TestUtilities.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Mono.Posix" Version="5.4.0.201" Condition="'$(OS)' == 'Windows_NT'" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="L10NSharp" Version="4.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SIL.ReleaseTasks" Version="[2.2.0,)">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="ibusdotnet" Version="2.0.0.20771" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit" Version="2.6.4" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SIL.ReleaseTasks" Version="[2.2.0,)">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="ibusdotnet" Version="2.0.0.20771" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="L10NSharp" Version="4.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.Windows.Forms/SIL.Windows.Forms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ItemGroup>
<PackageReference Include="DialogAdapters" Version="0.1.3.26068" />
<PackageReference Include="Enchant.Net" Version="1.4.2" />
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="L10NSharp" Version="4.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="NDesk.DBus" Version="0.15.0" />
<PackageReference Include="NUnit" Version="2.6.4" />
<PackageReference Include="Spart" Version="1.0.0" />
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SIL.ReleaseTasks" Version="[2.2.0,)">
Expand Down
2 changes: 1 addition & 1 deletion SIL.WritingSystems/SIL.WritingSystems.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SIL.ReleaseTasks" Version="[2.2.0,)">
Expand Down
2 changes: 1 addition & 1 deletion TestApps/FastSplitterTest/FastSplitterTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion TestApps/ReportingTest/Reporting.TestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion TestApps/SIL.Email.TestApp/SIL.Email.TestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Icu4c.Win.Min" Version="56.1.82" />
Expand Down
2 changes: 1 addition & 1 deletion TestApps/TestAppKeyboard/TestAppKeyboard.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask.alt" Version="4.0.2-alpha-0006">
<PackageReference Include="GitVersionTask" Version="5.0.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NDesk.DBus" Version="0.15.0" />
Expand Down

0 comments on commit cc3c0d4

Please sign in to comment.