resolve merge conflicts

Author: yifanz7

.azure-pipelines/daily-build.yml

@@ -58,7 +58,7 @@ jobs:
       script: |
         $command = "`$PSVersionTable `
         Get-PSRepository `
-        ./tools/RunVersionController.ps1 -Release 'Daily Build $(today)' `
+        ./tools/RunVersionController.ps1 -Release 'Daily Build $(today)' -ReleaseType $(ReleaseType)`
         Exit"
         dotnet tool run pwsh -c $command
 
@@ -77,20 +77,15 @@ jobs:
       arguments: 'build.proj /t:Build /p:Configuration=Release;TurnOnTestCoverage=true;ModifiedModuleBuild=true'
 
   - task: EsrpCodeSigning@4
+    displayName: "Sign Dll [Authenticode + Strong Name]"
     inputs:
       ConnectedServiceName: '$(signServiceConnection)'
       FolderPath: 'artifacts'
       Pattern: |
-        Release/**/Microsoft*Azure*PowerShell*Cmdlets*.dll
-        Release/**/Microsoft.Azure.PowerShell.*.Sdk.dll
+        Release/**/Microsoft*Azure*PowerShell*.dll
         Release/**/Az.*.private.dll
-        Release/**/Microsoft.Azure.PowerShell.AssemblyLoading.dll
-        Release/**/Microsoft.Azure.PowerShell.Authentication.dll
-        Release/**/Microsoft.Azure.PowerShell.Authentication.ResourceManager.dll
-        Release/**/Microsoft.Azure.PowerShell.Authenticators.dll
-        Release/**/Microsoft.Azure.PowerShell.AuthenticationAssemblyLoadContext.dll
         Release/**/Microsoft.Azure.Commands.*.AlcWrapper.dll
-        !Release/**/Microsoft*Azure*PowerShell*Cmdlets*.Test.dll
+        InstallerChecks.dll
       UseMinimatch: true
       signConfigType: 'inlineSignParams'
       inlineOperation: |
@@ -133,7 +128,42 @@ jobs:
       SessionTimeout: '60'
       MaxConcurrency: '50'
       MaxRetryAttempts: '5'
-
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
+    displayName: "Sign Scripts [Authenticode]"
+    inputs:
+      ConnectedServiceName: '$(signServiceConnection)'
+      FolderPath: 'artifacts'
+      Pattern: |
+        Release/**/*.ps1
+        Release/**/*.psm1
+        Release/**/*.ps1xml
+        Release/**/*.js
+        InstallModule.ps1
+      UseMinimatch: true
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "KeyCode": "CP-230012",
+            "OperationCode": "SigntoolSign",
+            "Parameters": {
+              "OpusName": "Microsoft",
+              "OpusInfo": "http://www.microsoft.com",
+              "FileDigest": "/fd \"SHA256\"",
+              "PageHash": "/NPH",
+              "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+            },
+            "ToolName": "sign",
+            "ToolVersion": "1.0"
+          },
+          {
+            "KeyCode": "CP-230012",
+            "OperationCode": "SigntoolVerify",
+            "Parameters": {},
+            "ToolName": "sign",
+            "ToolVersion": "1.0"
+          }
+        ]
   - task: EsrpCodeSigning@4
     displayName: 'Sign 3rd Party [Strong Name]'
     inputs:

.github/policies/resourceManagement.yml

@@ -483,6 +483,24 @@ configuration:
             - amanohar
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: ASTRO
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: ASTRO
+        then:
+        - mentionUsers:
+            mentionees:
+            - Reshmi-Sriram
+            - banggaurav
+            - charanjeet2008
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -1204,6 +1222,22 @@ configuration:
             - akashkeshari
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: ConnectedMachine
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: ConnectedMachine
+        then:
+        - mentionUsers:
+            mentionees:
+            - raghushantha
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -1565,6 +1599,8 @@ configuration:
         - mentionUsers:
             mentionees:
             - edwinc
+            - mvvsubbu
+            - v-vyedavelly
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1901,6 +1937,22 @@ configuration:
             - arpit-gagneja
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: ElasticSan
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: ElasticSan
+        then:
+        - mentionUsers:
+            mentionees:
+            - blueww
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -2642,22 +2694,6 @@ configuration:
             - rastala
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
-      - if:
-        - or:
-          - labelAdded:
-              label: Service Attention
-          - labelAdded:
-              label: Mobile Engagement
-        - hasLabel:
-            label: Service Attention
-        - hasLabel:
-            label: Mobile Engagement
-        then:
-        - mentionUsers:
-            mentionees:
-            - kpiteira
-            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
-            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -3218,6 +3254,25 @@ configuration:
             - AzmonLogA
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: Oracle
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Oracle
+        then:
+        - mentionUsers:
+            mentionees:
+            - v-rvilathurs
+            - v-jamcheung
+            - v-eelhomsi
+            - v-adhenry
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:
@@ -3265,8 +3320,8 @@ configuration:
         - mentionUsers:
             mentionees:
             - gbowerman
-            - sr-msft
-            - niklarin
+            - jasomaning
+            - nachoalonsoportillo
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -3282,8 +3337,9 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - daeunyim
-            - rajsell
+            - gbowerman
+            - jasomaning
+            - nachoalonsoportillo
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:

docker/Dockerfile-alpine-3.16

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed secrets exposure in example documentation.
 
 ## Version 0.2.1
 * Introduced secrets detection feature to safeguard sensitive data.

src/ADDomainServices/ADDomainServices/ChangeLog.md

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Accounts</PsModuleName>
@@ -37,6 +37,7 @@
   <ItemGroup>
     <None Update="StartupScripts\AzError.ps1" CopyToOutputDirectory="PreserveNewest" />
     <None Update="StartupScripts\InitializeAssemblyResolver.ps1" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="StartupScripts\InitializePSStyle.ps1" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
     <None Update="PostImportScripts\LoadAuthenticators.ps1" CopyToOutputDirectory="PreserveNewest" />

src/Accounts/Accounts/Accounts.csproj

@@ -19,6 +19,10 @@
 -->
 
 ## Upcoming Release
+* Added customized UserAgent for ARM telemetry.
+* Fixed secrets exposure in example documentation.
+* Updated `Connect-AzAccount` to fix a display issue in PowerShell ISE [#24556].
+* Updated the reference of Azure PowerShell Common to 1.3.100-preview.
 * Used Azure.Identity and Azure.Core directly for client assertion [#22628].
 
 ## Version 3.0.3

src/Accounts/Accounts/ChangeLog.md

@@ -28,6 +28,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Management.Automation;
+using System.Net.Http.Headers;
 
 namespace Microsoft.Azure.Commands.Common
 {
@@ -158,6 +159,18 @@ public virtual AzurePSQoSEvent CreateQosEvent(InvocationInfo invocationInfo, str
                 PSHostName = AzurePSCmdlet.PSHostName,
             };
 
+
+            if (qosEvent.UserAgent == null)
+            {
+                qosEvent.UserAgent = new ProductInfoHeaderValue("AzurePowershell", string.Format("Az{0}", "0.0.0")).ToString();
+                string hostEnv = Environment.GetEnvironmentVariable("AZUREPS_HOST_ENVIRONMENT");
+                if (!String.IsNullOrWhiteSpace(hostEnv))
+                {
+                    hostEnv = hostEnv.Trim().Replace("@", "_").Replace("/", "_");
+                    qosEvent.UserAgent += string.Format(" {0}", hostEnv);
+                }
+            }
+
             if (invocationInfo != null)
             {
                 qosEvent.Parameters = string.Join(" ",

src/Accounts/Accounts/CommonModule/TelemetryProvider.cs

@@ -48,6 +48,20 @@ public UserAgent(InvocationInfo invocation)
             {
                 list.Add(new ProductInfoHeaderValue(moduleName, moduleVersion));
             }
+            try
+            {
+                string hostEnv = Environment.GetEnvironmentVariable("AZUREPS_HOST_ENVIRONMENT");
+                if (!String.IsNullOrWhiteSpace(hostEnv))
+                {
+                    hostEnv = hostEnv.Trim().Replace("@", "_").Replace("/", "_");
+                    list.Add(new ProductInfoHeaderValue(hostEnv, ""));
+                }
+            }
+            catch (Exception ) 
+            {
+                // ignore it
+            }
+                
             _userAgents = list.ToArray();
         }
 

src/Accounts/Accounts/CommonModule/UserAgent.cs

@@ -0,0 +1,7 @@
+try{
+    Write-Debug "Initializing PSStyle."
+    [Microsoft.WindowsAzure.Commands.Common.PSStyle]::Initialize($Host)
+}
+catch{
+    Write-Warning $_
+}

src/Accounts/Accounts/StartupScripts/InitializePSStyle.ps1

@@ -2983,9 +2983,12 @@
       "Add-AzHDInsightSecurityProfile": {},
       "Add-AzHDInsightStorage": {},
       "Disable-AzHDInsightAzureMonitor": {},
+      "Disable-AzHDInsightAzureMonitorAgent": {},
       "Disable-AzHDInsightMonitoring": {},
       "Enable-AzHDInsightAzureMonitor": {},
+      "Enable-AzHDInsightAzureMonitorAgent": {},
       "Enable-AzHDInsightMonitoring": {},
+      "Enable-AzHDInsightMonitoringAgent": {},
       "Get-AzHDInsightAzureMonitor": {},
       "Get-AzHDInsightCluster": {},
       "Get-AzHDInsightClusterAutoscaleConfiguration": {},
@@ -2998,6 +3001,7 @@
       "Get-AzHDInsightScriptActionHistory": {},
       "Invoke-AzHDInsightHiveJob": {},
       "New-AzHDInsightCluster": {},
+      "Update-AzHDInsightCluster": {},
       "New-AzHDInsightClusterAutoscaleConfiguration": {},
       "New-AzHDInsightClusterAutoscaleScheduleCondition": {},
       "New-AzHDInsightClusterConfig": {},