merge

documentation/azure-powershell-modules.md

@@ -65,6 +65,7 @@ Managed Services                      | `Az.ManagedServices`
 Management Partner                    | `Az.ManagementPartner`                  | [![ManagementPartner]][ManagementPartnerGallery]
 Maps                                  | `Az.Maps`                               | [![Maps]][MapsGallery]
 Database for MariaDB                  | `Az.MariaDb`                            | [![MariaDb]][MariaDbGallery]
+Marketplace                           | `Az.Marketplace`                        | [![Marketplace]][MarketplaceGallery]
 Marketplace Ordering                  | `Az.MarketplaceOrdering`                | [![MarketplaceOrdering]][MarketplaceOrderingGallery]
 Media                                 | `Az.Media`                              | [![Media]][MediaGallery]
 Mixed Reality                         | `Az.MixedReality`                       | [![MixedReality]][MixedRealityGallery]
@@ -163,6 +164,7 @@ Web App Service                       | `Az.Websites`
 [ManagementPartner]:          https://img.shields.io/powershellgallery/v/Az.ManagementPartner.svg?style=flat-square&label=Az.ManagementPartner
 [Maps]:                       https://img.shields.io/powershellgallery/v/Az.Maps.svg?style=flat-square&label=Az.Maps
 [MariaDb]:                    https://img.shields.io/powershellgallery/v/Az.MariaDb.svg?style=flat-square&label=Az.MariaDb
+[Marketplace]:                https://img.shields.io/powershellgallery/v/Az.Marketplace.svg?style=flat-square&label=Az.Marketplace
 [MarketplaceOrdering]:        https://img.shields.io/powershellgallery/v/Az.MarketplaceOrdering.svg?style=flat-square&label=Az.MarketplaceOrdering
 [Media]:                      https://img.shields.io/powershellgallery/v/Az.Media.svg?style=flat-square&label=Az.Media
 [MixedReality]:               https://img.shields.io/powershellgallery/v/Az.MixedReality.svg?style=flat-square&label=Az.MixedReality
@@ -259,6 +261,7 @@ Web App Service                       | `Az.Websites`
 [ManagementPartnerGallery]:          https://www.powershellgallery.com/packages/Az.ManagementPartner/
 [MapsGallery]:                       https://www.powershellgallery.com/packages/Az.Maps/
 [MariaDbGallery]:                    https://www.powershellgallery.com/packages/Az.MariaDb/
+[MarketplaceGallery]:                https://www.powershellgallery.com/packages/Az.Marketplace/
 [MarketplaceOrderingGallery]:        https://www.powershellgallery.com/packages/Az.MarketplaceOrdering/
 [MediaGallery]:                      https://www.powershellgallery.com/packages/Az.Media/
 [MixedRealityGallery]:               https://www.powershellgallery.com/packages/Az.MixedReality/

src/Accounts/Accounts.Test/EnvironmentCmdletTests.cs

@@ -16,7 +16,6 @@
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
-using Microsoft.Azure.Commands.Profile;
 using Microsoft.Azure.Commands.Profile.Models;
 using Microsoft.Azure.Commands.Profile.Utilities;
 using Microsoft.Azure.Commands.ResourceManager.Common;
@@ -61,7 +60,7 @@ public void AddsAzureEnvironment()
             var cmdlet = new AddAzureRMEnvironmentCommand()
             {
                 CommandRuntime = commandRuntimeMock.Object,
-                Name = "Katal",
+                Name = "Katal"
             };
             var dict =new Dictionary<string, object>
             {
@@ -74,6 +73,7 @@ public void AddsAzureEnvironment()
             };
 
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
             cmdlet.InvokeEndProcessing();
@@ -189,6 +189,7 @@ public void AddsEnvironmentMultipleTimes()
             dict["PublishSettingsFileUrl"] = "http://microsoft.com";
             dict["EnableAdfsAuthentication"] = true;
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
 
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
@@ -211,6 +212,7 @@ public void AddsEnvironmentMultipleTimes()
             dict.Clear();
             dict["EnableAdfsAuthentication"] = true;
             cmdlet2.SetBoundParameters(dict);
+            cmdlet2.SetParameterSet("Name");
 
             cmdlet2.InvokeBeginProcessing();
             cmdlet2.ExecuteCmdlet();
@@ -229,6 +231,7 @@ public void AddsEnvironmentMultipleTimes()
             };
             dict.Clear();
             cmdlet3.SetBoundParameters(dict);
+            cmdlet3.SetParameterSet("Name");
 
             cmdlet3.InvokeBeginProcessing();
             cmdlet3.ExecuteCmdlet();
@@ -257,6 +260,7 @@ public void AddsEnvironmentWithMinimumInformation()
             dict["EnableAdfsAuthentication"] = true;
             dict["PublishSettingsFileUrl"] = "http://microsoft.com";
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
             cmdlet.InvokeEndProcessing();
@@ -337,6 +341,7 @@ public void AddsEnvironmentWithStorageEndpoint()
                 StorageEndpoint = "core.windows.net",
             };
 
+            cmdlet.SetParameterSet("Name");
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
             cmdlet.InvokeEndProcessing();
@@ -412,6 +417,7 @@ public void CanCreateEnvironmentWithAllProperties()
             dict["AzureSynapseAnalyticsEndpointResourceId"] = "AzureSynapseAnalyticsEndpointResourceId";
             dict["AzureSynapseAnalyticsEndpointSuffix"] = "https://AzureSynapseAnalytics";
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
 
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();
@@ -487,6 +493,8 @@ public void CreateEnvironmentWithTrailingSlashInActiveDirectory()
             var dict = new Dictionary<string, object>();
             dict["ActiveDirectoryEndpoint"] = "https://ActiveDirectoryEndpoint/";
             cmdlet.SetBoundParameters(dict);
