Merge pull request #65 from microsoft/user/ashtat/UsePreReleaseTag

Minor changes to pre release tag and conditionally sign/publish etc.

Pipelines/Templates/DownloadPackage.yaml

@@ -7,7 +7,7 @@ parameters:
   default: 'pa-hrtfdsp'
 - name: version
   type: string
-  default: '2.1.571-prerelease'
+  default: '2.1.677-prerelease'
 - name: destination
   type: string
   default: $(Build.SourcesDirectory)\Source\External\hrtfdsp

Pipelines/Templates/Package.yaml

@@ -12,11 +12,6 @@ jobs:
     demands: Unity2020LTS
   variables:
     unityLocation: ''
-    ${{ if eq(variables['Build.SourceBranchName'], variables['SigningBranch']) }}:
-      PackageVersion: $(ProductVersion)
-    ${{ else }}:
-      PackageVersion: '$(ProductVersion)-prerelease.$(Build.SourceBranchName).$(Build.BuildNumber)'
-
   steps:
   - script: echo Downloading Pipeline Artifacts
   - checkout: self

Pipelines/Templates/Publish.yaml

@@ -3,7 +3,7 @@
 
 jobs:
 - deployment: Publish
-  condition: and(succeeded(), eq(variables['Build.SourceBranchName'], variables['SigningBranch']))
+  condition: and(succeeded(), or(eq(variables['PublishPackage'], 'true'), eq(variables['Build.SourceBranchName'], variables['SigningBranch'])))
   continueOnError: false
   displayName: Publish Packages to Feeds
   pool:
@@ -25,5 +25,5 @@ jobs:
           inputs:
             workingFile: Source\Plugins\CrossPlatformPluginGenerator\Assets\Microsoft.SpatialAudio.Spatializer.Unity\.npmrc
             customEndpoint: 'aipmr MixedReality-Unity-Packages'
-        - script: python tools\upm_package.py -s $(Pipeline.Workspace)\BuildArtifacts -o $(Pipeline.Workspace)\npm -v $(ProductVersion) -p
+        - script: python tools\upm_package.py -s $(Pipeline.Workspace)\BuildArtifacts -o $(Pipeline.Workspace)\npm -v $(PackageVersion) -p
           displayName: Publish NPM Package to Public UPM Feed

Pipelines/Templates/Variables.yaml

@@ -7,4 +7,8 @@ variables:
     UnityVersion: $(Unity2020LTSVer)
     ProductVersion.Patch: $[counter(variables['ProductMajorMinor'], 0)]
     ProductVersion: $(ProductMajorMinor).$(ProductVersion.Patch)
-    NpmPackageName: 'com.microsoft.spatialaudio.spatializer.unity'
+    NpmPackageName: 'com.microsoft.spatialaudio.spatializer.unity'
+    ${{ if eq(variables['Build.SourceBranchName'], variables['SigningBranch']) }}:
+      PackageVersion: $(ProductVersion)
+    ${{ else }}:
+      PackageVersion: '$(ProductVersion)-prerelease'

Tools/constants.py

@@ -26,7 +26,7 @@
 aipmr_azure_org = "https://dev.azure.com/aipmr/"
 aipmr_package_feed = "SpatialAudio-packages"
 hrtfdsp_package_name = "pa-hrtfdsp"
-hrtfdsp_package_version = "2.1.571-prerelease"
+hrtfdsp_package_version = "2.1.677-prerelease"
 
 # Supported build platforms and configs
 build_platform_arch_map = {