From 4dfdb4c5a53f9c58e9a0121d09083071802910a7 Mon Sep 17 00:00:00 2001
From: Michael Smith <mismit@microsoft.com>
Date: Fri, 2 Aug 2024 11:17:21 -0700
Subject: [PATCH 1/2] Add default empty guid to fix an error on develop

---
 UnitySetup/UnitySetup.psm1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UnitySetup/UnitySetup.psm1 b/UnitySetup/UnitySetup.psm1
index e6348bf..238623f 100644
--- a/UnitySetup/UnitySetup.psm1
+++ b/UnitySetup/UnitySetup.psm1
@@ -2713,7 +2713,7 @@ function Update-UnityPackageManagerConfig {
         [int]$SearchDepth = 3,
         [Switch]$VerifyOnly,
         [int]$PATLifetime = 7,
-        [guid]$AzureSubscription
+        [guid]$AzureSubscription = [guid]::Empty
     )
 
     $scopedURLRegEx = "(?<FullURL>(?<OrgURL>https:\/\/pkgs.dev.azure.com\/(?<Org>[a-zA-Z0-9]*))\/?(?<Project>[a-zA-Z0-9]*)?\/_packaging\/(?<Feed>[a-zA-Z0-9\-_\.%\(\)!]*)?\/npm\/registry\/?)"
@@ -2752,4 +2752,4 @@ function Update-UnityPackageManagerConfig {
         Write-Verbose "Verify Mode complete"
         exit 0
     }
-}
+}
\ No newline at end of file

From 0e45a3dc9f905f6f3ec034e3ae0b1c93d95148db Mon Sep 17 00:00:00 2001
From: Michael Smith <mismit@microsoft.com>
Date: Fri, 2 Aug 2024 11:54:12 -0700
Subject: [PATCH 2/2] Back to string on top level parameter, handle parse.and
 convert to empty guid

---
 UnitySetup/UnitySetup.psm1 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/UnitySetup/UnitySetup.psm1 b/UnitySetup/UnitySetup.psm1
index 238623f..7a5cdca 100644
--- a/UnitySetup/UnitySetup.psm1
+++ b/UnitySetup/UnitySetup.psm1
@@ -2713,9 +2713,23 @@ function Update-UnityPackageManagerConfig {
         [int]$SearchDepth = 3,
         [Switch]$VerifyOnly,
         [int]$PATLifetime = 7,
-        [guid]$AzureSubscription = [guid]::Empty
+        [String]$AzureSubscription # Define as String
     )
 
+    $AzureSubscriptionGuid = $null
+
+    if (-not [string]::IsNullOrEmpty($AzureSubscription)) {
+        try {
+            $AzureSubscriptionGuid = [guid]::Parse($AzureSubscription)
+        } catch {
+            Write-Error "AzureSubscription parameter must be a valid GUID."
+            return
+        }
+    }
+    else {
+        $AzureSubscriptionGuid = [guid]::Empty
+    }
+
     $scopedURLRegEx = "(?<FullURL>(?<OrgURL>https:\/\/pkgs.dev.azure.com\/(?<Org>[a-zA-Z0-9]*))\/?(?<Project>[a-zA-Z0-9]*)?\/_packaging\/(?<Feed>[a-zA-Z0-9\-_\.%\(\)!]*)?\/npm\/registry\/?)"
     $upmRegEx = "\[npmAuth\.""(?<FullURL>(?<OrgURL>https:\/\/pkgs.dev.azure.com\/(?<Org>[a-zA-Z0-9]*))\/?(?<Project>[a-zA-Z0-9]*)?\/_packaging\/(?<Feed>[a-zA-Z0-9\-_\.%\(\)!]*)?\/npm\/registry\/?)""\][\n\r\s]*_auth ?= ?""(?<Token>[a-zA-Z0-9=]*)""[\n\r\s]*(?:alwaysAuth[\n\r\s]*=[\n\r\s]*true)[\n\r\s]*"
     $azAPIVersion = '7.1-preview.1'
@@ -2738,7 +2752,7 @@ function Update-UnityPackageManagerConfig {
     $tomlFileObjects = Import-TOMLFile -tomlFilePaths $tomlFilePaths -Force
 
     if ($PSCmdlet.ShouldProcess("Synchronizing UPM configuration")) {
-        $upmConfigs = Update-PackageAuthConfig -ScopedRegistryURLs $scopedRegistryURLs -TomlfileObjects $tomlFileObjects -AutoClean:$AutoClean.IsPresent -VerifyOnly:$VerifyOnly.IsPresent -ManualPAT:$ManualPAT.IsPresent -PATLifetime $PATLifetime -DefaultScope $defaultScope -AzAPIVersion $azAPIVersion -ScopedURLRegEx $scopedURLRegEx -UPMRegEx $upmRegEx -AzureSubscription $AzureSubscription
+        $upmConfigs = Update-PackageAuthConfig -ScopedRegistryURLs $scopedRegistryURLs -TomlfileObjects $tomlFileObjects -AutoClean:$AutoClean.IsPresent -VerifyOnly:$VerifyOnly.IsPresent -ManualPAT:$ManualPAT.IsPresent -PATLifetime $PATLifetime -DefaultScope $defaultScope -AzAPIVersion $azAPIVersion -ScopedURLRegEx $scopedURLRegEx -UPMRegEx $upmRegEx -AzureSubscription $AzureSubscriptionGuid
 
         if ($PSCmdlet.ShouldProcess("Exporting UPM configuration")) {
             Export-UPMConfig -UPMConfig $upmConfigs -tomlFilePaths $tomlFilePaths