Skip to content

Update GitVersion dependency to 6.3.0 #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update GitVersion dependency to 6.3.0 #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77a69c4
Update GitVersion dependency to 6.3.0
rmunn Jul 14, 2025
751c49d
GitVersion 6 replaces NuGetVersion with SemVer
rmunn Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions GitVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions l10n/l10n.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks/>
<TargetFramework>netframework4.8</TargetFramework>
<PackageId>SIL.Chorus.l10ns</PackageId>
<Version>$(GitVersion_NuGetVersion)</Version>
<Version>$(GitVersion_SemVer)</Version>
<Authors>Jason Naylor</Authors>
<Company>SIL International</Company>
<RestartBuild Condition="'$(PkgGitVersion_GitVersion_MsBuild)' == ''
Expand All @@ -14,7 +14,7 @@
OR '$(PkgSIL_BuildTasks)' == ''">true</RestartBuild>
<RestartBuild Condition="'$(RestartBuild)' == ''">false</RestartBuild>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0" GeneratePathProperty="true">
<PrivateAssets>All</PrivateAssets>
Expand All @@ -24,19 +24,19 @@
<PackageReference Include="NuGet.CommandLine" Version="6.7.0" GeneratePathProperty="true" />
<PackageReference Include="SIL.BuildTasks" Version="2.6.0-beta0030" GeneratePathProperty="true" />
</ItemGroup>

<UsingTask TaskName="NormalizeLocales" AssemblyFile="$(PkgSIL_BuildTasks)\tools\SIL.BuildTasks.dll" />

<Target Name="UpdateCrowdin">
<Message Text="RestartBuild=$(RestartBuild)"/>
<CallTarget Targets="RestoreBuildDependencies"/>
<CallTarget Targets="UpdateCrowdinInternal" Condition="!$(RestartBuild)" />
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="UpdateCrowdinInternal" Properties="Configuration=$(Configuration)" Condition="$(RestartBuild)" />
</Target>

<Target Name="RestoreBuildDependencies" DependsOnTargets="restore">
</Target>

<Target Name="UpdateCrowdinInternal" DependsOnTargets="GetVersion">
<!-- Remove "not found" messages that are appended each run (Can't MatchWholeLine because leading spaces are trimmed from Lines).
These messages accumulate linearly and inifinitely at each ExtractXliff run and are not removed if the string is later found.
Expand All @@ -46,12 +46,12 @@
Lines=" &lt;note xml:lang=&quot;en&quot;&gt;Not found in static scan of compiled code (version 0.0.0)&lt;/note&gt;"/>
<!-- Build and extract strings -->
<Exec Command="dotnet build -c Release" WorkingDirectory=".."/>
<Exec Command="&quot;$(PkgL10NSharp_ExtractXliff)\tools\ExtractXliff.exe&quot; -n SIL -o Chorus.dll -b Chorus.en.xlf -x Chorus.en.xlf -p $(GitVersion_NuGetVersion) -m SIL.Localizer.GetString -m SIL.Localizer.Localize -g ../Output/Release/net462/SIL.*.dll" />
<Exec Command="&quot;$(PkgL10NSharp_ExtractXliff)\tools\ExtractXliff.exe&quot; -n SIL -o Chorus.dll -b Chorus.en.xlf -x Chorus.en.xlf -p $(GitVersion_SemVer) -m SIL.Localizer.GetString -m SIL.Localizer.Localize -g ../Output/Release/net462/SIL.*.dll" />
</Target>

<Target Name="PackageL10ns" DependsOnTargets="restore;GetVersion">
<!-- Expects `crowdin download -i CROWDIN_PROJECT_ID -T CROWDIN_ACCESS_TOKEN` to have been run first -->
<NormalizeLocales L10nsDirectory="." />
<Exec Command="&quot;$(PkgNuGet_CommandLine)\tools\NuGet.exe&quot; pack l10ns.nuspec -Version $(GitVersion_NuGetVersion)" />
<Exec Command="&quot;$(PkgNuGet_CommandLine)\tools\NuGet.exe&quot; pack l10ns.nuspec -Version $(GitVersion_SemVer)" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion src/Chorus.Tests/Chorus.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NUnit" Version="3.13.3" />
Expand Down
2 changes: 1 addition & 1 deletion src/Chorus/Chorus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-*" />
Expand Down
2 changes: 1 addition & 1 deletion src/ChorusHub/ChorusHub.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.BuildTasks" Version="3.0.0" PrivateAssets="All" />
Expand Down
2 changes: 1 addition & 1 deletion src/ChorusHubApp/ChorusHubApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-*" />
Expand Down
2 changes: 1 addition & 1 deletion src/ChorusHubTests/ChorusHubTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NUnit" Version="3.13.3" />
Expand Down
2 changes: 1 addition & 1 deletion src/ChorusMerge.Tests/ChorusMerge.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
Expand Down
2 changes: 1 addition & 1 deletion src/ChorusMerge/ChorusMerge.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/Installer/ChorusMergeModule.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>SIL.Chorus.ChorusMergeModule</PackageId>
<Version>$(GitVersion_NuGetVersion)</Version>
<Version>$(GitVersion_SemVer)</Version>
<Year>$([System.DateTime]::Now.ToString(yyyy))</Year>
</PropertyGroup>

<Target Name="pack" DependsOnTargets="CheckPrerequisites">
<Exec Command="$(NuGetCommand) pack ChorusMergeModule.nuspec -Version $(GitVersion_NuGetVersion) -p PackageId=$(PackageId);Year=$(Year)" />
<Exec Command="$(NuGetCommand) pack ChorusMergeModule.nuspec -Version $(GitVersion_SemVer) -p PackageId=$(PackageId);Year=$(Year)" />
<Copy SourceFiles="$(PackageId).$(Version).nupkg" DestinationFolder="$(MSBuildThisFileDirectory)../../output" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="SIL.Core" Version="15.0.0-*" />
Expand Down
2 changes: 1 addition & 1 deletion src/LibChorus/LibChorus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<ItemGroup>
<PackageReference Include="Autofac" Version="4.9.4" />
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="icu.net" Version="3.0.0-*" />
<PackageReference Include="Icu4c.Win.Min" Version="59.1.7" IncludeAssets="build" />
<PackageReference Include="L10NSharp" Version="8.0.0-beta0005" />
Expand Down
2 changes: 1 addition & 1 deletion src/LibChorusTests/LibChorus.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
Expand Down
2 changes: 1 addition & 1 deletion src/SampleApp/SampleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SharpZipLib" Version="1.3.3" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Tests-ChorusPlugin/Tests-ChorusPlugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="GitVersion.MsBuild" Version="6.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

Expand Down
Loading