ACR - Update PSRepositoryInfo.APIVersion to replace acr with ContainerRegistry (#1589)

alerickson · web-flow · commit d5e5d8d5afbc · 2024-03-07T13:29:24.000-08:00
diff --git a/src/code/FindHelper.cs b/src/code/FindHelper.cs
@@ -956,7 +956,7 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R
             // After retrieving all packages find their dependencies
             if (_includeDependencies)
             {
-                if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.v3)
+                if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.V3)
                 {
                     _cmdletPassedIn.WriteWarning("Installing dependencies is not currently supported for V3 server protocol repositories. The package will be installed without installing dependencies.");
                     yield break;
diff --git a/src/code/InstallHelper.cs b/src/code/InstallHelper.cs
@@ -315,7 +315,7 @@ private List<PSResourceInfo> ProcessRepositories(
                 }
 
                 repositoryNamesToSearch.Add(repoName);
-                if ((currentRepository.ApiVersion == PSRepositoryInfo.APIVersion.v3) && (!installDepsForRepo))
+                if ((currentRepository.ApiVersion == PSRepositoryInfo.APIVersion.V3) && (!installDepsForRepo))
                 {
                     _cmdletPassedIn.WriteWarning("Installing dependencies is not currently supported for V3 server protocol repositories. The package will be installed without installing dependencies.");
                     installDepsForRepo = true;
@@ -598,7 +598,7 @@ private List<PSResourceInfo> InstallPackages(
 
                     if (!skipDependencyCheck)
                     {
-                        if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.v3)
+                        if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.V3)
                         {
                             _cmdletPassedIn.WriteWarning("Installing dependencies is not currently supported for V3 server protocol repositories. The package will be installed without installing dependencies.");
                         }
diff --git a/src/code/PSRepositoryInfo.cs b/src/code/PSRepositoryInfo.cs
@@ -15,12 +15,12 @@ public sealed class PSRepositoryInfo
 
         public enum APIVersion
         {
-            unknown,
-            v2,
-            v3,
-            local,
-            nugetServer,
-            acr
+            Unknown,
+            V2,
+            V3,
+            Local,
+            NugetServer,
+            ContainerRegistry
         }
 
         #endregion
diff --git a/src/code/PublishPSResource.cs b/src/code/PublishPSResource.cs
@@ -494,7 +494,7 @@ out string[] _
 
                 string repositoryUri = repository.Uri.AbsoluteUri;
 
-                if (repository.ApiVersion == PSRepositoryInfo.APIVersion.acr)
+                if (repository.ApiVersion == PSRepositoryInfo.APIVersion.ContainerRegistry)
                 {
                     ACRServerAPICalls acrServer = new ACRServerAPICalls(repository, this, _networkCredential, userAgentString);
 
diff --git a/src/code/RegisterPSResourceRepository.cs b/src/code/RegisterPSResourceRepository.cs
@@ -339,11 +339,12 @@ private PSRepositoryInfo RepoValidationHelper(Hashtable repo)
 
             if (repo.ContainsKey("ApiVersion") && 
                 (repo["ApiVersion"] == null || String.IsNullOrEmpty(repo["ApiVersion"].ToString()) ||
-                !(repo["ApiVersion"].ToString().Equals("local") || repo["ApiVersion"].ToString().Equals("v2") || 
-                repo["ApiVersion"].ToString().Equals("v3") || repo["ApiVersion"].ToString().Equals("nugetServer") || repo["ApiVersion"].ToString().Equals("unknown"))))
+                !(repo["ApiVersion"].ToString().Equals("Local", StringComparison.OrdinalIgnoreCase) || repo["ApiVersion"].ToString().Equals("V2", StringComparison.OrdinalIgnoreCase) || 
+                repo["ApiVersion"].ToString().Equals("V3", StringComparison.OrdinalIgnoreCase) || repo["ApiVersion"].ToString().Equals("NugetServer", StringComparison.OrdinalIgnoreCase) || 
+                repo["ApiVersion"].ToString().Equals("Unknown", StringComparison.OrdinalIgnoreCase))))
             {
                 WriteError(new ErrorRecord(
-                    new PSInvalidOperationException("Repository ApiVersion must be either 'local', 'v2', 'v3', 'nugetServer' or 'unknown'"),
+                    new PSInvalidOperationException("Repository ApiVersion must be either 'Local', 'V2', 'V3', 'NugetServer', 'ContainRegistry' or 'Unknown'"),
                     "IncorrectApiVersionForRepositoriesParameterSetRegistration",
                     ErrorCategory.InvalidArgument,
                     this));
diff --git a/src/code/RepositorySettings.cs b/src/code/RepositorySettings.cs
@@ -7,8 +7,6 @@
 using System.IO;
 using System.Linq;
 using System.Management.Automation;
-using System.Security.Cryptography;
-using System.Text;
 using System.Xml;
 using System.Xml.Linq;
 using static Microsoft.PowerShell.PSResourceGet.UtilClasses.PSRepositoryInfo;
@@ -63,7 +61,7 @@ public static void CheckRepositoryStore()
 
                 // Add PSGallery to the newly created store
                 Uri psGalleryUri = new Uri(PSGalleryRepoUri);
-                Add(PSGalleryRepoName, psGalleryUri, DefaultPriority, DefaultTrusted, repoCredentialInfo: null, PSRepositoryInfo.APIVersion.v2, force: false);
+                Add(PSGalleryRepoName, psGalleryUri, DefaultPriority, DefaultTrusted, repoCredentialInfo: null, PSRepositoryInfo.APIVersion.V2, force: false);
             }
 
             // Open file (which should exist now), if cannot/is corrupted then throw error
@@ -416,15 +414,15 @@ public static PSRepositoryInfo Update(string repoName, Uri repoUri, int repoPrio
                 }
 
                 // Update APIVersion if necessary
-                PSRepositoryInfo.APIVersion resolvedAPIVersion = PSRepositoryInfo.APIVersion.unknown;
+                PSRepositoryInfo.APIVersion resolvedAPIVersion = PSRepositoryInfo.APIVersion.Unknown;
                 if (apiVersion != null)
                 {
                     resolvedAPIVersion = (PSRepositoryInfo.APIVersion)apiVersion;
                     node.Attribute("APIVersion").Value = resolvedAPIVersion.ToString();
                 }
                 else
                 {
-                    resolvedAPIVersion = (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value);
+                    resolvedAPIVersion = (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value, ignoreCase: true);
                 }
 
 
@@ -531,7 +529,7 @@ public static List<PSRepositoryInfo> Remove(string[] repoNames, out string[] err
                         Int32.Parse(node.Attribute("Priority").Value),
                         Boolean.Parse(node.Attribute("Trusted").Value),
                         repoCredentialInfo,
-                        (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value)));
+                        (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value, ignoreCase: true)));
 
                 // Remove item from file
                 node.Remove();
