From eb2157e17f96f8e5f9a9b1c3377d06d3009a2121 Mon Sep 17 00:00:00 2001
From: Nev Wylie <54870357+MSNev@users.noreply.github.com>
Date: Wed, 2 Apr 2025 12:31:01 -0700
Subject: [PATCH] [beta] Update publishing scripts for nightly beta releases

---
 AISKU/scripts/publishAzReleaseToCdn.ps1                         | 2 +-
 AISKU/scripts/setAzActiveCdnVersion.ps1                         | 2 +-
 .../scripts/publishAzReleaseToCdn.ps1                           | 2 +-
 .../scripts/setAzActiveCdnVersion.ps1                           | 2 +-
 .../scripts/publishAzReleaseToCdn.ps1                           | 2 +-
 .../scripts/setAzActiveCdnVersion.ps1                           | 2 +-
 .../scripts/publishAzReleaseToCdn.ps1                           | 2 +-
 .../scripts/setAzActiveCdnVersion.ps1                           | 2 +-
 tools/chrome-debug-extension/scripts/publishAzReleaseToCdn.ps1  | 2 +-
 tools/chrome-debug-extension/scripts/setAzActiveCdnVersion.ps1  | 2 +-
 tools/config/scripts/publishAzReleaseToCdn.ps1                  | 2 +-
 tools/config/scripts/setAzActiveCdnVersion.ps1                  | 2 +-
 tools/release-tools/setVersion.js                               | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/AISKU/scripts/publishAzReleaseToCdn.ps1 b/AISKU/scripts/publishAzReleaseToCdn.ps1
index 99aacadc3..4367b754a 100644
--- a/AISKU/scripts/publishAzReleaseToCdn.ps1
+++ b/AISKU/scripts/publishAzReleaseToCdn.ps1
@@ -139,7 +139,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
     # Publish to release type folder folder
     PublishFiles $releaseFiles "$($version.type)" $cacheControl1Year $contentType $overwrite
 }
-elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+elseif ($version.type -like "nightly*") {
     # Publish to release nightly folder folder
     PublishFiles $releaseFiles "nightly" $cacheControl1Year $contentType $overwrite
 }
diff --git a/AISKU/scripts/setAzActiveCdnVersion.ps1 b/AISKU/scripts/setAzActiveCdnVersion.ps1
index c83e1680e..97472c382 100644
--- a/AISKU/scripts/setAzActiveCdnVersion.ps1
+++ b/AISKU/scripts/setAzActiveCdnVersion.ps1
@@ -87,7 +87,7 @@ Function Validate-Params
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
     }
-    elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+    elseif ($version.type -like "nightly*") {
         if ("nightly" -ne $container) {
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
diff --git a/extensions/applicationinsights-clickanalytics-js/scripts/publishAzReleaseToCdn.ps1 b/extensions/applicationinsights-clickanalytics-js/scripts/publishAzReleaseToCdn.ps1
index 3b55f7908..df287b003 100644
--- a/extensions/applicationinsights-clickanalytics-js/scripts/publishAzReleaseToCdn.ps1
+++ b/extensions/applicationinsights-clickanalytics-js/scripts/publishAzReleaseToCdn.ps1
@@ -138,7 +138,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
     # Publish to release type folder folder
     PublishFiles $releaseFiles "$($version.type)/ext" $cacheControl1Year $contentType $overwrite
 }
-elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+elseif ($version.type -like "nightly*") {
     # Publish to release nightly folder folder
     PublishFiles $releaseFiles "nightly/ext" $cacheControl1Year $contentType $overwrite
 }
diff --git a/extensions/applicationinsights-clickanalytics-js/scripts/setAzActiveCdnVersion.ps1 b/extensions/applicationinsights-clickanalytics-js/scripts/setAzActiveCdnVersion.ps1
index 012f0088c..513f093a2 100644
--- a/extensions/applicationinsights-clickanalytics-js/scripts/setAzActiveCdnVersion.ps1
+++ b/extensions/applicationinsights-clickanalytics-js/scripts/setAzActiveCdnVersion.ps1
@@ -87,7 +87,7 @@ Function Validate-Params
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
     }
-    elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+    elseif ($version.type -like "nightly*") {
         if ("nightly" -ne $container) {
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
diff --git a/extensions/applicationinsights-debugplugin-js/scripts/publishAzReleaseToCdn.ps1 b/extensions/applicationinsights-debugplugin-js/scripts/publishAzReleaseToCdn.ps1
index aacdf5cff..d25ac9548 100644
--- a/extensions/applicationinsights-debugplugin-js/scripts/publishAzReleaseToCdn.ps1
+++ b/extensions/applicationinsights-debugplugin-js/scripts/publishAzReleaseToCdn.ps1
@@ -138,7 +138,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
     # Publish to release type folder folder
     PublishFiles $releaseFiles "$($version.type)/ext" $cacheControl1Year $contentType $overwrite
 }
-elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+elseif ($version.type -like "nightly*") {
     # Publish to release nightly folder folder
     PublishFiles $releaseFiles "nightly/ext" $cacheControl1Year $contentType $overwrite
 }
diff --git a/extensions/applicationinsights-debugplugin-js/scripts/setAzActiveCdnVersion.ps1 b/extensions/applicationinsights-debugplugin-js/scripts/setAzActiveCdnVersion.ps1
index 856208956..a968001e0 100644
--- a/extensions/applicationinsights-debugplugin-js/scripts/setAzActiveCdnVersion.ps1
+++ b/extensions/applicationinsights-debugplugin-js/scripts/setAzActiveCdnVersion.ps1
@@ -87,7 +87,7 @@ Function Validate-Params
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
     }