+            cmdlet.SetParameterSet("Name");
+
             SetupConfirmation(commandRuntimeMock);
             cmdlet.InvokeBeginProcessing();
             cmdlet.ExecuteCmdlet();

src/Accounts/Accounts/Accounts.csproj

@@ -11,21 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Newtonsoft.Json.10.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Buffers.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Net.Http.WinHttpHandler.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Private.ServiceModel.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Reflection.DispatchProxy.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.AccessControl.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.Permissions.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.Security.Principal.Windows.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\System.ServiceModel.Primitives.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetFx\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetFx\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" />
-    <PreLoadAssemblies Include="$(RepoSrc)lib\Azure.Core\PreloadAssemblies\*.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Azure.Core\NetCoreAssemblies\*.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetCore\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
-    <NetCoreAssemblies Include="$(RepoSrc)lib\Microsoft.IdentityModel.Clients.ActiveDirectory\NetCore\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" />
+    <PreLoadAssemblies Include="$(RepoSrc)lib\NetFxPreloadAssemblies\*.dll" />
+    <NetCoreAssemblies Include="$(RepoSrc)lib\NetCorePreloadAssemblies\*.dll" />
     <StorageDependencies Include="$(RepoSrc)lib\WindowsAzure.Storage\9.3.0\Microsoft.WindowsAzure.Storage.dll" />
     <StorageDependencies Include="$(RepoSrc)lib\WindowsAzure.Storage\9.3.0\Microsoft.WindowsAzure.Storage.DataMovement.dll" />
   </ItemGroup>
@@ -38,10 +25,12 @@
     <Copy SourceFiles="@(PreLoadAssemblies)" DestinationFolder="$(TargetDir)\PreloadAssemblies" />
     <Copy SourceFiles="@(NetCoreAssemblies)" DestinationFolder="$(TargetDir)\NetCoreAssemblies" />
     <Copy SourceFiles="@(StorageDependencies)" DestinationFolder="$(TargetDir)" />
+    <Copy SourceFiles="$(RepoSrc)lib\PreloadAssemblyInfo.json" DestinationFolder="$(TargetDir)" />
   </Target>
 
   <ItemGroup>
     <None Update="StartupScripts\AzError.ps1" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="StartupScripts\InitializeAssemblyResolver.ps1" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
     <None Update="PostImportScripts\LoadAuthenticators.ps1" CopyToOutputDirectory="PreserveNewest" />

src/Accounts/Accounts/Accounts.generated.format.ps1xml

@@ -20,6 +20,10 @@
             <Alignment>Left</Alignment>
             <Label>ActiveDirectory Authority</Label>
           </TableColumnHeader>
+          <TableColumnHeader>
+            <Alignment>Left</Alignment>
+            <Label>Type</Label>
+          </TableColumnHeader>
         </TableHeaders>
         <TableRowEntries>
           <TableRowEntry>
@@ -36,6 +40,10 @@
                 <Alignment>Left</Alignment>
                 <PropertyName>ActiveDirectoryAuthority</PropertyName>
               </TableColumnItem>
+              <TableColumnItem>
+                <Alignment>Left</Alignment>
+                <PropertyName>Type</PropertyName>
+              </TableColumnItem>
             </TableColumnItems>
           </TableRowEntry>
         </TableRowEntries>

src/Accounts/Accounts/AzureRmAlias/Mappings.json

@@ -1488,6 +1488,11 @@
     "Set-AzVirtualNetworkGatewayConnectionSharedKey": "Set-AzureRmVirtualNetworkGatewayConnectionSharedKey",
     "Set-AzVirtualNetworkGatewayConnection": "Set-AzureRmVirtualNetworkGatewayConnection",
     "New-AzIpsecPolicy": "New-AzureRmIpsecPolicy",
+    "Get-AzLoadBalancerBackendAddressPool": "Get-AzureRmLoadBalancerBackendAddressPool",
+    "Set-AzLoadBalancerBackendAddressPool": "Set-AzureRmLoadBalancerBackendAddressPool",
+    "New-AzLoadBalancerBackendAddressPool": "New-AzureRmLoadBalancerBackendAddressPool",
+    "Remove-AzLoadBalancerBackendAddressPool": "Remove-AzureRmLoadBalancerBackendAddressPool",
+    "New-AzLoadBalancerBackendAddressConfig": "New-AzureRmLoadBalancerBackendAddressConfig",
     "Get-AzLoadBalancerBackendAddressPoolConfig": "Get-AzureRmLoadBalancerBackendAddressPoolConfig",
     "Add-AzLoadBalancerBackendAddressPoolConfig": "Add-AzureRmLoadBalancerBackendAddressPoolConfig",
     "New-AzLoadBalancerBackendAddressPoolConfig": "New-AzureRmLoadBalancerBackendAddressPoolConfig",

src/Accounts/Accounts/ChangeLog.md

@@ -18,6 +18,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Supported discovering environment setting by default and adding environment via `Add-AzEnvironment`
+* Update preloaded assemblies [#12024], [#11976]
+* Updated Azure.Core assembly
 * Fixed an issue that may cause `Connect-AzAccount` to fail in multi-threaded execution [#11201]
 
 ## Version 1.8.1