@@ -661,7 +659,7 @@ public static List<PSRepositoryInfo> Read(string[] repoNames, out string[] error
                         Int32.Parse(repo.Attribute("Priority").Value),
                         Boolean.Parse(repo.Attribute("Trusted").Value),
                         thisCredentialInfo,
-                        (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), repo.Attribute("APIVersion").Value));
+                        (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), repo.Attribute("APIVersion").Value, ignoreCase: true));
 
                     foundRepos.Add(currentRepoItem);
                 }
@@ -765,7 +763,7 @@ public static List<PSRepositoryInfo> Read(string[] repoNames, out string[] error
                             Int32.Parse(node.Attribute("Priority").Value),
                             Boolean.Parse(node.Attribute("Trusted").Value),
                             thisCredentialInfo,
-                            (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value));
+                            (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value, ignoreCase: true));
 
                         foundRepos.Add(currentRepoItem);
                     }
@@ -823,30 +821,30 @@ private static PSRepositoryInfo.APIVersion GetRepoAPIVersion(Uri repoUri)
             if (repoUri.AbsoluteUri.EndsWith("/v2", StringComparison.OrdinalIgnoreCase))
             {
                 // Scenario: V2 server protocol repositories (i.e PSGallery)
-                return PSRepositoryInfo.APIVersion.v2;
+                return PSRepositoryInfo.APIVersion.V2;
             }
             else if (repoUri.AbsoluteUri.EndsWith("/index.json", StringComparison.OrdinalIgnoreCase))
             {
                 // Scenario: V3 server protocol repositories (i.e NuGet.org, Azure Artifacts (ADO), Artifactory, Github Packages, MyGet.org)
-                return PSRepositoryInfo.APIVersion.v3;
+                return PSRepositoryInfo.APIVersion.V3;
             }
             else if (repoUri.AbsoluteUri.EndsWith("/nuget", StringComparison.OrdinalIgnoreCase))
             {
                 // Scenario: ASP.Net application feed created with NuGet.Server to host packages
-                return PSRepositoryInfo.APIVersion.nugetServer;
+                return PSRepositoryInfo.APIVersion.NugetServer;
             }
             else if (repoUri.Scheme.Equals(Uri.UriSchemeFile, StringComparison.OrdinalIgnoreCase) || repoUri.Scheme.Equals("temp", StringComparison.OrdinalIgnoreCase))
             {
                 // repositories with Uri Scheme "temp" may have PSPath Uri's like: "Temp:\repo" and we should consider them as local repositories.
-                return PSRepositoryInfo.APIVersion.local;
+                return PSRepositoryInfo.APIVersion.Local;
             }
             else if (repoUri.AbsoluteUri.EndsWith(".azurecr.io") || repoUri.AbsoluteUri.EndsWith(".azurecr.io/"))
             {
-                return PSRepositoryInfo.APIVersion.acr;
+                return PSRepositoryInfo.APIVersion.ContainerRegistry;
             }
             else
             {
-                return PSRepositoryInfo.APIVersion.unknown;
+                return PSRepositoryInfo.APIVersion.Unknown;
             }
         }
 
