fix merge conflicts

Author: blueww

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# To make sure Network PRs go to the right branch, e.g. network-april
+/src/Network/    @number213

documentation/tooling/tools-common.md

@@ -208,6 +208,12 @@ The versioning tool that runs as a part of each release uses the `.json` files t
 | Minor | Additions were made to the module (_e.g._, new cmdlets, new parameters) | `1.2.3` --> `1.3.0` |
 | Patch | Bug fixes in the backend of a module or documentation updates | `1.2.3` --> `1.2.4` |
 
+Version bumping bases on installed version and changes of APIs. But it cannot handle below scenarios:
+* Module will be GAed from `0.n.n` --> `1.0.0`. The tool cannot detect this change because preview release module doesn't has `.json` file, or there is no breaking changes in current release.
+* Module has a preview release but new bumped version has the same semantic version just without `preview` label. This new version cannot be published to PSGallery. The tool needs a patch version increase.  
+
+Above scenarios can be supported by configurations `MinimalVersion.csv`. Each line contains module name and expected minimal version. If bumped version is lower than expected minital version, the tool will use minimal version for new release.
+
 ### `Issues`
 
 The `Issues` folder contains classes that represent the records that are created by the different analyzers found in static analysis. Each analyzer is responsible for implement a specific record for their analyzer that defines the following methods:
