Azure · BethanyZhou · Nov 18, 2022 · Nov 17, 2022 · Nov 17, 2022 · Nov 17, 2022
diff --git a/src/Aks/Aks/Aks.csproj b/src/Aks/Aks/Aks.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="YamlDotNet.Signed" Version="5.2.1" />
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerService" Version="1.2.0" />
   </ItemGroup>
 

diff --git a/src/Aks/Aks/Az.Aks.psd1 b/src/Aks/Aks/Az.Aks.psd1
@@ -56,7 +56,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.2'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'YamlDotNet.dll', 'AutoMapper.dll', 
+RequiredAssemblies = 'YamlDotNet.dll', 'Microsoft.Azure.PowerShell.AutoMapper.dll', 
                'Microsoft.Azure.Management.ContainerService.dll', 
                'Aks.Autorest\bin\Az.Aks.private.dll'
 

diff --git a/src/Aks/Aks/ChangeLog.md b/src/Aks/Aks/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded AutoMapper to Microsoft.Azure.PowerShell.AutoMapper 6.2.2 with fix [#18721]
 
 ## Version 5.0.0
 * [Breaking Change] Removed the alias `Install-AzAksKubectl` of `Install-AzAksCliTool`.

diff --git a/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj b/src/ApiManagement/ApiManagement.ServiceManagement/ApiManagement.ServiceManagement.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="8.0.0-preview" />
   </ItemGroup>
 

diff --git a/src/ApiManagement/ApiManagement/ApiManagement.csproj b/src/ApiManagement/ApiManagement/ApiManagement.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="8.0.0-preview" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>

diff --git a/src/ApiManagement/ApiManagement/Az.ApiManagement.psd1 b/src/ApiManagement/ApiManagement/Az.ApiManagement.psd1
@@ -56,7 +56,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.2'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'AutoMapper.dll', 'Microsoft.Azure.Management.ApiManagement.dll', 
+RequiredAssemblies = 'Microsoft.Azure.PowerShell.AutoMapper.dll', 'Microsoft.Azure.Management.ApiManagement.dll', 
                'Microsoft.WindowsAzure.Storage.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.

diff --git a/src/ApiManagement/ApiManagement/ChangeLog.md b/src/ApiManagement/ApiManagement/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded AutoMapper to Microsoft.Azure.PowerShell.AutoMapper 6.2.2 with fix [#18721]
 
 ## Version 4.0.0
 * [Breaking Change] Changed the type of parameter `Sku` from Enum to String in `Add-AzApiManagementRegion`, `New-AzApiManagement` and `Update-AzApiManagementRegion`.

diff --git a/src/Compute/Compute/Az.Compute.psd1 b/src/Compute/Compute/Az.Compute.psd1
@@ -57,7 +57,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.3'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'AutoMapper.dll', 'Microsoft.Azure.Management.Compute.dll', 
+RequiredAssemblies = 'Microsoft.Azure.PowerShell.AutoMapper.dll', 'Microsoft.Azure.Management.Compute.dll', 
                'Microsoft.WindowsAzure.Storage.dll', 
                'Microsoft.Azure.Management.ResourceGraph.dll', 
                'Compute.Autorest\bin\Az.Compute.private.dll', 

diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md
@@ -20,6 +20,7 @@
 
 -->
 ## Upcoming Release
+* Upgraded AutoMapper to Microsoft.Azure.PowerShell.AutoMapper 6.2.2 with fix [#18721]
 
 ## Version 5.1.0
 * Fixed EdgeZone does not pass to VM for `New-AzVM` "SimpleParameterSet" [#18978] 

diff --git a/src/Compute/Compute/Compute.csproj b/src/Compute/Compute/Compute.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.ResourceGraph" Version="2.1.0" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="58.0.0" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />

diff --git a/src/Maintenance/Maintenance/Az.Maintenance.psd1 b/src/Maintenance/Maintenance/Az.Maintenance.psd1
@@ -56,7 +56,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.7.4'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'AutoMapper.dll', 'Microsoft.Azure.Management.Maintenance.dll'
+RequiredAssemblies = 'Microsoft.Azure.PowerShell.AutoMapper.dll', 'Microsoft.Azure.Management.Maintenance.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

diff --git a/src/Maintenance/Maintenance/ChangeLog.md b/src/Maintenance/Maintenance/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Upgraded AutoMapper to Microsoft.Azure.PowerShell.AutoMapper 6.2.2 with fix [#18721]
 
 ## Version 1.2.0
 * Added Guest patch maintenance support.

diff --git a/src/Maintenance/Maintenance/Maintenance.csproj b/src/Maintenance/Maintenance/Maintenance.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.Maintenance" Version="1.4.0-preview" />
   </ItemGroup>
 

diff --git a/src/Monitor/Monitor/Az.Monitor.psd1 b/src/Monitor/Monitor/Az.Monitor.psd1
@@ -56,7 +56,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.2'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'Microsoft.Azure.Management.Monitor.dll', 'AutoMapper.dll', 
+RequiredAssemblies = 'Microsoft.Azure.Management.Monitor.dll', 'Microsoft.Azure.PowerShell.AutoMapper.dll', 
                'ActivityLogAlert.Autorest\bin\Az.ActivityLogAlert.private.dll', 
                'DiagnosticSetting.Autorest\bin\Az.DiagnosticSetting.private.dll', 
                'ScheduledQueryRule.Autorest\bin\Az.ScheduledQueryRule.private.dll', 

diff --git a/src/Monitor/Monitor/ChangeLog.md b/src/Monitor/Monitor/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Upgraded AutoMapper to Microsoft.Azure.PowerShell.AutoMapper 6.2.2 with fix [#18721]
 
 ## Version 4.2.0
 * [Breaking Change] Upgraded API version for ActivityLogAlert from 2017-04-01 to 2020-10-01, affected cmdlets:

diff --git a/src/Monitor/Monitor/Monitor.csproj b/src/Monitor/Monitor/Monitor.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.26.0-preview" />
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />

diff --git a/src/Network/Network/Az.Network.psd1 b/src/Network/Network/Az.Network.psd1
@@ -56,7 +56,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.3'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'AutoMapper.dll', 'Microsoft.Azure.Management.Network.dll'
+RequiredAssemblies = 'Microsoft.Azure.PowerShell.AutoMapper.dll', 'Microsoft.Azure.Management.Network.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

diff --git a/src/Network/Network/ChangeLog.md b/src/Network/Network/ChangeLog.md
@@ -19,6 +19,7 @@
 --->
 
 ## Upcoming Release
+* Upgraded AutoMapper to Microsoft.Azure.PowerShell.AutoMapper 6.2.2 with fix [#18721]
 
 ## Version 5.1.1
 * Fixed bug with New-AzCustomIpPrefix

diff --git a/src/Network/Network/Network.csproj b/src/Network/Network/Network.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="24.0.0" />
   </ItemGroup>
 

diff --git a/src/Peering/Peering/Az.Peering.psd1 b/src/Peering/Peering/Az.Peering.psd1
@@ -56,7 +56,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.7.4'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'Microsoft.Azure.Management.Peering.dll', 'AutoMapper.dll'
+RequiredAssemblies = 'Microsoft.Azure.Management.Peering.dll', 'Microsoft.Azure.PowerShell.AutoMapper.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

diff --git a/src/Peering/Peering/ChangeLog.md b/src/Peering/Peering/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded AutoMapper to Microsoft.Azure.PowerShell.AutoMapper 6.2.2 with fix [#18721]
 
 ## Version 0.3.0
 * Added support for cdn peering prefixes

diff --git a/src/Peering/Peering/Peering.csproj b/src/Peering/Peering/Peering.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.Peering" Version="2.1.1" />
   </ItemGroup>
 

diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj b/src/RecoveryServices/RecoveryServices.SiteRecovery/RecoveryServices.SiteRecovery.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.3.3-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.2.0-preview" />
   </ItemGroup>

diff --git a/src/RecoveryServices/RecoveryServices/Az.RecoveryServices.psd1 b/src/RecoveryServices/RecoveryServices/Az.RecoveryServices.psd1
@@ -57,7 +57,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.3'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'AutoMapper.dll', 
+RequiredAssemblies = 'Microsoft.Azure.PowerShell.AutoMapper.dll', 
                'Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.Backup.Models.dll', 
                'Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.Backup.Helpers.dll', 
                'Microsoft.Azure.PowerShell.Cmdlets.RecoveryServices.Backup.Logger.dll', 

diff --git a/src/RecoveryServices/RecoveryServices/ChangeLog.md b/src/RecoveryServices/RecoveryServices/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded AutoMapper to Microsoft.Azure.PowerShell.AutoMapper 6.2.2 with fix [#18721]
 
 ## Version 6.1.0
 * Added support for cross zonal restore for ZRS vaults for non-ZonePinned VM

diff --git a/src/Resources/ResourceManager/ResourceManager.csproj b/src/Resources/ResourceManager/ResourceManager.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.2.2" />
+    <PackageReference Include="Microsoft.Azure.PowerShell.AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.3-preview" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />

diff --git a/src/Resources/Resources/Az.Resources.psd1 b/src/Resources/Resources/Az.Resources.psd1
@@ -64,7 +64,7 @@ RequiredAssemblies = 'Microsoft.Azure.Management.Authorization.dll',
                'Microsoft.Extensions.DependencyInjection.Abstractions.dll', 
                'Microsoft.Extensions.Options.dll', 
                'Microsoft.Extensions.Primitives.dll', 
-               'System.Runtime.CompilerServices.Unsafe.dll', 'AutoMapper.dll', 
+               'System.Runtime.CompilerServices.Unsafe.dll', 'Microsoft.Azure.PowerShell.AutoMapper.dll', 
                'MSGraph.Autorest\bin\Az.MSGraph.private.dll', 
                'Authorization.Autorest\bin\Az.Authorization.private.dll'
 

diff --git a/src/Resources/Resources/ChangeLog.md b/src/Resources/Resources/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Upgraded AutoMapper to Microsoft.Azure.PowerShell.AutoMapper 6.2.2 with fix [#18721]
 
 ## Version 6.4.0
 * Fixed parameter `Count` for

diff --git a/tools/CleanupBuild.ps1 b/tools/CleanupBuild.ps1
@@ -50,7 +50,9 @@ foreach($RMPath in $resourceManagerPaths)
 
         $acceptedDlls = @(
             # netcoreapp, can't be in RequiredAssemblies, but we need to pack it
-            "Microsoft.Azure.PowerShell.AuthenticationAssemblyLoadContext.dll"
+            "Microsoft.Azure.PowerShell.AuthenticationAssemblyLoadContext.dll",
+            # customized AutoMapper
+            "Microsoft.Azure.PowerShell.AutoMapper.dll"
         )
 
         # NestedModule Assemblies may have a folder path, just getting the dll name alone