diff --git a/src/code/ResponseUtilFactory.cs b/src/code/ResponseUtilFactory.cs
@@ -14,27 +14,27 @@ public static ResponseUtil GetResponseUtil(PSRepositoryInfo repository)
 
             switch (repoApiVersion)
             {
-                case PSRepositoryInfo.APIVersion.v2:
+                case PSRepositoryInfo.APIVersion.V2:
                     currentResponseUtil = new V2ResponseUtil(repository);
                     break;
 
-                case PSRepositoryInfo.APIVersion.v3:
+                case PSRepositoryInfo.APIVersion.V3:
                     currentResponseUtil = new V3ResponseUtil(repository);
                     break;
 
-                case PSRepositoryInfo.APIVersion.local:
+                case PSRepositoryInfo.APIVersion.Local:
                     currentResponseUtil = new LocalResponseUtil(repository);
                     break;
 
-                case PSRepositoryInfo.APIVersion.nugetServer:
+                case PSRepositoryInfo.APIVersion.NugetServer:
                     currentResponseUtil = new NuGetServerResponseUtil(repository);
                     break;
 
-                case PSRepositoryInfo.APIVersion.acr:
+                case PSRepositoryInfo.APIVersion.ContainerRegistry:
                     currentResponseUtil = new ACRResponseUtil(repository);
                     break;
 
-                case PSRepositoryInfo.APIVersion.unknown:
+                case PSRepositoryInfo.APIVersion.Unknown:
                     break;
             }
 