@@ -237,4 +243,4 @@ The [`ReportLogger`](https://github.com/Azure/azure-powershell/blob/01a81fbb7ea6
 
 An implementation of the `ReportLogger` abstraction can be found in this class as well, [`ReportLogger<T>`](https://github.com/Azure/azure-powershell/blob/01a81fbb7ea6c086fff2bc137053168c0fc7728a/tools/Tools.Common/Loggers/ReportLogger.cs#L68), which knows how to use the exceptions files for the different analyzers in static analysis and log records against them.
 
-For example, if a new breaking change exception is found in its analyzer, the `ReportLogger` knows to how to compare the new breaking change record created and compare it to the existing breaking change exceptions that are found in the `Exceptions` folder of `Tools.Common` to see if the new record can be ignored.
+For example, if a new breaking change exception is found in its analyzer, the `ReportLogger` knows to how to compare the new breaking change record created and compare it to the existing breaking change exceptions that are found in the `Exceptions` folder of `Tools.Common` to see if the new record can be ignored.

src/Accounts/Accounts/Accounts.csproj

@@ -22,6 +22,8 @@
     <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" />
     <StorageDependencies Include="$(RepoSrc)lib\WindowsAzure.Storage\9.3.0\Microsoft.WindowsAzure.Storage.dll" />

src/Accounts/Accounts/ChangeLog.md

@@ -18,8 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Removed alias of `Resolve-AzError`
-* Updated Add-AzEnvironment and Set-AzEnvironment to accept parameters AzureSynapseAnalyticsEndpointResourceId and AzureSynapseAnalyticsEndpointSuffix
+* Updated `Add-AzEnvironment` and `Set-AzEnvironment` to accept parameters `AzureSynapseAnalyticsEndpointResourceId` and `AzureSynapseAnalyticsEndpointSuffix`
+* Added Azure.Core related assemblies into Az.Accounts, supported PowerShell platforms include Windows PowerShell 5.1, PowerShell Core 6.2.4, PowerShell 7+
 
 ## Version 1.7.5
 * Updated Azure PowerShell survey URL in `Resolve-AzError` [#11507]

src/Accounts/Accounts/Errors/ResolveError.cs

@@ -25,6 +25,8 @@
 
 namespace Microsoft.Azure.Commands.Profile.Errors
 {
+    [GenericBreakingChange("The `Resolve-Error` alias will be removed in a future release.  Please change any scripts that use this alias to use `Resolve-AzError` instead.")]
+    [Alias("Resolve-Error")]
     [Cmdlet("Resolve", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "Error", DefaultParameterSetName = ResolveError.AnyErrorParameterSet)]
     [OutputType(typeof(AzureErrorRecord))]
     [OutputType(typeof(AzureExceptionRecord))]

src/Aks/Aks/ChangeLog.md

@@ -18,11 +18,10 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-
-* Upgrade to API Version 2019-10-01
-* Support using Windows container to create AKS
-* New cmdlets: **New-AzAksNodePool**, **Update-AzAksNodePool**, **Remove-AzAksNodePool**,
-         **Get-AzAksNodePool**, **Install-AzAksKubectl**, **Get-AzAksVersion**
+* Upgraded API Version to 2019-10-01
+* Supported to create AKS using Windows container
+* Provided new cmdlets: `New-AzAksNodePool`, `Update-AzAksNodePool`, `Remove-AzAksNodePool`,
+         `Get-AzAksNodePool`, `Install-AzAksKubectl`, `Get-AzAksVersion`
 
 ## Version 1.1.0-preview
 * Upgrade to API Version 2019-10-01

src/ApiManagement/ApiManagement/ChangeLog.md

@@ -24,12 +24,12 @@
 * `New-AzApiManagementProperty`: renamed as `New-AzApiManagementNamedValue`. PropertyId parameter renamed as NamedValueId. 
 * `Set-AzApiManagementProperty`: renamed as `Set-AzApiManagementNamedValue`. PropertyId parameter renamed as NamedValueId.
 * `Remove-AzApiManagementProperty`: renamed as `Remove-AzApiManagementNamedValue`. PropertyId parameter renamed as NamedValueId.
-* new `Get-AzApiManagementAuthorizationServerClientSecret` cmdlet added. `Get-AzApiManagementAuthorizationServer` will not return client secret anymore.
-* new `Get-AzApiManagementNamedValueSecretValue` cmdlet added. `Get-AzApiManagementNamedValue` will not return secret value.
-* new `Get-AzApiManagementOpenIdConnectProviderClientSecret` cmdlet added. `Get-AzApiManagementOpenIdConnectProvider` will not return client secret anymore.
-* new `Get-AzApiManagementSubscriptionKey` cmdlet added. `Get-AzApiManagementSubscription` will not return subscription keys anymore.
-* new `Get-AzApiManagementTenantAccessSecret` cmdlet added. `Get-AzApiManagementTenantAccess` will not return keys anymore.
-* new `Get-AzApiManagementTenantGitAccessSecret` cmdlet added. `Get-AzApiManagementTenantGitAccess` will not return keys anymore.
+* Added new `Get-AzApiManagementAuthorizationServerClientSecret` cmdlet and `Get-AzApiManagementAuthorizationServer` will not return client secret anymore.
+* Added new `Get-AzApiManagementNamedValueSecretValue` cmdlet and `Get-AzApiManagementNamedValue` will not return secret value.
+* Added new `Get-AzApiManagementOpenIdConnectProviderClientSecret` cmdlet and `Get-AzApiManagementOpenIdConnectProvider` will not return client secret anymore.
+* Added new `Get-AzApiManagementSubscriptionKey` cmdlet and `Get-AzApiManagementSubscription` will not return subscription keys anymore.
+* Added new `Get-AzApiManagementTenantAccessSecret` cmdlet and `Get-AzApiManagementTenantAccess` will not return keys anymore.
+* Added new `Get-AzApiManagementTenantGitAccessSecret` cmdlet and `Get-AzApiManagementTenantGitAccess` will not return keys anymore.
 
 ## Version 1.4.1
 * Added breaking change notice for Azure File cmdlets output change in a future release

src/AppConfiguration/AppConfiguration.sln

@@ -0,0 +1,48 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{62843FE6-7575-4D88-B989-7DF7EEC0BC01}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{442C609B-A431-4A71-B289-08F0B63C83E5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Az.AppConfiguration", "Az.AppConfiguration.csproj", "{967FAB03-A165-41CC-B3B5-02A73B88F7F9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62843FE6-7575-4D88-B989-7DF7EEC0BC01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{442C609B-A431-4A71-B289-08F0B63C83E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{442C609B-A431-4A71-B289-08F0B63C83E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{442C609B-A431-4A71-B289-08F0B63C83E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{442C609B-A431-4A71-B289-08F0B63C83E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59E8F6B8-8F0E-403F-B88B-9736DBC396D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{967FAB03-A165-41CC-B3B5-02A73B88F7F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{967FAB03-A165-41CC-B3B5-02A73B88F7F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{967FAB03-A165-41CC-B3B5-02A73B88F7F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{967FAB03-A165-41CC-B3B5-02A73B88F7F9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {F9B3D96E-9680-40BE-A917-02EE655D6030}
+	EndGlobalSection
+EndGlobal

src/AppConfiguration/Az.AppConfiguration.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <PsModuleName>AppConfiguration</PsModuleName>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)..\Az.autorest.props" />
+</Project>