-    elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+    elseif ($version.type -like "nightly*") {
         if ("nightly" -ne $container) {
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
diff --git a/extensions/applicationinsights-perfmarkmeasure-js/scripts/publishAzReleaseToCdn.ps1 b/extensions/applicationinsights-perfmarkmeasure-js/scripts/publishAzReleaseToCdn.ps1
index a9b9b1051..e166a7e43 100644
--- a/extensions/applicationinsights-perfmarkmeasure-js/scripts/publishAzReleaseToCdn.ps1
+++ b/extensions/applicationinsights-perfmarkmeasure-js/scripts/publishAzReleaseToCdn.ps1
@@ -138,7 +138,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
     # Publish to release type folder folder
     PublishFiles $releaseFiles "$($version.type)/ext" $cacheControl1Year $contentType $overwrite
 }
-elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+elseif ($version.type -like "nightly*") {
     # Publish to release nightly folder folder
     PublishFiles $releaseFiles "nightly/ext" $cacheControl1Year $contentType $overwrite
 }
diff --git a/extensions/applicationinsights-perfmarkmeasure-js/scripts/setAzActiveCdnVersion.ps1 b/extensions/applicationinsights-perfmarkmeasure-js/scripts/setAzActiveCdnVersion.ps1
index bb7e033ec..6a489cc64 100644
--- a/extensions/applicationinsights-perfmarkmeasure-js/scripts/setAzActiveCdnVersion.ps1
+++ b/extensions/applicationinsights-perfmarkmeasure-js/scripts/setAzActiveCdnVersion.ps1
@@ -87,7 +87,7 @@ Function Validate-Params
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
     }
-    elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+    elseif ($version.type -like "nightly*") {
         if ("nightly" -ne $container) {
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
diff --git a/tools/chrome-debug-extension/scripts/publishAzReleaseToCdn.ps1 b/tools/chrome-debug-extension/scripts/publishAzReleaseToCdn.ps1
index 9b96d2002..0bdc2dd93 100644
--- a/tools/chrome-debug-extension/scripts/publishAzReleaseToCdn.ps1
+++ b/tools/chrome-debug-extension/scripts/publishAzReleaseToCdn.ps1
@@ -127,7 +127,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
     # Publish to release type folder folder
     PublishFiles $releaseFiles "$($version.type)/tools" $cacheControl1Year $contentType $overwrite
 }
-elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+elseif ($version.type -like "nightly*") {
     # Publish to release nightly folder folder
     PublishFiles $releaseFiles "nightly/tools" $cacheControl1Year $contentType $overwrite
 }
diff --git a/tools/chrome-debug-extension/scripts/setAzActiveCdnVersion.ps1 b/tools/chrome-debug-extension/scripts/setAzActiveCdnVersion.ps1
index f2412bbb4..91cc80821 100644
--- a/tools/chrome-debug-extension/scripts/setAzActiveCdnVersion.ps1
+++ b/tools/chrome-debug-extension/scripts/setAzActiveCdnVersion.ps1
@@ -87,7 +87,7 @@ Function Validate-Params
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
     }
-    elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+    elseif ($version.type -like "nightly*") {
         if ("nightly" -ne $container) {
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
diff --git a/tools/config/scripts/publishAzReleaseToCdn.ps1 b/tools/config/scripts/publishAzReleaseToCdn.ps1
index 99f0db08c..404dcf5b2 100644
--- a/tools/config/scripts/publishAzReleaseToCdn.ps1
+++ b/tools/config/scripts/publishAzReleaseToCdn.ps1
@@ -153,7 +153,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
     # PublishFiles $releaseFiles "$($version.type)" $cacheControl1Year $contentType $overwrite
     PublishFiles $testFiles "$($version.type)" $cacheControl1Year $contentType $overwrite
 }
-elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+elseif ($version.type -like "nightly*") {
     # Publish to release nightly folder folder
     # PublishFiles $releaseFiles "nightly" $cacheControl1Year $contentType $overwrite
     PublishFiles $testFiles "nightly" $cacheControl1Year $contentType $overwrite
diff --git a/tools/config/scripts/setAzActiveCdnVersion.ps1 b/tools/config/scripts/setAzActiveCdnVersion.ps1
index 4e5684ddb..afdcdad40 100644
--- a/tools/config/scripts/setAzActiveCdnVersion.ps1
+++ b/tools/config/scripts/setAzActiveCdnVersion.ps1
@@ -87,7 +87,7 @@ Function Validate-Params
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
     }
-    elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
+    elseif ($version.type -like "nightly*") {
         if ("nightly" -ne $container) {
             Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
         }
diff --git a/tools/release-tools/setVersion.js b/tools/release-tools/setVersion.js
index dde02a3f3..c750c1479 100644
--- a/tools/release-tools/setVersion.js
+++ b/tools/release-tools/setVersion.js
@@ -406,7 +406,7 @@ function updatePublishConfig(package, newVersion) {
         }
 
         // Set the publishing tag
-        if (details.type === "nightly" || details.type === "dev" || details.type === "beta" || details.type === "alpha") {
+        if (details.type === "nightly" || details.type === "nightlybeta" || details.type === "dev" || details.type === "beta" || details.type === "alpha") {
             console.log(`   Type - [${details.type}] - ${majorVersion}`);
             package.publishConfig.tag = details.type + (majorVersion !== "0" ? majorVersion : "");
         } else {