diff --git a/src/code/ServerFactory.cs b/src/code/ServerFactory.cs
@@ -43,27 +43,27 @@ public static ServerApiCall GetServer(PSRepositoryInfo repository, PSCmdlet cmdl
 
             switch (repoApiVersion)
             {
-                case PSRepositoryInfo.APIVersion.v2:
+                case PSRepositoryInfo.APIVersion.V2:
                     currentServer = new V2ServerAPICalls(repository, cmdletPassedIn, networkCredential, userAgentString);
                     break;
 
-                case PSRepositoryInfo.APIVersion.v3:
+                case PSRepositoryInfo.APIVersion.V3:
                     currentServer = new V3ServerAPICalls(repository, cmdletPassedIn, networkCredential, userAgentString);
                     break;
 
-                case PSRepositoryInfo.APIVersion.local:
+                case PSRepositoryInfo.APIVersion.Local:
                     currentServer = new LocalServerAPICalls(repository, cmdletPassedIn, networkCredential);
                     break;
 
-                case PSRepositoryInfo.APIVersion.nugetServer:
+                case PSRepositoryInfo.APIVersion.NugetServer:
                     currentServer = new NuGetServerAPICalls(repository, cmdletPassedIn, networkCredential, userAgentString);
                     break;
 
-                case PSRepositoryInfo.APIVersion.acr:
+                case PSRepositoryInfo.APIVersion.ContainerRegistry:
                     currentServer = new ACRServerAPICalls(repository, cmdletPassedIn, networkCredential, userAgentString);
                     break;
 
-                case PSRepositoryInfo.APIVersion.unknown:
+                case PSRepositoryInfo.APIVersion.Unknown:
                     break;
             }
 
diff --git a/test/FindPSResourceTests/FindPSResourceACRServer.Tests.ps1 b/test/FindPSResourceTests/FindPSResourceACRServer.Tests.ps1
@@ -18,12 +18,12 @@ Describe 'Test HTTP Find-PSResource for ACR Server Protocol' -tags 'CI' {
         if ($usingAzAuth)
         {
             Write-Verbose -Verbose "Using Az module for authentication"
-            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -Verbose
+            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -Verbose
         }
         else
         {
             $psCredInfo = New-Object Microsoft.PowerShell.PSResourceGet.UtilClasses.PSCredentialInfo ("SecretStore", "$env:TENANTID")
-            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose
+            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose
         }
     }
 
diff --git a/test/InstallPSResourceTests/InstallPSResourceACRServer.Tests.ps1 b/test/InstallPSResourceTests/InstallPSResourceACRServer.Tests.ps1
@@ -19,12 +19,12 @@ Describe 'Test Install-PSResource for ACR scenarios' -tags 'CI' {
 
         if ($usingAzAuth)
         {
-            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -Verbose
+            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -Verbose
         }
         else
         {
             $psCredInfo = New-Object Microsoft.PowerShell.PSResourceGet.UtilClasses.PSCredentialInfo ("SecretStore", "$env:TENANTID")
-            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose
+            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose
         }
     }
 
diff --git a/test/PublishPSResourceTests/PublishPSResourceACRServer.Tests.ps1 b/test/PublishPSResourceTests/PublishPSResourceACRServer.Tests.ps1
@@ -53,12 +53,12 @@ Describe "Test Publish-PSResource" -tags 'CI' {
 
         if ($usingAzAuth)
         {
-            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -Verbose
+            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -Verbose
         }
         else
         {
             $psCredInfo = New-Object Microsoft.PowerShell.PSResourceGet.UtilClasses.PSCredentialInfo ("SecretStore", "$env:TENANTID")
-            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose
+            Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose
         }
 
         # Create module
diff --git a/test/ResourceRepositoryTests/RegisterPSResourceRepository.Tests.ps1 b/test/ResourceRepositoryTests/RegisterPSResourceRepository.Tests.ps1
@@ -403,4 +403,15 @@ Describe "Test Register-PSResourceRepository" -tags 'CI' {
         $res.Uri.LocalPath | Should -Contain $tmpDir1Path
         $res.ApiVersion | Should -Be 'v2'
     }
+
+    It "should register container registry repository with correct ApiVersion" {
+        $ContainerRegistryName = "ACRRepo"
+        $ContainerRegistryUri = "https://psresourcegettest.azurecr.io/"
+        Register-PSResourceRepository -Name $ContainerRegistryName -Uri $ContainerRegistryUri
+        $res = Get-PSResourceRepository -Name $ContainerRegistryName
+
+        $res.Name | Should -Be $ContainerRegistryName
+        $res.Uri.AbsoluteUri | Should -Contain $ContainerRegistryUri
+        $res.ApiVersion | Should -Be 'ContainerRegistry'
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ private IEnumerable<PSResourceInfo> SearchByNames(ServerApiCall currentServer, R`
`956`	`956`	`// After retrieving all packages find their dependencies`
`957`	`957`	`if (_includeDependencies)`
`958`	`958`	`{`
`959`		`- if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.v3)`
	`959`	`+ if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.V3)`
`960`	`960`	`{`
`961`	`961`	`_cmdletPassedIn.WriteWarning("Installing dependencies is not currently supported for V3 server protocol repositories. The package will be installed without installing dependencies.");`
`962`	`962`	`yield break;`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ private List<PSResourceInfo> ProcessRepositories(`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`repositoryNamesToSearch.Add(repoName);`
`318`		`- if ((currentRepository.ApiVersion == PSRepositoryInfo.APIVersion.v3) && (!installDepsForRepo))`
	`318`	`+ if ((currentRepository.ApiVersion == PSRepositoryInfo.APIVersion.V3) && (!installDepsForRepo))`
`319`	`319`	`{`
`320`	`320`	`_cmdletPassedIn.WriteWarning("Installing dependencies is not currently supported for V3 server protocol repositories. The package will be installed without installing dependencies.");`
`321`	`321`	`installDepsForRepo = true;`
`@@ -598,7 +598,7 @@ private List<PSResourceInfo> InstallPackages(`
`598`	`598`
`599`	`599`	`if (!skipDependencyCheck)`
`600`	`600`	`{`
`601`		`- if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.v3)`
	`601`	`+ if (currentServer.Repository.ApiVersion == PSRepositoryInfo.APIVersion.V3)`
`602`	`602`	`{`
`603`	`603`	`_cmdletPassedIn.WriteWarning("Installing dependencies is not currently supported for V3 server protocol repositories. The package will be installed without installing dependencies.");`
`604`	`604`	`}`
Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ out string[] _`
`494`	`494`
`495`	`495`	`string repositoryUri = repository.Uri.AbsoluteUri;`
`496`	`496`
`497`		`- if (repository.ApiVersion == PSRepositoryInfo.APIVersion.acr)`
	`497`	`+ if (repository.ApiVersion == PSRepositoryInfo.APIVersion.ContainerRegistry)`
`498`	`498`	`{`
`499`	`499`	`ACRServerAPICalls acrServer = new ACRServerAPICalls(repository, this, _networkCredential, userAgentString);`
`500`	`500`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`using System.IO;`
`8`	`8`	`using System.Linq;`
`9`	`9`	`using System.Management.Automation;`
`10`		`-using System.Security.Cryptography;`
`11`		`-using System.Text;`
`12`	`10`	`using System.Xml;`
`13`	`11`	`using System.Xml.Linq;`
`14`	`12`	`using static Microsoft.PowerShell.PSResourceGet.UtilClasses.PSRepositoryInfo;`
`@@ -63,7 +61,7 @@ public static void CheckRepositoryStore()`
`63`	`61`
`64`	`62`	`// Add PSGallery to the newly created store`
`65`	`63`	`Uri psGalleryUri = new Uri(PSGalleryRepoUri);`
`66`		`- Add(PSGalleryRepoName, psGalleryUri, DefaultPriority, DefaultTrusted, repoCredentialInfo: null, PSRepositoryInfo.APIVersion.v2, force: false);`
	`64`	`+ Add(PSGalleryRepoName, psGalleryUri, DefaultPriority, DefaultTrusted, repoCredentialInfo: null, PSRepositoryInfo.APIVersion.V2, force: false);`
`67`	`65`	`}`
`68`	`66`
`69`	`67`	`// Open file (which should exist now), if cannot/is corrupted then throw error`
`@@ -416,15 +414,15 @@ public static PSRepositoryInfo Update(string repoName, Uri repoUri, int repoPrio`
`416`	`414`	`}`
`417`	`415`
`418`	`416`	`// Update APIVersion if necessary`
`419`		`- PSRepositoryInfo.APIVersion resolvedAPIVersion = PSRepositoryInfo.APIVersion.unknown;`
	`417`	`+ PSRepositoryInfo.APIVersion resolvedAPIVersion = PSRepositoryInfo.APIVersion.Unknown;`
`420`	`418`	`if (apiVersion != null)`
`421`	`419`	`{`
`422`	`420`	`resolvedAPIVersion = (PSRepositoryInfo.APIVersion)apiVersion;`
`423`	`421`	`node.Attribute("APIVersion").Value = resolvedAPIVersion.ToString();`
`424`	`422`	`}`
`425`	`423`	`else`
`426`	`424`	`{`
`427`		`- resolvedAPIVersion = (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value);`
	`425`	`+ resolvedAPIVersion = (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value, ignoreCase: true);`
`428`	`426`	`}`
`429`	`427`
`430`	`428`
`@@ -531,7 +529,7 @@ public static List<PSRepositoryInfo> Remove(string[] repoNames, out string[] err`
`531`	`529`	`Int32.Parse(node.Attribute("Priority").Value),`
`532`	`530`	`Boolean.Parse(node.Attribute("Trusted").Value),`
`533`	`531`	`repoCredentialInfo,`
`534`		`- (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value)));`
	`532`	`+ (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value, ignoreCase: true)));`
`535`	`533`
`536`	`534`	`// Remove item from file`
`537`	`535`	`node.Remove();`
`@@ -661,7 +659,7 @@ public static List<PSRepositoryInfo> Read(string[] repoNames, out string[] error`
`661`	`659`	`Int32.Parse(repo.Attribute("Priority").Value),`
`662`	`660`	`Boolean.Parse(repo.Attribute("Trusted").Value),`
`663`	`661`	`thisCredentialInfo,`
`664`		`- (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), repo.Attribute("APIVersion").Value));`
	`662`	`+ (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), repo.Attribute("APIVersion").Value, ignoreCase: true));`
`665`	`663`
`666`	`664`	`foundRepos.Add(currentRepoItem);`
`667`	`665`	`}`
`@@ -765,7 +763,7 @@ public static List<PSRepositoryInfo> Read(string[] repoNames, out string[] error`
`765`	`763`	`Int32.Parse(node.Attribute("Priority").Value),`
`766`	`764`	`Boolean.Parse(node.Attribute("Trusted").Value),`
`767`	`765`	`thisCredentialInfo,`
`768`		`- (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value));`
	`766`	`+ (PSRepositoryInfo.APIVersion)Enum.Parse(typeof(PSRepositoryInfo.APIVersion), node.Attribute("APIVersion").Value, ignoreCase: true));`
`769`	`767`
`770`	`768`	`foundRepos.Add(currentRepoItem);`
`771`	`769`	`}`
`@@ -823,30 +821,30 @@ private static PSRepositoryInfo.APIVersion GetRepoAPIVersion(Uri repoUri)`
`823`	`821`	`if (repoUri.AbsoluteUri.EndsWith("/v2", StringComparison.OrdinalIgnoreCase))`
`824`	`822`	`{`
`825`	`823`	`// Scenario: V2 server protocol repositories (i.e PSGallery)`
`826`		`- return PSRepositoryInfo.APIVersion.v2;`
	`824`	`+ return PSRepositoryInfo.APIVersion.V2;`
`827`	`825`	`}`
`828`	`826`	`else if (repoUri.AbsoluteUri.EndsWith("/index.json", StringComparison.OrdinalIgnoreCase))`
`829`	`827`	`{`
`830`	`828`	`// Scenario: V3 server protocol repositories (i.e NuGet.org, Azure Artifacts (ADO), Artifactory, Github Packages, MyGet.org)`
`831`		`- return PSRepositoryInfo.APIVersion.v3;`
	`829`	`+ return PSRepositoryInfo.APIVersion.V3;`
`832`	`830`	`}`
`833`	`831`	`else if (repoUri.AbsoluteUri.EndsWith("/nuget", StringComparison.OrdinalIgnoreCase))`
`834`	`832`	`{`
`835`	`833`	`// Scenario: ASP.Net application feed created with NuGet.Server to host packages`
`836`		`- return PSRepositoryInfo.APIVersion.nugetServer;`
	`834`	`+ return PSRepositoryInfo.APIVersion.NugetServer;`
`837`	`835`	`}`
`838`	`836`	`else if (repoUri.Scheme.Equals(Uri.UriSchemeFile, StringComparison.OrdinalIgnoreCase) \|\| repoUri.Scheme.Equals("temp", StringComparison.OrdinalIgnoreCase))`
`839`	`837`	`{`
`840`	`838`	`// repositories with Uri Scheme "temp" may have PSPath Uri's like: "Temp:\repo" and we should consider them as local repositories.`
`841`		`- return PSRepositoryInfo.APIVersion.local;`
	`839`	`+ return PSRepositoryInfo.APIVersion.Local;`
`842`	`840`	`}`
`843`	`841`	`else if (repoUri.AbsoluteUri.EndsWith(".azurecr.io") \|\| repoUri.AbsoluteUri.EndsWith(".azurecr.io/"))`
`844`	`842`	`{`
`845`		`- return PSRepositoryInfo.APIVersion.acr;`
	`843`	`+ return PSRepositoryInfo.APIVersion.ContainerRegistry;`
`846`	`844`	`}`
`847`	`845`	`else`
`848`	`846`	`{`
`849`		`- return PSRepositoryInfo.APIVersion.unknown;`
	`847`	`+ return PSRepositoryInfo.APIVersion.Unknown;`
`850`	`848`	`}`
`851`	`849`	`}`
`852`	`850`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ Describe 'Test HTTP Find-PSResource for ACR Server Protocol' -tags 'CI' {`
`18`	`18`	`if ($usingAzAuth)`
`19`	`19`	`{`
`20`	`20`	`Write-Verbose -Verbose "Using Az module for authentication"`
`21`		`- Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -Verbose`
	`21`	`+ Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -Verbose`
`22`	`22`	`}`
`23`	`23`	`else`
`24`	`24`	`{`
`25`	`25`	`$psCredInfo = New-Object Microsoft.PowerShell.PSResourceGet.UtilClasses.PSCredentialInfo ("SecretStore", "$env:TENANTID")`
`26`		`- Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose`
	`26`	`+ Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ Describe 'Test Install-PSResource for ACR scenarios' -tags 'CI' {`
`19`	`19`
`20`	`20`	`if ($usingAzAuth)`
`21`	`21`	`{`
`22`		`- Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -Verbose`
	`22`	`+ Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -Verbose`
`23`	`23`	`}`
`24`	`24`	`else`
`25`	`25`	`{`
`26`	`26`	`$psCredInfo = New-Object Microsoft.PowerShell.PSResourceGet.UtilClasses.PSCredentialInfo ("SecretStore", "$env:TENANTID")`
`27`		`- Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'acr' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose`
	`27`	`+ Register-PSResourceRepository -Name $ACRRepoName -ApiVersion 'ContainerRegistry' -Uri $ACRRepoUri -CredentialInfo $psCredInfo -Verbose`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`