Merge 28005b1 into b226c75

arcus-azure · May 30, 2022 · 399716c · 399716c
2 parents b226c75 + 28005b1
commit 399716c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/determine-pr-version.yml b/determine-pr-version.yml
@@ -13,6 +13,12 @@ parameters:
     values:
       - none
       - alpha
+  packageType:
+    type: string
+    default: NuGet
+    values:
+      - NuGet
+      - Python
 
 steps:
 - bash: |
@@ -65,6 +71,18 @@ steps:
             Write-Host "Overriding package version given it's a master build"
             $packageVersion = '$(Build.BuildNumber)';
             $packageVersion = "alpha$packageVersion"
+        } elseif ('${{ parameters.packageType }}' -eq 'NuGet') {
+            Write-Host "Using released NuGet version in IndividualCI build"
+            $nugetSearchUrl = "https://azuresearch-usnc.nuget.org/query?q=$(Project)&prerelease=false"
+            $response = Invoke-WebRequest $nugetSearchUrl
+            $json = ConvertFrom-Json $response.Content
+            $currentVersion = $json.data[0].version
+            if ($currentVersion -eq $null) {
+              $currentVersion = "0.1.0" 
+            }
+
+            $patch = "$(Build.BuildNumber)"
+            $packageVersion = "$currentVersion-preview-$patch"
         } else {
             $packageVersion = "$packageVersion-${{ parameters.manualTriggerVersion }}"
         }

diff --git a/nuget/determine-pr-version.yml b/nuget/determine-pr-version.yml
@@ -21,4 +21,5 @@ steps:
     manualTriggerVersion: ${{ parameters.manualTriggerVersion }}
     packageVersionVariableName: ${{ parameters.packageVersionVariableName }}
     pullRequestFormat: PR
-    invidualCIFormat: none
+    invidualCIFormat: none
+    packageType: 'NuGet'
diff --git a/pypi/determine-pr-version.yml b/pypi/determine-pr-version.yml
@@ -22,3 +22,4 @@ steps:
     packageVersionVariableName: ${{ parameters.packageVersionVariableName }}
     pullRequestFormat: dev
     invidualCIFormat: alpha
+    packageType: 'Python'