Skip to content

Commit 495889d

Browse files
jeromelabanjeromelaban
committed
ci: Move to nbgv
1 parent f20a9d4 commit 495889d

File tree

8 files changed

+61
-115
lines changed

8 files changed

+61
-115
lines changed

‎.github/workflows/azure-static-webapp.yml

+7-13
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,20 @@ jobs:
2828
fetch-depth: 0 # Required for gitversion
2929
submodules: true
3030

31-
- name: Install GitVersion
32-
uses: gittools/actions/gitversion/[email protected]
33-
with:
34-
versionSpec: '5.x'
35-
36-
- name: Determine Version
37-
id: gitversion
38-
uses: gittools/actions/gitversion/[email protected]
39-
with:
40-
useConfigFile: true
41-
configFilePath: gitversion.yml
42-
4331
- name: Setup dotnet
4432
uses: actions/[email protected]
4533
with:
4634
dotnet-version: '8.0.301'
4735

36+
- uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
37+
id: nbgv
38+
with:
39+
toolVersion: 3.6.139
40+
setAllVars: true
41+
4842
- run: |
4943
cd samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm
50-
dotnet build -c Release "/p:PackageVersion=${{ steps.gitversion.outputs.fullSemVer }}" /p:DisableMobileTargets=true
44+
dotnet build -c Release "/p:PackageVersion=${{ steps.nbgv.outputs.SemVer2 }}" /p:DisableMobileTargets=true
5145
- uses: actions/upload-artifact@v4
5246
with:
5347
name: wasm-site

‎build/workflow/build.csproj

+13-17
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,27 @@
22
<PropertyGroup>
33
<AppName Condition="$(AppName) == ''">Uno.Toolkit.WinUI.Samples</AppName>
44
</PropertyGroup>
5-
<Target Name="BuildVersion" Condition="'$(GITVERSION_InformationalVersion)'!=''">
5+
<Target Name="BuildVersion" Condition="'$(NBGV_InformationalVersion)'!=''">
66
<Message Text="%0A#### Running BuildVersion" Importance="$(_MessageImportance)" />
77

8-
<Exec Command="git rev-list --count HEAD" Condition="'$(_BuildNumber)' == ''" ConsoleToMSBuild="true">
9-
<Output TaskParameter="ConsoleOutput" PropertyName="_BuildNumber" />
10-
</Exec>
11-
128
<PropertyGroup>
13-
<_VersionCode>$(_BuildNumber)</_VersionCode>
14-
<_BuildNumber Condition="$(BuildNumberOffset) != ''">$([MSBuild]::Add($(_BuildNumber), $(BuildNumberOffset)))</_BuildNumber>
15-
<_VersionCode Condition="$(VersionCodeOffset) != ''">$([MSBuild]::Add($(_BuildNumber), $(VersionCodeOffset)))</_VersionCode>
9+
<_VersionCode>$(NBGV_BuildNumber)</_VersionCode>
10+
<NBGV_BuildNumber Condition="$(BuildNumberOffset) != ''">$([MSBuild]::Add($(NBGV_BuildNumber), $(BuildNumberOffset)))</NBGV_BuildNumber>
11+
<_VersionCode Condition="$(VersionCodeOffset) != ''">$([MSBuild]::Add($(NBGV_BuildNumber), $(VersionCodeOffset)))</_VersionCode>
1612
<_VersionCode Condition="$(VersionCodeOffset) != ''">$([MSBuild]::Add($(_VersionCode), $([System.DateTime]::Now.ToString(`yyMMddHHmm`))))</_VersionCode>
1713
<_VersionCode Condition="$(VersionCodeOffset) != ''">$([MSBuild]::Subtract($(_VersionCode), '2200000000'))</_VersionCode>
18-
<_AppleBuildNumber Condition="$(_AppleBuildNumber) == ''">$([System.DateTime]::Now.ToString(`yyMMddHHmm`)).$(_BuildNumber)</_AppleBuildNumber>
14+
<_AppleBuildNumber Condition="$(_AppleBuildNumber) == ''">$([System.DateTime]::Now.ToString(`yyMMddHHmm`)).$(NBGV_BuildNumber)</_AppleBuildNumber>
1915
<_InformationalVersion>$(PackageInformationalVersion)</_InformationalVersion>
20-
<_InformationalVersion Condition="'$(_InformationalVersion)' == ''">$(GITVERSION_InformationalVersion)</_InformationalVersion>
16+
<_InformationalVersion Condition="'$(_InformationalVersion)' == ''">$(NBGV_InformationalVersion)</_InformationalVersion>
2117
<_AppVersion>$(_AppVersion)</_AppVersion>
22-
<_AppVersion Condition="'$(_AppVersion)'==''">$(GitVersion_MajorMinorPatch)</_AppVersion>
18+
<_AppVersion Condition="'$(_AppVersion)'==''">$(NBGV_SimpleVersion)</_AppVersion>
2319
</PropertyGroup>
2420

