Merge branch 'main' of https://github.com/Azure/azure-powershell into nanxiang/Az.ConnectedKubernetes

Author: Nickcandy

documentation/azure-powershell-modules.md

@@ -105,6 +105,7 @@ Marketplace Ordering                  | `Az.MarketplaceOrdering`
 Media                                 | `Az.Media`                              | [![Media]][MediaGallery]
 Migrate                               | `Az.Migrate`                            | [![Migrate]][MigrateGallery]
 Mixed Reality                         | `Az.MixedReality`                       | [![MixedReality]][MixedRealityGallery]
+Mobile Network                        | `Az.MobileNetwork`                      | [![MobileNetwork]][MobileNetworkGallery]
 Monitor                               | `Az.Monitor`                            | [![Monitor]][MonitorGallery]
 Monitoring Solutions                  | `Az.MonitoringSolutions`                | [![MonitoringSolutions]][MonitoringSolutionsGallery]
 Database for MySQL                    | `Az.MySql`                              | [![MySql]][MySqlGallery]
@@ -257,6 +258,7 @@ Windows Iot Services                  | `Az.WindowsIotServices`
 [Media]:                      https://img.shields.io/powershellgallery/v/Az.Media.svg?style=flat-square&label=Az.Media
 [Migrate]:                    https://img.shields.io/powershellgallery/v/Az.Migrate.svg?style=flat-square&label=Az.Migrate
 [MixedReality]:               https://img.shields.io/powershellgallery/v/Az.MixedReality.svg?style=flat-square&label=Az.MixedReality
+[MobileNetwork]:              https://img.shields.io/powershellgallery/v/Az.MobileNetwork.svg?style=flat-square&label=Az.MobileNetwork
 [Monitor]:                    https://img.shields.io/powershellgallery/v/Az.Monitor.svg?style=flat-square&label=Az.Monitor
 [MonitoringSolutions]:        https://img.shields.io/powershellgallery/v/Az.MonitoringSolutions.svg?style=flat-square&label=Az.MonitoringSolutions
 [MySql]:                      https://img.shields.io/powershellgallery/v/Az.MySql.svg?style=flat-square&label=Az.MySql
@@ -407,6 +409,7 @@ Windows Iot Services                  | `Az.WindowsIotServices`
 [MediaGallery]:                      https://www.powershellgallery.com/packages/Az.Media/
 [MigrateGallery]:                    https://www.powershellgallery.com/packages/Az.Migrate/
 [MixedRealityGallery]:               https://www.powershellgallery.com/packages/Az.MixedReality/
+[MobileNetworkGallery]:              https://www.powershellgallery.com/packages/Az.MobileNetwork/
 [MonitorGallery]:                    https://www.powershellgallery.com/packages/Az.Monitor/
 [MonitoringSolutionsGallery]:        https://www.powershellgallery.com/packages/Az.MonitoringSolutions/
 [MySqlGallery]:                      https://www.powershellgallery.com/packages/Az.MySql/

