dont append quality to version info (#10118)

microsoft · Apr 22, 2020 · d88918a · d88918a
1 parent 883dcc9
commit d88918a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/build/azure-pipelines/darwin/sql-publish.ps1 b/build/azure-pipelines/darwin/sql-publish.ps1
@@ -17,4 +17,8 @@ $ZipName = "azuredatastudio-darwin.zip"
 $Zip = "$artifactsDir\darwin\archive\$ZipName"
 $UploadName = "azuredatastudio-macos-$Version"
 
+If (-NOT ($Quality -eq "stable")) {
+	$UploadName = "$UploadName-$Quality"
+}
+
 node $sourcesDir\build\azure-pipelines\common\publish.js $Quality darwin archive "$UploadName.zip" $Version true $Zip $CommitId
diff --git a/build/azure-pipelines/linux/sql-publish.ps1 b/build/azure-pipelines/linux/sql-publish.ps1
@@ -20,6 +20,10 @@ $TarballFilename = "azuredatastudio-linux-$Arch.tar.gz"
 $TarballPath = "$artifactsDir\linux\archive\$TarballFilename"
 $TarballUploadName = "azuredatastudio-linux-$Version"
 
+If (-NOT ($Quality -eq "stable")) {
+	$TarballUploadName = "$TarballUploadName-$Quality"
+}
+
 node $sourcesDir\build\azure-pipelines\common\publish.js $Quality $PlatformLinux archive-unsigned "$TarballUploadName.tar.gz" $Version true $TarballPath $CommitId
 
 # Publish DEB
@@ -28,6 +32,10 @@ $DebFilename = "$(Get-ChildItem -File -Name $artifactsDir\linux\deb\amd64\deb\*.
 $DebPath = "$artifactsDir\linux\deb\amd64\deb\$DebFilename"
 $DebUploadName = "azuredatastudio-linux-$Version"
 
+If (-NOT ($Quality -eq "stable")) {
+	$DebUploadName = "$DebUploadName-$Quality"
+}
+
 node $sourcesDir\build\azure-pipelines\common\publish.js $Quality $PlatformDeb package "$DebUploadName.deb" $Version true $DebPath $CommitId
 
 # Publish RPM
@@ -36,4 +44,8 @@ $RpmFilename = "$(Get-ChildItem -File -Name $artifactsDir\linux\rpm\x86_64\*.rpm
 $RpmPath = "$artifactsDir\linux\rpm\x86_64\$RpmFilename"
 $RpmUploadName = "azuredatastudio-linux-$Version"
 
+If (-NOT ($Quality -eq "stable")) {
+	$RpmUploadName = "$RpmUploadName-$Quality"
+}
+
 node $sourcesDir\build\azure-pipelines\common\publish.js $Quality $PlatformRpm package "$RpmUploadName.rpm" $Version true $RpmPath $CommitId
diff --git a/build/azure-pipelines/sql-product-compile.yml b/build/azure-pipelines/sql-product-compile.yml
@@ -109,11 +109,6 @@ steps:
 
     VERSION=$(node -p "require(\"./package.json\").version")
 
-    if [ "$VSCODE_QUALITY" != "stable" ]
-    then
-      VERSION="$VERSION-$VSCODE_QUALITY"
-    fi
-
     echo -e "{  \"version\": \"$VERSION\", \"quality\": \"$VSCODE_QUALITY\", \"commit\": \"$BUILD_SOURCEVERSION\" }" > ".build/version.json"
 
     node build/azure-pipelines/common/copyArtifacts.js

diff --git a/build/azure-pipelines/win32/sql-publish.ps1 b/build/azure-pipelines/win32/sql-publish.ps1
@@ -26,6 +26,12 @@ $UserUploadName = "azuredatastudio-windows-user-setup-$Version"
 
 $assetPlatform = "win32-x64"
 
+If (-NOT ($Quality -eq "stable")) {
+	$ZipUploadName = "$ZipUploadName-$Quality"
+	$SetupUploadName = "$SetupUploadName-$Quality"
+	$UserUploadName = "$UserUploadName-$Quality"
+}
+
 node $sourcesDir/build/azure-pipelines/common/publish.js $Quality "$assetPlatform-archive" archive "$ZipUploadName.zip" $Version true $Zip $CommitId
 
 node $sourcesDir/build/azure-pipelines/common/publish.js $Quality "$assetPlatform" setup "$SetupUploadName.exe" $Version true $SystemExe $CommitId