25-
<Error Condition="'$(_InformationalVersion)'=='' Or '$(_AppVersion)'==''" Text="Failed to calculate version. You must either run GitVersion before building the application or set both AppVersion and InformationalVersion variables."/>
21+
<Error Condition="'$(_InformationalVersion)'=='' Or '$(_AppVersion)'==''" Text="Failed to calculate version. You must either run NBGV before building the application or set both AppVersion and InformationalVersion variables."/>
2622

2723
<!-- App version without revision -->
2824
<PropertyGroup Condition="'$(IncludeBuildInVersion)' == 'True'">
29-
<_AppVersion>$(GitVersion_Major).$(GitVersion_Minor).$(_BuildNumber)</_AppVersion>
25+
<_AppVersion>$(NBGV_VersionMajor).$(NBGV_VersionMinor).$(NBGV_BuildNumber)</_AppVersion>
3026
</PropertyGroup>
3127

3228
<!-- Pad the version in case it's too short -->
@@ -36,7 +32,7 @@
3632
</PropertyGroup>
3733

3834
<Message Text="App version : $(_AppVersion)" Importance="$(_MessageImportance)" />
39-
<Message Text="Build number : $(_BuildNumber)" Importance="$(_MessageImportance)" />
35+
<Message Text="Build number : $(NBGV_BuildNumber)" Importance="$(_MessageImportance)" />
4036
<Message Text="Informational version : $(_InformationalVersion)" Importance="$(_MessageImportance)" />
4137

4238
<Message Text="#### Done running BuildVersion" Importance="$(_MessageImportance)" />
@@ -63,7 +59,7 @@
6359
</PropertyGroup>
6460

6561
<Message Text="Updating Package versions" />
66-
<Message Text="_AppVersion: $(_AppVersion) _BuildNumber: $(_BuildNumber) _AppleBuildNumber: $(_AppleBuildNumber) _VersionCode: $(_VersionCode)" Importance="high" />
62+
<Message Text="_AppVersion: $(_AppVersion) NBGV_BuildNumber: $(NBGV_BuildNumber) _AppleBuildNumber: $(_AppleBuildNumber) _VersionCode: $(_VersionCode)" Importance="high" />
6763

6864
<!-- Android -->
6965
<XmlPoke Condition="Exists('$(_ManifestPath)')" XmlInputPath="$(_ManifestPath)" Query="/manifest/@android:versionName" Value="$(_AppVersion)" Namespaces="$(_AndroidNamespace)" />
@@ -109,7 +105,7 @@
109105
<!-- Forcing the inclusion of the build number in UWP as the standard format is Major.Minor.Build.Revision -->
110106
<!-- Not doing this makes it impossible to update a package unless the version is updated -->
111107
<PropertyGroup>
112-
<_UWPVersion>@(_Major).@(_Minor).$(_BuildNumber).@(_Revision)</_UWPVersion>
108+
<_UWPVersion>@(_Major).@(_Minor).$(NBGV_BuildNumber).@(_Revision)</_UWPVersion>
113109
</PropertyGroup>
114110

115111
<XmlPoke Condition="Exists('$(_AppxManifestPath)')" XmlInputPath="$(_AppxManifestPath)" Query="/x:Package/x:Identity/@Version" Value="$(_UWPVersion)" Namespaces="$(_WindowsNamespace)" />
@@ -157,4 +153,4 @@
157153
</Code>
158154
</Task>
159155
</UsingTask>
160-
</Project>
156+
</Project>

‎build/workflow/stage-build-android.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ jobs:
4040
- script: |
4141
cd $(build.sourcesdirectory)/samples/$(ProjectName)/$(ProjectName).Mobile
4242
echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
43-
dotnet publish -f net8.0-android -c Release /t:SignAndroidPackage "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:AndroidSigningKeyStore=$(keyStore.secureFilePath) /p:AndroidSigningStorePass=$(AndroidSigningStorePass) /p:AndroidSigningKeyPass=$(AndroidSigningKeyPass) /p:AndroidSigningKeyAlias=$(AndroidSigningKeyAlias) /p:AndroidKeyStore=true /bl:$(build.artifactstagingdirectory)/build-$(ArtifactName).binlog
43+
dotnet publish -f net8.0-android -c Release /t:SignAndroidPackage "/p:InformationalVersion=%NBGV_InformationalVersion%" /p:AndroidSigningKeyStore=$(keyStore.secureFilePath) /p:AndroidSigningStorePass=$(AndroidSigningStorePass) /p:AndroidSigningKeyPass=$(AndroidSigningKeyPass) /p:AndroidSigningKeyAlias=$(AndroidSigningKeyAlias) /p:AndroidKeyStore=true /bl:$(build.artifactstagingdirectory)/build-$(ArtifactName).binlog
4444
displayName: Build project for Release - (net8.0-android)
4545
condition: eq(variables['System.PullRequest.IsFork'],'False')
4646
4747
- script: |
4848
cd $(build.sourcesdirectory)/samples/$(ProjectName)/$(ProjectName).Mobile
4949
echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
50-
dotnet build -f net8.0-android -c Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /p:AndroidKeyStore=false /bl:$(build.artifactstagingdirectory)/build-$(ArtifactName).binlog
50+
dotnet build -f net8.0-android -c Release "/p:InformationalVersion=%NBGV_InformationalVersion%" /p:AndroidKeyStore=false /bl:$(build.artifactstagingdirectory)/build-$(ArtifactName).binlog
5151
displayName: Build project for Release - (net8.0-android)
5252
condition: eq(variables['System.PullRequest.IsFork'],'True')
5353

