Merge pull request Azure#10129 from markcowl/qq-fix-plus

Acount fixes for preview, windows powershell ci fixes

Author: markcowl

src/Accounts/Accounts/Az.Accounts.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.6.2'
+ModuleVersion = '1.6.3'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'

src/Accounts/Accounts/ChangeLog.md

@@ -19,6 +19,9 @@
 -->
 ## Upcoming Release
 
+## Version 1.6.3
+* Update telemetry and url rewriting for generated modules, fix windows unit tests.
+
 ## Version 1.6.2
 * Fixed miscellaneous typos across module
 * Support user-assigned MSI in Azure Functions Authentication (#9479)

src/Accounts/Accounts/CommonModule/EnvironmentExtensions.cs

@@ -237,8 +237,8 @@ internal static Uri PatchHost(this Uri baseUri, string newBase)
             if (baseUri.IsAbsoluteUri)
             {
                 output.Path = output.Uri.AppendPathRemoveDuplicates(baseUri.AbsolutePath);
-                output.Query = baseUri.Query;
-                output.Fragment = baseUri.Fragment;
+                output.Query = baseUri.Query?.TrimStart('?');
+                output.Fragment = baseUri.Fragment?.TrimStart('#');
                 return output.Uri;
             }
 

src/Accounts/Accounts/CommonModule/TelemetryProvider.cs

@@ -139,9 +139,11 @@ public virtual AzurePSQoSEvent CreateQosEvent(InvocationInfo invocationInfo, str
                 SessionId = correlationId,
                 ParameterSetName = parameterSetName,
                 InvocationName = invocationInfo?.InvocationName,
-                InputFromPipeline = invocationInfo?.PipelineLength > 0,
+                InputFromPipeline = invocationInfo?.PipelineLength > 0
             };
 
+            data.CustomProperties.Add("PSPreviewVersion", "4.0.0");
+
             if (invocationInfo != null)
             {
                 data.Parameters = string.Join(",", invocationInfo?.BoundParameters?.Keys?.ToArray());

src/Accounts/Accounts/CommonModule/UniqueId.cs

@@ -16,9 +16,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Net.Http;
-using Microsoft.Azure.Commands.Common.Authentication;
-using System.Net.Http.Headers;
-using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Common
 {
@@ -28,19 +25,12 @@ namespace Microsoft.Azure.Commands.Common
     /// <summary>
     /// Pipeline step for adding x-ms-unique-id header
     /// </summary>
-    public class UserAgent
+    public class UniqueId
     {
-        Version _version;
+        private static UniqueId _instance;
+        public static UniqueId Instance => UniqueId._instance ?? (UniqueId._instance = new UniqueId());
 
-        public UserAgent(InvocationInfo invocation)
-            : this(invocation?.MyCommand?.Module?.Version ?? new Version("1.0.0"))
-        {
-        }
-
-        public UserAgent(Version moduleVersion)
-        {
-            _version = moduleVersion;
-        }
+        private int count;
 
         /// <summary>
         /// Pipeline delegate to add a unique id header to an outgoing request
@@ -53,13 +43,8 @@ public UserAgent(Version moduleVersion)
         /// <returns>Amended pipeline for retrieving a response</returns>
         public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken token, Action cancel, SignalDelegate signal, NextDelegate next)
         {
-            var userAgents = AzureSession.Instance?.ClientFactory?.UserAgents ?? new ProductInfoHeaderValue[] { new ProductInfoHeaderValue("AzurePowerShell", $"Az{_version.ToString()}") };
-            // add user agent haeaders
-
-            foreach (var userAgent in userAgents)
-            {
-                request.Headers.UserAgent.Add(userAgent);
-            }
+            // add a header...
+            request.Headers.Add("x-ms-unique-id", Interlocked.Increment(ref this.count).ToString());
 
             // continue with pipeline.
             return next(request, token, cancel, signal);

src/Accounts/Accounts/CommonModule/UserAgent.cs

@@ -16,6 +16,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Net.Http;
+using Microsoft.Azure.Commands.Common.Authentication;
+using System.Net.Http.Headers;
+using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Common
 {
@@ -25,12 +28,19 @@ namespace Microsoft.Azure.Commands.Common
     /// <summary>
     /// Pipeline step for adding x-ms-unique-id header
     /// </summary>
-    public class UniqueId
+    public class UserAgent
     {
-        private static UniqueId _instance;
-        public static UniqueId Instance => UniqueId._instance ?? (UniqueId._instance = new UniqueId());
+        Version _version;
 
-        private int count;
+        public UserAgent(InvocationInfo invocation)
+            : this(invocation?.MyCommand?.Module?.Version ?? new Version("1.0.0"))
+        {
+        }
+
+        public UserAgent(Version moduleVersion)
+        {
+            _version = moduleVersion;
+        }
 
         /// <summary>
         /// Pipeline delegate to add a unique id header to an outgoing request
@@ -43,8 +53,13 @@ public class UniqueId
         /// <returns>Amended pipeline for retrieving a response</returns>
         public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken token, Action cancel, SignalDelegate signal, NextDelegate next)
         {
-            // add a header...
-            request.Headers.Add("x-ms-unique-id", Interlocked.Increment(ref this.count).ToString());
+            var userAgents = new ProductInfoHeaderValue[] { new ProductInfoHeaderValue("AzurePowerShell", $"Az4.0.0-preview") };
+            // add user agent haeaders
+
+            foreach (var userAgent in userAgents)
+            {
+                request.Headers.UserAgent.Add(userAgent);
+            }
 
             // continue with pipeline.
             return next(request, token, cancel, signal);

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("1.6.2")]
-[assembly: AssemblyFileVersion("1.6.2")]
+[assembly: AssemblyVersion("1.6.3")]
+[assembly: AssemblyFileVersion("1.6.3")]
 #if !SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Accounts.Test")]
 #endif

src/Advisor/Advisor/Az.Advisor.psd1

@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Advisor.dll'

src/Aks/Aks/Az.Aks.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\YamlDotNet.dll', '.\AutoMapper.dll'

src/AlertsManagement/AlertsManagement/Az.AlertsManagement.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.AlertsManagement.dll'

src/AnalysisServices/AnalysisServices/Az.AnalysisServices.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll'

src/ApiManagement/ApiManagement/Az.ApiManagement.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\AutoMapper.dll', 

src/ApplicationInsights/ApplicationInsights/Az.ApplicationInsights.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.ApplicationInsights.dll'

src/Attestation/Attestation/Az.Attestation.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Attestation.dll'

src/Automation/Automation/Az.Automation.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Automation.dll'

src/Batch/Batch/Az.Batch.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Batch.dll', 

src/Billing/Billing/Az.Billing.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Billing.dll', 

src/Blueprint/Blueprint/Az.Blueprint.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Blueprint.dll'

src/Cdn/Cdn/Az.Cdn.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Cdn.dll'

src/CognitiveServices/CognitiveServices/Az.CognitiveServices.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.CognitiveServices.dll'

src/Compute/Compute/Az.Compute.psd1

@@ -54,7 +54,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\AutoMapper.dll', '.\Microsoft.Azure.Management.Compute.dll', 

src/ContainerInstance/ContainerInstance/Az.ContainerInstance.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\AutoMapper.dll', 

src/ContainerRegistry/ContainerRegistry/Az.ContainerRegistry.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.ContainerRegistry.dll'

src/DataBox/DataBox/Az.DataBox.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DataBox.dll'

src/DataFactory/DataFactoryV2/Az.DataFactory.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DataFactory.dll', 

src/DataLakeAnalytics/DataLakeAnalytics/Az.DataLakeAnalytics.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DataLake.Analytics.dll'

src/DataLakeStore/DataLakeStore/Az.DataLakeStore.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DataLake.Store.dll', 

src/DataMigration/DataMigration/Az.DataMigration.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DataMigration.dll'

src/DataShare/DataShare/Az.DataShare.psd1

@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.0'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DataShare.dll'

src/DeploymentManager/DeploymentManager/Az.DeploymentManager.psd1

@@ -52,7 +52,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DeploymentManager.dll'

src/DevSpaces/DevSpaces/Az.DevSpaces.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DevSpaces.dll'

src/DevTestLabs/DevTestLabs/Az.DevTestLabs.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DevTestLabs.dll'

src/DeviceProvisioningServices/DeviceProvisioningServices/Az.DeviceProvisioningServices.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DeviceProvisioningServices.dll'

src/Dns/Dns/Az.Dns.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.3'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Dns.dll'