src/Accounts/Accounts/Az.Accounts.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 1/6/2023
+# Generated on: 1/12/2023
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '2.11.0'
+ModuleVersion = '2.11.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -147,11 +147,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Supported Web Account Manager (WAM) as an opt-in interactive login experience. Enable it by ''Update-AzConfig -EnableLoginByWam True''.
-* Optimized the mechanism for assembly loading.
-* Enabled AzKeyStore with keyring in Linux.
-* Fixed a typo in GetAzureRmContextAutosaveSetting.cs changing the cmdlet class name to GetAzureRmContextAutosaveSetting
-* Removed survey on error message in ''Resolve-AzError''. [#20398]'
+        ReleaseNotes = '* Fixed an issue where Az.Accounts cannot be imported correctly. [#20615]'
 
         # Prerelease string of this module
         # Prerelease = ''

src/Accounts/Accounts/ChangeLog.md

@@ -20,6 +20,9 @@
 
 ## Upcoming Release
 
+## Version 2.11.1
+* Fixed an issue where Az.Accounts cannot be imported correctly. [#20615]
+
 ## Version 2.11.0
 * Supported Web Account Manager (WAM) as an opt-in interactive login experience. Enable it by `Update-AzConfig -EnableLoginByWam $true`.
 * Optimized the mechanism for assembly loading.

src/Accounts/Accounts/Properties/AssemblyInfo.cs

@@ -43,8 +43,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.11.0")]
-[assembly: AssemblyFileVersion("2.11.0")]
+[assembly: AssemblyVersion("2.11.1")]
+[assembly: AssemblyFileVersion("2.11.1")]
 #if !SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Accounts.Test")]
 #endif

src/Accounts/Accounts/StartupScripts/InitializeAssemblyResolver.ps1

@@ -1,5 +1,7 @@
 $assemblyRootPath = [System.IO.Path]::Combine($PSScriptRoot, "..", "lib")
-$conditionalAssemblyContext = [Microsoft.Azure.PowerShell.AssemblyLoading.ConditionalAssemblyContext]::new($Host.Version)
+Write-Debug "Initializing ConditionalAssemblyContext. PSEdition is [$($PSVersionTable.PSEdition)]. PSVersion is [$($PSVersionTable.PSVersion)]."
+$conditionalAssemblyContext = [Microsoft.Azure.PowerShell.AssemblyLoading.ConditionalAssemblyContext]::new($PSVersionTable.PSEdition, $PSVersionTable.PSVersion)
+Write-Debug "Initializing ConditionalAssemblyProvider. AssemblyRootPath is [$assemblyRootPath]."
 [Microsoft.Azure.PowerShell.AssemblyLoading.ConditionalAssemblyProvider]::Initialize($assemblyRootPath, $conditionalAssemblyContext)
 
 if ($PSEdition -eq 'Desktop') {

src/Accounts/AssemblyLoading.Test/Mocks/MockConditionalAssemblyContext.cs

@@ -19,6 +19,7 @@ namespace Microsoft.Azure.PowerShell.AssemblyLoading.Test.Mocks
 {
     internal class MockConditionalAssemblyContext : IConditionalAssemblyContext
     {
+        public string PSEdition { get; set; }
         public Version PSVersion { get; set; }
         public Architecture OSArchitecture { get; set; }
         public OSPlatform OS { get; set; }

src/Accounts/AssemblyLoading.Test/UnitTests/ConditionalAssemblyExtensionsTests.cs

@@ -28,6 +28,7 @@ public void CanWorkWithPSVersion()
         {
             var windowsPSContext = new MockConditionalAssemblyContext()
             {
+                PSEdition = Constants.PSEditionDesktop,
                 PSVersion = Version.Parse("5.1.22621.608")
             };
             var windowsPSAssembly = new MockConditionalAssembly(windowsPSContext)
@@ -40,6 +41,7 @@ public void CanWorkWithPSVersion()
 
             var ps7Context = new MockConditionalAssemblyContext()
             {
+                PSEdition = Constants.PSEditionCore,
                 PSVersion = Version.Parse("7.3.0")
             };
             windowsPSAssembly = new MockConditionalAssembly(
@@ -52,6 +54,23 @@ public void CanWorkWithPSVersion()
             Assert.False(windowsPSAssembly.ShouldLoad);
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void CanWorkWithEmptyPSEdition()
+        {
+            var windowsPSContext = new MockConditionalAssemblyContext()
+            {
+                PSVersion = Version.Parse("1.0.0.0")
+            };
+            var windowsPSAssembly = new MockConditionalAssembly(windowsPSContext)
+                .WithWindowsPowerShell();
+            var psCoreAssembly = new MockConditionalAssembly(
+                windowsPSContext)
+                .WithPowerShellCore();
+            Assert.True(windowsPSAssembly.ShouldLoad);
+            Assert.False(psCoreAssembly.ShouldLoad);
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void CanWorkWithOS()

src/Accounts/AssemblyLoading.Test/UnitTests/ConditionalAssemblyProviderTests.cs

@@ -35,6 +35,7 @@ public void CanGetAssembliesOnWindowsPowerShell()
             var context = new MockConditionalAssemblyContext()
             {
                 OS = OSPlatform.Windows,
+                PSEdition = Constants.PSEditionDesktop,
                 PSVersion = Version.Parse("5.1.22621.608"),
                 OSArchitecture = Architecture.X64
             };
@@ -57,6 +58,7 @@ public void CanGetAssembliesOnPowerShellCorePlus()
             var context = new MockConditionalAssemblyContext()
             {
                 OS = OSPlatform.Windows,
+                PSEdition = Constants.PSEditionCore,
                 PSVersion = Version.Parse("7.3.0"),
                 OSArchitecture = Architecture.X64
             };

src/Accounts/AssemblyLoading.Test/UnitTests/ConditionalAssemblyTests.cs

@@ -37,7 +37,10 @@ public void ShouldLoadAssemblyAccordingToPSVersion()
         {
             // windows powershell
             var context = new MockConditionalAssemblyContext()
-            { PSVersion = Version.Parse("5.1.22621.608") };
+            {
+                PSEdition = Constants.PSEditionDesktop,
+                PSVersion = Version.Parse("5.1.22621.608")
+            };
             var windowsPSAssembly = NewDummyAssembly(context).WithWindowsPowerShell();
             var psCoreAssembly = NewDummyAssembly(context).WithPowerShellCore();
             var neturalAssembly = NewDummyAssembly(context);
@@ -46,6 +49,7 @@ public void ShouldLoadAssemblyAccordingToPSVersion()
             Assert.True(neturalAssembly.ShouldLoad);
 
             // powershell core and 7+
+            context.PSEdition = Constants.PSEditionCore;
             context.PSVersion = Version.Parse("7.3.0");
             windowsPSAssembly = NewDummyAssembly(context).WithWindowsPowerShell();
             psCoreAssembly = NewDummyAssembly(context).WithPowerShellCore();

src/Accounts/AssemblyLoading/ConditionalAssemblyContext.cs

@@ -20,11 +20,15 @@ namespace Microsoft.Azure.PowerShell.AssemblyLoading
     /// <inheritdoc/>
     public class ConditionalAssemblyContext : IConditionalAssemblyContext
     {
-        public ConditionalAssemblyContext(Version psVersion)
+        public ConditionalAssemblyContext(string psEdition, Version psVersion)
         {
+            PSEdition = psEdition;
             PSVersion = psVersion;
         }
 
+        /// <inheritdoc/>
+        public string PSEdition { get; private set; }
+
         /// <inheritdoc/>
         public Version PSVersion { get; private set; }