‎build/workflow/stage-build-ios.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ jobs:
7070
- bash: |
7171
cd $(build.sourcesdirectory)/samples/$(ProjectName)/$(ProjectName).Mobile
7272
echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
73-
dotnet publish -f net8.0-ios -c Release /p:ArchiveOnBuild=true "/p:InformationalVersion=%GITVERSION_InformationalVersion%" "/bl:$(build.artifactstagingdirectory)/toolkit-build-$(ArtifactName).binlog"
73+
dotnet publish -f net8.0-ios -c Release /p:ArchiveOnBuild=true "/p:InformationalVersion=%NBGV_InformationalVersion%" "/bl:$(build.artifactstagingdirectory)/toolkit-build-$(ArtifactName).binlog"
7474
displayName: Build project for Release - (net8.0-ios)
7575
condition: eq(variables['System.PullRequest.IsFork'],'False')
7676
7777
- bash: |
7878
cd $(build.sourcesdirectory)/samples/$(ProjectName)/$(ProjectName).Mobile
7979
echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
80-
dotnet build -f net8.0-ios -c Release "/p:InformationalVersion=%GITVERSION_InformationalVersion%" "/bl:$(build.artifactstagingdirectory)/toolkit-build-$(ArtifactName).binlog"
80+
dotnet build -f net8.0-ios -c Release "/p:InformationalVersion=%NBGV_InformationalVersion%" "/bl:$(build.artifactstagingdirectory)/toolkit-build-$(ArtifactName).binlog"
8181
displayName: Build project for Release - (net8.0-ios)
8282
condition: eq(variables['System.PullRequest.IsFork'],'True')
8383
@@ -153,4 +153,4 @@ jobs:
153153
retryCountOnTaskFailure: 3
154154
condition: always()
155155
inputs:
156-
ArtifactName: $(ArtifactName)
156+
ArtifactName: $(ArtifactName)

‎build/workflow/stage-build-packages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
msbuildLocationMethod: version
1717
msbuildVersion: latest
1818
maximumCpuCount: true
19-
msbuildArguments: /m /v:m /r /p:GeneratePackageOnBuild=true /p:UseDotNetNativeToolchain=false /p:AotAssemblies=false "/p:PackageVersion=$(GitVersion.FullSemVer)" "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /detailedsummary /bl:$(build.artifactstagingdirectory)/toolkit-build-packages.binlog
19+
msbuildArguments: /m /v:m /r /p:GeneratePackageOnBuild=true /p:UseDotNetNativeToolchain=false /p:AotAssemblies=false "/p:PackageVersion=$(NBGV_SemVer2)" "/p:InformationalVersion=$(NBGV_InformationalVersion)" /detailedsummary /bl:$(build.artifactstagingdirectory)/toolkit-build-packages.binlog
2020

2121
- task: PowerShell@2
2222
displayName: Authenticode Sign Packages

‎build/workflow/templates/gitversion.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
steps:
2-
- task: gitversion/setup@0
3-
inputs:
4-
versionSpec: '5.10.3'
2+
- pwsh: |
3+
dotnet tool uninstall nbgv -g
4+
dotnet tool install nbgv -g --version 3.6.139
5+
nbgv cloud -a
6+
displayName: Version with NBGV
7+
name: NBGV
58

6-
- task: gitversion/execute@0
7-
inputs:
8-
updateAssemblyInfo: 'False'
9-
useConfigFile: true
10-
configFilePath: gitversion.yml
11-
displayName: Use GitVersion
9+
- pwsh: |
10+
$InformationalVersion="$(NBGV_SemVer2)+$(NBGV_BuildingRef)".Replace("refs/heads/","").Replace("/","-")
11+
echo "##vso[task.setvariable variable=NBGV_InformationalVersion;]$InformationalVersion"
12+
echo "##vso[task.setvariable variable=NBGV_InformationalVersion;isOutput=true;]$InformationalVersion"
13+
echo "Informational Version: $InformationalVersion"
14+
displayName: Generate Informational Version
15+
name: NBGV_InformationalVersion

‎gitversion.yml

-70
This file was deleted.

‎version.json

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3+
"version": "6.5-dev.{height}",
4+
"versionHeightOffset": 86,
5+
"nuGetPackageVersion": {
6+
"semVer": 2.0
7+
},
8+
"publicReleaseRefSpec": [
9+
"^refs/heads/main$",
10+
"^refs/heads/release/stable/\\d+(?:\\.\\d+)?$"
11+
],
12+
"cloudBuild": {
13+
"setAllVariables": true,
14+
"buildNumber": {
15+
"enabled": true
16+
}
17+
},
18+
"release": {
19+
"branchName": "release/stable/{version}",
20+
"firstUnstableTag": "dev"
21+
}
22+
}

0 commit comments

Comments
 (0)