Overhaul NuGet versions to include "main" or "develop" (#2636)

microsoft · Jun 16, 2022 · 017dea4 · 017dea4
1 parent bdde939
commit 017dea4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-CreateNugetPackage-Job.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-CreateNugetPackage-Job.yml
@@ -7,7 +7,6 @@ parameters:
 # The "primary" build arch is the one that the nuspec gets its winmd, pri, and other neutral files from
   primaryBuildArch: x86
   buildFlavor: Release
-  prereleaseVersionTag: 'prerelease'
   condition: ''
   buildPool: ''
 
@@ -100,7 +99,13 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
-        $packageVersion = '$(version).${{ parameters.prereleaseVersionTag }}'
+        $packageVersion = '$(version)'
+        $pipelineType = '$(PipelineType)'
+        $sourceBranchName = '$(Build.SourceBranchName)'
+        if ($sourceBranchName -eq 'main' -or $sourceBranchName -eq 'develop')
+        {
+          $packageVersion = $packageVersion + '.' + $sourceBranchName + '.' + $pipelineType
+        }
         Write-Host "##vso[task.setvariable variable=packageVersion;]$packageVersion"
         Write-Host "##vso[task.setvariable variable=packageVersion;isOutput=true;]$packageVersion"
         Write-Host $packageVersion

diff --git a/build/ProjectReunion-BuildFoundation.yml b/build/ProjectReunion-BuildFoundation.yml
@@ -474,7 +474,6 @@ jobs:
     dependsOn: SignBinariesAndPublishSymbols
     signConfigPattern: 'Microsoft.WindowsAppSDK*.nupkg'
     useReleaseTag: '$(WindowsAppSDKFinalRelease)'
-    prereleaseVersionTag: nightly
     buildPool: $(ProjectReunionBuildPool)
 
 # Build WinAppSDK and Run Integration Test from TestAll.ps1

diff --git a/build/WindowsAppSDK-CommonVariables.yml b/build/WindowsAppSDK-CommonVariables.yml
@@ -4,6 +4,6 @@ variables:
   versionDate: $[format('{0:yyyyMMdd}', pipeline.startTime)]
   versionCounter: $[counter(variables['versionDate'], 0)]
   version: >
-   $[format('{0}.{1}.{2}-{3}.{4}.{5}', 
-      variables['major'], variables['minor'], variables['patch'], variables['branch'],
+   $[format('{0}.{1}.{2}-{3}.{4}', 
+      variables['major'], variables['minor'], variables['patch'],
       variables['versionDate'], variables['versionCounter'])]
diff --git a/build/WindowsAppSDK-Versions.yml b/build/WindowsAppSDK-Versions.yml
@@ -3,4 +3,3 @@ variables:
   major: "1"
   minor: "1"
   patch: "0"
-  branch: 'main'