Skip to content

Commit 77a69c4

Browse files
committed
Update GitVersion dependency to 6.3.0
Requires a couple changes to GitVersion.yml since GitVersion 6 renamed some of the properties we use.
1 parent 49493f8 commit 77a69c4

File tree

13 files changed

+18
-17
lines changed

13 files changed

+18
-17
lines changed

GitVersion.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@ assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{env:GITVERSION_BUILD_
33
mode: ContinuousDeployment
44
branches:
55
master:
6-
tag: beta
6+
label: beta
77
regex: (origin/)?master
88
hotfix:
9-
tag: beta
9+
label: beta
1010
regex: (origin/)?hotfix[/-]
1111
increment: Patch
12-
prevent-increment-of-merged-branch-version: false
12+
prevent-increment:
13+
of-merged-branch: false
1314
track-merge-target: false
1415
tracks-release-branches: false
1516
is-release-branch: false
1617
pull-request:
1718
mode: ContinuousDeployment
18-
tag: PR
19+
label: PR
1920
feature:
2021
regex: feature[/-]
2122
mode: ContinuousDeployment
22-
tag: alpha
23+
label: alpha

src/Chorus.Tests/Chorus.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
12+
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
1414
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1515
<PackageReference Include="NUnit" Version="3.13.3" />

src/Chorus/Chorus.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
12+
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
1313
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1414
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
1515
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-*" />

src/ChorusHub/ChorusHub.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
14+
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
1515
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1616
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
1717
<PackageReference Include="SIL.BuildTasks" Version="3.0.0" PrivateAssets="All" />

src/ChorusHubApp/ChorusHubApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
12+
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
1313
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1414
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
1515
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-*" />

src/ChorusHubTests/ChorusHubTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
12+
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
1414
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1515
<PackageReference Include="NUnit" Version="3.13.3" />

src/ChorusMerge.Tests/ChorusMerge.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
13+
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
1515
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1616
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />

src/ChorusMerge/ChorusMerge.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
14+
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
1515
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1616
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
1717
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />

src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
10+
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
1111
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1212
<PackageReference Include="NUnit" Version="3.13.3" />
1313
<PackageReference Include="SIL.Core" Version="15.0.0-*" />

src/LibChorus/LibChorus.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Autofac" Version="4.9.4" />
13-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
13+
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
1414
<PackageReference Include="icu.net" Version="3.0.0-*" />
1515
<PackageReference Include="Icu4c.Win.Min" Version="59.1.7" IncludeAssets="build" />
1616
<PackageReference Include="L10NSharp" Version="8.0.0-beta0005" />

0 commit comments

Comments
 (0)