Merge remote-tracking branch 'origin/main' into feature/azure-pipelines

riganti · Apr 12, 2021 · 86307a1 · 86307a1
2 parents 2458445 + 4de2060
commit 86307a1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Tools/CopyBetweenNugetFeeds.ps1 b/src/Tools/CopyBetweenNugetFeeds.ps1
@@ -64,13 +64,13 @@ foreach ($package in $packages) {
 
     try {
       $webClient.DownloadFile($snupkgUrl, $snupkgFile)
-      $snupkgDownloaded = true;
+      $snupkgDownloaded = $true;
     }catch {
       Write-Host "No snupkg package found!"
-      $snupkgDownloaded = false;
+      $snupkgDownloaded = $false;
    }        
 
-    if ($snupkgDownloaded==true){
+    if ($snupkgDownloaded -eq $true){
         Write-Host "Uploading snupkg package..."        
         & .\Tools\nuget.exe push $snupkgFile -source $server -apiKey $apiKey
         Remove-Item $nupkgFile    

diff --git a/src/Tools/CopyPackageBetweenNugetFeeds.ps1 b/src/Tools/CopyPackageBetweenNugetFeeds.ps1
@@ -29,13 +29,13 @@ Param(
 
     try {
       $webClient.DownloadFile($snupkgUrl, $snupkgFile)
-      $snupkgDownloaded = true;
+      $snupkgDownloaded = $true;
     }catch {
       Write-Host "No snupkg package found!"
-      $snupkgDownloaded = false;
+      $snupkgDownloaded = $false;
    }        
 
-    if ($snupkgDownloaded==true){
+    if ($snupkgDownloaded -eq $true){
         Write-Host "Uploading snupkg package..."        
         & .\Tools\nuget.exe push $snupkgFile -source $server -apiKey $apiKey
         Remove-Item $nupkgFile    

diff --git a/src/Tools/build/publish.ps1 b/src/Tools/build/publish.ps1
@@ -173,6 +173,10 @@ if ($versionWithoutPre.Contains("-")) {
     $versionWithoutPre = $versionWithoutPre.Substring(0, $versionWithoutPre.IndexOf("-"))
 }
 
+if ($branchName.StartsWith("refs/heads/") -eq $true) {
+	$branchName = $branchName.Substring("refs/heads/".Length)
+}
+
 CleanOldGeneratedPackages;
 RestoreSignClient;
 GitCheckout;