From 77a69c46b99950765310b6f829a6d6ee1ca55832 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Mon, 14 Jul 2025 13:20:54 +0700 Subject: [PATCH 1/2] Update GitVersion dependency to 6.3.0 Requires a couple changes to GitVersion.yml since GitVersion 6 renamed some of the properties we use. --- GitVersion.yml | 11 ++++++----- src/Chorus.Tests/Chorus.Tests.csproj | 2 +- src/Chorus/Chorus.csproj | 2 +- src/ChorusHub/ChorusHub.csproj | 2 +- src/ChorusHubApp/ChorusHubApp.csproj | 2 +- src/ChorusHubTests/ChorusHubTests.csproj | 2 +- src/ChorusMerge.Tests/ChorusMerge.Tests.csproj | 2 +- src/ChorusMerge/ChorusMerge.csproj | 2 +- .../LibChorus.TestUtilities.csproj | 2 +- src/LibChorus/LibChorus.csproj | 2 +- src/LibChorusTests/LibChorus.Tests.csproj | 2 +- src/SampleApp/SampleApp.csproj | 2 +- src/Tests-ChorusPlugin/Tests-ChorusPlugin.csproj | 2 +- 13 files changed, 18 insertions(+), 17 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index a92fe8405..4c3fcfd48 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -3,20 +3,21 @@ assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{env:GITVERSION_BUILD_ mode: ContinuousDeployment branches: master: - tag: beta + label: beta regex: (origin/)?master hotfix: - tag: beta + label: beta regex: (origin/)?hotfix[/-] increment: Patch - prevent-increment-of-merged-branch-version: false + prevent-increment: + of-merged-branch: false track-merge-target: false tracks-release-branches: false is-release-branch: false pull-request: mode: ContinuousDeployment - tag: PR + label: PR feature: regex: feature[/-] mode: ContinuousDeployment - tag: alpha + label: alpha diff --git a/src/Chorus.Tests/Chorus.Tests.csproj b/src/Chorus.Tests/Chorus.Tests.csproj index eb7391b34..ed7666cfb 100644 --- a/src/Chorus.Tests/Chorus.Tests.csproj +++ b/src/Chorus.Tests/Chorus.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Chorus/Chorus.csproj b/src/Chorus/Chorus.csproj index 9109fbf87..aef8f8cc2 100644 --- a/src/Chorus/Chorus.csproj +++ b/src/Chorus/Chorus.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/ChorusHub/ChorusHub.csproj b/src/ChorusHub/ChorusHub.csproj index bad50e55e..ee965cb67 100644 --- a/src/ChorusHub/ChorusHub.csproj +++ b/src/ChorusHub/ChorusHub.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/ChorusHubApp/ChorusHubApp.csproj b/src/ChorusHubApp/ChorusHubApp.csproj index 4b36fba56..d51b2bf49 100644 --- a/src/ChorusHubApp/ChorusHubApp.csproj +++ b/src/ChorusHubApp/ChorusHubApp.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/ChorusHubTests/ChorusHubTests.csproj b/src/ChorusHubTests/ChorusHubTests.csproj index 657938e56..c541e59aa 100644 --- a/src/ChorusHubTests/ChorusHubTests.csproj +++ b/src/ChorusHubTests/ChorusHubTests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj b/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj index 6fcfc68c2..dadb8b34a 100644 --- a/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj +++ b/src/ChorusMerge.Tests/ChorusMerge.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/ChorusMerge/ChorusMerge.csproj b/src/ChorusMerge/ChorusMerge.csproj index 4348af3e0..997a43a14 100644 --- a/src/ChorusMerge/ChorusMerge.csproj +++ b/src/ChorusMerge/ChorusMerge.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj b/src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj index a74d65687..53affccaa 100644 --- a/src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj +++ b/src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/LibChorus/LibChorus.csproj b/src/LibChorus/LibChorus.csproj index 70f2c2326..f37fdb1b7 100644 --- a/src/LibChorus/LibChorus.csproj +++ b/src/LibChorus/LibChorus.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/LibChorusTests/LibChorus.Tests.csproj b/src/LibChorusTests/LibChorus.Tests.csproj index daac3380b..6946e1499 100644 --- a/src/LibChorusTests/LibChorus.Tests.csproj +++ b/src/LibChorusTests/LibChorus.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/SampleApp/SampleApp.csproj b/src/SampleApp/SampleApp.csproj index 5d7b018d6..99b3d1371 100644 --- a/src/SampleApp/SampleApp.csproj +++ b/src/SampleApp/SampleApp.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Tests-ChorusPlugin/Tests-ChorusPlugin.csproj b/src/Tests-ChorusPlugin/Tests-ChorusPlugin.csproj index 2d6289bbe..fdd447710 100644 --- a/src/Tests-ChorusPlugin/Tests-ChorusPlugin.csproj +++ b/src/Tests-ChorusPlugin/Tests-ChorusPlugin.csproj @@ -9,7 +9,7 @@ - + From 751c49d971d3f7da079cc1bd0becbbcf33526978 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Tue, 22 Jul 2025 14:05:16 +0700 Subject: [PATCH 2/2] GitVersion 6 replaces NuGetVersion with SemVer NuGetVersion variable produces suffixes like -beta0017, whereas SemVer variable produces suffixes like -beta.17 which comply with SemVer 2.0. SemVer 2.0 support was added in NuGet 4.3.0, which is quite ancient at this point, so we no longer need to use the NuGetVersion variable to support older tooling; all NuGet tools can handle SemVer 2.0 by now. --- l10n/l10n.proj | 18 +++++++++--------- src/Installer/ChorusMergeModule.wixproj | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/l10n/l10n.proj b/l10n/l10n.proj index 5b6e5f76d..efb17c8b9 100644 --- a/l10n/l10n.proj +++ b/l10n/l10n.proj @@ -4,7 +4,7 @@ netframework4.8 SIL.Chorus.l10ns - $(GitVersion_NuGetVersion) + $(GitVersion_SemVer) Jason Naylor SIL International true false - + All @@ -24,19 +24,19 @@ - + - + - + - + - + - + - + diff --git a/src/Installer/ChorusMergeModule.wixproj b/src/Installer/ChorusMergeModule.wixproj index 63a9e0e66..3ff84b41a 100644 --- a/src/Installer/ChorusMergeModule.wixproj +++ b/src/Installer/ChorusMergeModule.wixproj @@ -39,12 +39,12 @@ netstandard2.0 SIL.Chorus.ChorusMergeModule - $(GitVersion_NuGetVersion) + $(GitVersion_SemVer) $([System.DateTime]::Now.ToString(yyyy)) - + \ No newline at end of file