Skip to content

Commit

Permalink
Fixed package versioning
Browse files Browse the repository at this point in the history
We need to tell Nerdbank.GitVersioning to use main instead of master
for calculations as well as defining PublicRelease=true when making
a public release.
  • Loading branch information
jstedfast committed Jun 3, 2024
1 parent 1b3c0d0 commit 4a39517
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions azure-pipelines/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ extends:
inputs:
vsVersion: $(BuildParameters.vsVersion)
solution: src\BehaviorsSdk.sln
msbuildArgs: /p:SignType=$(SignType) /p:NoWarn=1591 /p:DebugType=full /v:diagnostic
msbuildArgs: /p:PublicRelease=$(Build.OfficialRelease) /p:SignType=$(SignType) /p:NoWarn=1591 /p:DebugType=full /v:diagnostic
configuration: Release
maximumCpuCount: true
- task: VSTest@2
Expand All @@ -124,7 +124,7 @@ extends:
displayName: Build NuGet package
inputs:
solution: src\Microsoft.Xaml.Behaviors\Microsoft.Xaml.Behaviors.csproj
msbuildArgs: /t:Pack /p:SignType=$(SignType) /p:TimestampPackage=$(TimestampPackage) /p:NoWarn=1591 /p:DebugType=full /v:diagnostic
msbuildArgs: /t:Pack /p:PublicRelease=$(Build.OfficialRelease) /p:SignType=$(SignType) /p:TimestampPackage=$(TimestampPackage) /p:NoWarn=1591 /p:DebugType=full /v:diagnostic
configuration: Release
- task: CopyFiles@2
displayName: 'Copy Symbols to: $(Pipeline.Workspace)\Symbols'
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "1.1",
"publicReleaseRefSpec": [
"^refs/heads/master$", // we release out of master
"^refs/heads/main$", // we release out of main
"^refs/heads/rel/v\\d+\\.\\d+" // we also release branches starting with vN.N
],
"nugetPackageVersion":{
Expand Down

0 comments on commit 4a39517

Please sign in to comment.