From 87d0a987e7db4956cd862cd7192587033261b19f Mon Sep 17 00:00:00 2001
From: Nev Wylie <54870357+MSNev@users.noreply.github.com>
Date: Mon, 4 Oct 2021 10:11:18 -0700
Subject: [PATCH 1/2] Update publishing list scripts to support new containers

---
 AISKU/scripts/listCdnVersions.ps1                               | 2 +-
 .../scripts/listCdnVersions.ps1                                 | 2 +-
 .../scripts/listCdnVersions.ps1                                 | 2 +-
 .../scripts/listCdnVersions.ps1                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AISKU/scripts/listCdnVersions.ps1 b/AISKU/scripts/listCdnVersions.ps1
index 074e8a888..4b15a01d8 100644
--- a/AISKU/scripts/listCdnVersions.ps1
+++ b/AISKU/scripts/listCdnVersions.ps1
@@ -47,7 +47,7 @@ Function Write-LogParams
 Function Validate-Params
 {
     # Validate parameters
-    if ([string]::IsNullOrWhiteSpace($container) -ne $true -and "beta","next","public" -NotContains $container) {
+    if ([string]::IsNullOrWhiteSpace($container) -ne $true -and "beta","next","public", "dev", "nightly" -NotContains $container) {
         Write-LogFailure "[$($container)] is not a valid value, must be beta, next or public"
     }
 }
diff --git a/extensions/applicationinsights-clickanalytics-js/scripts/listCdnVersions.ps1 b/extensions/applicationinsights-clickanalytics-js/scripts/listCdnVersions.ps1
index 8475b1170..06addd7ea 100644
--- a/extensions/applicationinsights-clickanalytics-js/scripts/listCdnVersions.ps1
+++ b/extensions/applicationinsights-clickanalytics-js/scripts/listCdnVersions.ps1
@@ -46,7 +46,7 @@ Function Write-LogParams
 Function Validate-Params
 {
     # Validate parameters
-    if ([string]::IsNullOrWhiteSpace($container) -ne $true -and "beta","next","public" -NotContains $container) {
+    if ([string]::IsNullOrWhiteSpace($container) -ne $true -and "beta","next","public", "dev", "nightly" -NotContains $container) {
         Write-LogFailure "[$($container)] is not a valid value, must be beta, next or public"
     }
 }
diff --git a/extensions/applicationinsights-debugplugin-js/scripts/listCdnVersions.ps1 b/extensions/applicationinsights-debugplugin-js/scripts/listCdnVersions.ps1
index be95d4472..8baafda10 100644
--- a/extensions/applicationinsights-debugplugin-js/scripts/listCdnVersions.ps1
+++ b/extensions/applicationinsights-debugplugin-js/scripts/listCdnVersions.ps1
@@ -46,7 +46,7 @@ Function Write-LogParams
 Function Validate-Params
 {
     # Validate parameters
-    if ([string]::IsNullOrWhiteSpace($container) -ne $true -and "beta","next","public" -NotContains $container) {
+    if ([string]::IsNullOrWhiteSpace($container) -ne $true -and "beta","next","public", "dev", "nightly" -NotContains $container) {
         Write-LogFailure "[$($container)] is not a valid value, must be beta, next or public"
     }
 }
diff --git a/extensions/applicationinsights-perfmarkmeasure-js/scripts/listCdnVersions.ps1 b/extensions/applicationinsights-perfmarkmeasure-js/scripts/listCdnVersions.ps1
index 026bdadc9..9f29ab7c8 100644
--- a/extensions/applicationinsights-perfmarkmeasure-js/scripts/listCdnVersions.ps1
+++ b/extensions/applicationinsights-perfmarkmeasure-js/scripts/listCdnVersions.ps1
@@ -46,7 +46,7 @@ Function Write-LogParams
 Function Validate-Params
 {
     # Validate parameters
-    if ([string]::IsNullOrWhiteSpace($container) -ne $true -and "beta","next","public" -NotContains $container) {
+    if ([string]::IsNullOrWhiteSpace($container) -ne $true -and "beta","next","public", "dev", "nightly" -NotContains $container) {
         Write-LogFailure "[$($container)] is not a valid value, must be beta, next or public"
     }
 }

From 55c4e9fc8fc9c1d7649248f32b9c05f2c0f744b3 Mon Sep 17 00:00:00 2001
From: Nev Wylie <54870357+MSNev@users.noreply.github.com>
Date: Mon, 4 Oct 2021 10:20:27 -0700
Subject: [PATCH 2/2] Fix log failure error

---
 AISKU/scripts/setActiveCdnVersion.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AISKU/scripts/setActiveCdnVersion.ps1 b/AISKU/scripts/setActiveCdnVersion.ps1
index df7daaf69..7dee23e1d 100644
--- a/AISKU/scripts/setActiveCdnVersion.ps1
+++ b/AISKU/scripts/setActiveCdnVersion.ps1
@@ -138,13 +138,13 @@ if ($container -eq "public") {
 Get-VersionFiles $files $storePath "ai." $activeVersion
 
 if ($files.ContainsKey($activeVersion) -ne $true) {
-    Log-Failure "Version [$activeVersion] does not appear to be deployed to [$container]"
+    Write-LogFailure "Version [$activeVersion] does not appear to be deployed to [$container]"
 } elseif ($files[$activeVersion].Count -ne 4 -and # Prior to 2.5.8
         $files[$activeVersion].Count -ne 8 -and   # Since 2.5.8
         $files[$activeVersion].Count -ne 9 -and   # Since 2.6.5
         $files[$activeVersion].Count -ne 12 -and  # Since 2.5.8
         $files[$activeVersion].Count -ne 13) {    # Since 2.6.5
-    Log-Failure "Version [$activeVersion] does not fully deployed to [$container] -- only found [$($files[$activeVersion].Count)] file(s)"
+    Write-LogFailure "Version [$activeVersion] does not fully deployed to [$container] -- only found [$($files[$activeVersion].Count)] file(s)"
 }
 
 # Don't try and publish anything if any errors have been logged