From 94da31569e5ddbef3b7cde91d18642b84f7ba20c Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Tue, 21 Apr 2020 12:43:50 -0700
Subject: [PATCH] modify upload names (#10084)

---
 build/azure-pipelines/darwin/sql-publish.ps1 |  7 ++++++-
 build/azure-pipelines/linux/sql-publish.ps1  | 21 +++++++++++++++++---
 build/azure-pipelines/win32/sql-publish.ps1  | 16 ++++++++++++---
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/build/azure-pipelines/darwin/sql-publish.ps1 b/build/azure-pipelines/darwin/sql-publish.ps1
index 84488eb92b..c22c772008 100644
--- a/build/azure-pipelines/darwin/sql-publish.ps1
+++ b/build/azure-pipelines/darwin/sql-publish.ps1
@@ -15,5 +15,10 @@ $CommitId = $VersionJson.commit
 
 $ZipName = "azuredatastudio-darwin.zip"
 $Zip = "$artifactsDir\darwin\archive\$ZipName"
+$UploadName = "azuredatastudio-macos-$Version"
 
-node $sourcesDir\build\azure-pipelines\common\publish.js $Quality darwin archive $ZipName $Version true $Zip $CommitId
+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
index 6ae9a18ac2..2208b1eff1 100644
--- a/build/azure-pipelines/linux/sql-publish.ps1
+++ b/build/azure-pipelines/linux/sql-publish.ps1
@@ -18,19 +18,34 @@ $Arch = "x64"
 $PlatformLinux = "linux-$Arch"
 $TarballFilename = "azuredatastudio-linux-$Arch.tar.gz"
 $TarballPath = "$artifactsDir\linux\archive\$TarballFilename"
+$TarballUploadName = "azuredatastudio-linux-$Version"
 
-node $sourcesDir\build\azure-pipelines\common\publish.js $Quality $PlatformLinux archive-unsigned $TarballFilename $Version true $TarballPath $CommitId
+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
 $PlatformDeb = "linux-deb-$Arch"
 $DebFilename = "$(Get-ChildItem -File -Name $artifactsDir\linux\deb\amd64\deb\*.deb)"
 $DebPath = "$artifactsDir\linux\deb\amd64\deb\$DebFilename"
+$DebUploadName = "azuredatastudio-linux-$Version"
 
-node $sourcesDir\build\azure-pipelines\common\publish.js $Quality $PlatformDeb package $DebFilename $Version true $DebPath $CommitId
+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
 $PlatformRpm = "linux-rpm-$Arch"
 $RpmFilename = "$(Get-ChildItem -File -Name $artifactsDir\linux\rpm\x86_64\*.rpm)"
 $RpmPath = "$artifactsDir\linux\rpm\x86_64\$RpmFilename"
+$RpmUploadName = "azuredatastudio-linux-$Version"
 
-node $sourcesDir\build\azure-pipelines\common\publish.js $Quality $PlatformRpm package $RpmFilename $Version true $RpmPath $CommitId
+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/win32/sql-publish.ps1 b/build/azure-pipelines/win32/sql-publish.ps1
index 092f16b156..04238d69e5 100644
--- a/build/azure-pipelines/win32/sql-publish.ps1
+++ b/build/azure-pipelines/win32/sql-publish.ps1
@@ -20,10 +20,20 @@ $Version = $VersionJson.version
 $Quality = $VersionJson.quality
 $CommitId = $VersionJson.commit
 
+$ZipUploadName = "azuredatastudio-windows-$Version"
+$SetupUploadName = "azuredatastudio-windows-setup-$Version"
+$UserUploadName = "azuredatastudio-windows-user-setup-$Version"
+
+If (-NOT ($Quality -eq "stable")) {
+	$ZipUploadName = "$ZipUploadName-$Quality"
+	$SetupUploadName = "$SetupUploadName-$Quality"
+	$UserUploadName = "$UserUploadName-$Quality"
+}
+
 $assetPlatform = "win32-x64"
 
-node $sourcesDir/build/azure-pipelines/common/publish.js $Quality "$assetPlatform-archive" archive $ZipName $Version true $Zip $CommitId
+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 $ExeName $Version true $SystemExe $CommitId
+node $sourcesDir/build/azure-pipelines/common/publish.js $Quality "$assetPlatform" setup "$SetupUploadName.exe" $Version true $SystemExe $CommitId
 
-node $sourcesDir/build/azure-pipelines/common/publish.js $Quality "$assetPlatform-user" setup $UserExeName $Version true $UserExe $CommitId
+node $sourcesDir/build/azure-pipelines/common/publish.js $Quality "$assetPlatform-user" setup "$UserUploadName.exe" $Version true $UserExe $CommitId