resolve merge conflicts

Author: yifanz7

.azure-pipelines/SyncFromMainBranchConfig.json

@@ -10,8 +10,6 @@
         "src/Az.props",
         "src/Az.Shared.props",
         "src/Az.Test.props",
-        "src/Az.autorest.hybrid.props",
-        "src/Az.autorest.hybrid.v2.props",
         "src/Az.autorest.props",
         "src/Az.Post.props",
         "src/psm1.props",

.azure-pipelines/code-gen.yml

@@ -81,12 +81,7 @@ jobs:
       Install-Module -Name platyPS -RequiredVersion 0.14.2 -Force;
       Install-Module -Name Az.Accounts -Force;
       Import-Module .\tools\Gen2Master\MoveFromGeneration2Master.ps1;
-      $subModuleFolders = Get-ChildItem .\artifacts\src\${{ parameters.ServiceName }} -Directory -Filter *.Autorest;
-      if ($subModuleFolders -eq $null) {
-        Move-Generation2Master -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
-      } else {
-        Move-Generation2MasterHybrid -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
-      }
+      Move-Generation2Master -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
       git config user.email "[email protected]";
       git config user.name "azure-powershell-bot";
       git add ./src;

.azure-pipelines/code-sign.yml

@@ -54,7 +54,7 @@ jobs:
       Copy-Item .\setup\InstallerChecks.dll -Destination $Env:RepoArtifacts/
       Copy-Item .\setup\Microsoft.Deployment.WindowsInstaller.dll -Destination $Env:RepoArtifacts/
     displayName: 'Before Signing'
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
     displayName: 'Sign Dll [Authenticode + Strong Name]'
     inputs:
       ConnectedServiceName: 'ESRP Signing Service'
@@ -111,7 +111,7 @@ jobs:
           }
         ]
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
     displayName: 'Sign Scripts [Authenticode]'
     inputs:
       ConnectedServiceName: 'ESRP Signing Service'
@@ -147,7 +147,7 @@ jobs:
           }
         ]
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
     displayName: 'Sign 3rd Party [Strong Name]'
     inputs:
       ConnectedServiceName: 'ESRP Signing Service'
@@ -173,7 +173,7 @@ jobs:
           }
         ]
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
     displayName: 'Sign 3rd Party [Authenticode]'
     inputs:
       ConnectedServiceName: 'ESRP Signing Service'
@@ -236,7 +236,7 @@ jobs:
   - script: '"%wix%\sdk\MakeSfxCA.exe" "%cd%\setup\InstallerChecks.CA.dll" "%cd%\setup\SfxCA.dll" "%cd%\setup\InstallerChecks.dll" "%cd%\setup\Microsoft.Deployment.WindowsInstaller.dll;%cd%\setup\InstallerChecks\InstallerChecks\CustomAction.config"'
     displayName: 'Generate InstallerCheck.CA.dll'
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
     displayName: 'Sign Installercheck.CA.dll [Authenticode]'
     inputs:
       ConnectedServiceName: 'ESRP Signing Service'
@@ -309,7 +309,7 @@ jobs:
     displayName: 'Expand modules'
     condition: and(succeeded(), ne(variables['SignPsd1'], 'false'))
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
     displayName: 'Psd1 Signing [Authenticode]'
     inputs:
       ConnectedServiceName: 'ESRP Signing Service'
@@ -360,7 +360,7 @@ jobs:
       Unregister-PSRepository -Name MSIcreationrepository
     displayName: 'Build Installer'
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
     displayName: 'Installer Signing [Authenticode]'
     inputs:
       ConnectedServiceName: 'ESRP Signing Service'

.azure-pipelines/daily-build.yml

@@ -76,7 +76,7 @@ jobs:
       custom: msbuild
       arguments: 'build.proj /t:Build /p:Configuration=Release;TurnOnTestCoverage=true'
 
-  - task: EsrpCodeSigning@1
+  - task: EsrpCodeSigning@4
     inputs:
       ConnectedServiceName: '$(signServiceConnection)'
       FolderPath: 'artifacts'
@@ -134,7 +134,7 @@ jobs:
       MaxConcurrency: '50'
       MaxRetryAttempts: '5'
 
-  - task: EsrpCodeSigning@1
+  - task: EsrpCodeSigning@4
     displayName: 'Sign 3rd Party [Strong Name]'
     inputs:
       ConnectedServiceName: '$(signServiceConnection)'

.azure-pipelines/live-test.yml

@@ -27,6 +27,10 @@ parameters:
   displayName: PowerShell 7.3.x Version
   type: string
   default: 7.3.*
+- name: ps_7_4_x
+  displayName: PowerShell 7.4.x Version
+  type: string
+  default: 7.4.*
 - name: ps_latest
   displayName: PowerShell Latest Version
   type: string
@@ -39,6 +43,10 @@ parameters:
   displayName: .NET 7 SDK Version
   type: string
   default: 7.0.x
+- name: dotnet_sdk_8
+  displayName: .NET 8 SDK Version
+  type: string
+  default: 8.0.x
 
 variables:
   ArtifactsName: LiveTestArtifacts
@@ -92,13 +100,21 @@ stages:
       psVersion: ${{ parameters.ps_7_3_x }}
       dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
 
+  - template: util/live-test-steps.yml
+    parameters:
+      name: 'ps_7_4_x_win_2019'
+      vmImage: ${{ parameters.os_windows_2019 }}
+      osType: 'Windows'
+      psVersion: ${{ parameters.ps_7_4_x }}
+      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
+
   - template: util/live-test-steps.yml
     parameters:
       name: 'ps_latest_win_2019'
       vmImage: ${{ parameters.os_windows_2019 }}
       osType: 'Windows'
       psVersion: ${{ parameters.ps_latest }}
-      dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
+      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
 
   - template: util/live-test-steps.yml
     parameters:
@@ -116,13 +132,21 @@ stages:
       psVersion: ${{ parameters.ps_7_3_x }}
       dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
 
+  - template: util/live-test-steps.yml
+    parameters:
+      name: 'ps_7_4_x_win_2022'
+      vmImage: ${{ parameters.os_windows_2022 }}
+      osType: 'Windows'
+      psVersion: ${{ parameters.ps_7_4_x }}
+      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
+
   - template: util/live-test-steps.yml
     parameters:
       name: 'ps_latest_win_2022'
       vmImage: ${{ parameters.os_windows_2022 }}
       osType: 'Windows'
       psVersion: ${{ parameters.ps_latest }}
-      dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
+      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
 
   - template: util/live-test-steps.yml
     parameters:
@@ -140,13 +164,21 @@ stages:
       psVersion: ${{ parameters.ps_7_3_x }}
       dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
 
+  - template: util/live-test-steps.yml
+    parameters:
+      name: 'ps_7_4_x_linux'
+      vmImage: ${{ parameters.os_linux }}
+      osType: 'Linux'
+      psVersion: ${{ parameters.ps_7_4_x }}
+      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
+
   - template: util/live-test-steps.yml
     parameters:
       name: 'ps_latest_linux'
       vmImage: ${{ parameters.os_linux }}
       osType: 'Linux'
       psVersion: ${{ parameters.ps_latest }}
-      dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
+      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
 
   - template: util/live-test-steps.yml
     parameters:
@@ -164,13 +196,21 @@ stages:
       psVersion: ${{ parameters.ps_7_3_x }}
       dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
 
+  - template: util/live-test-steps.yml
+    parameters:
+      name: 'ps_7_4_x_macOS'
+      vmImage: ${{ parameters.os_macos }}
+      osType: 'MacOS'
+      psVersion: ${{ parameters.ps_7_4_x }}
+      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
+
   - template: util/live-test-steps.yml
     parameters:
       name: 'ps_latest_macOS'
       vmImage: ${{ parameters.os_macos }}
       osType: 'MacOS'
       psVersion: ${{ parameters.ps_latest }}
-      dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
+      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
 
 - stage: Report
   displayName: Send Report

.azure-pipelines/release-test.yml

@@ -11,6 +11,10 @@ parameters:
   displayName: PowerShell 7.3.x Version
   type: string
   default: 7.3.*
+- name: ps7_4
+  displayName: PowerShell 7.4.x Version
+  type: string
+  default: 7.4.*
 - name: latest_ps
   displayName: PowerShell Latest Version
   type: string
@@ -27,6 +31,10 @@ parameters:
   displayName: .NET Version 7
   type: string
   default: 7.0.x
+- name: netCoreVersion_8
+  displayName: .NET Version 8
+  type: string
+  default: 8.0.x
 
 variables:
   winAgentPoolName: pool-windows-2019
@@ -64,21 +72,29 @@ jobs:
     psVersion: ${{ parameters.ps7_3 }}
     netCoreVersion: ${{ parameters.netCoreVersion_7 }}
 
+- template: util/smoke-test-steps.yml
+  parameters:
+    name: 'Win_PS7_4_X_SmokeTest'
+    agentPoolName: ${{ variables.winAgentPoolName }}
+    agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
+    psVersion: ${{ parameters.ps7_4 }}
+    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
+
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'Win_Latest_PS_SmokeTest'
     agentPoolName: ${{ variables.winAgentPoolName }}
     agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
     psVersion: ${{ parameters.latest_ps }}
-    netCoreVersion: ${{ parameters.netCoreVersion_7 }}
+    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'Win_Preview_PS_SmokeTest'
     agentPoolName: ${{ variables.winAgentPoolName }}
     agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
     psVersion: ${{ parameters.preview_ps }}
-    netCoreVersion: ${{ parameters.netCoreVersion_7 }}
+    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
@@ -96,21 +112,29 @@ jobs:
     psVersion: ${{ parameters.ps7_3 }}
     netCoreVersion: ${{ parameters.netCoreVersion_7 }}
 
+- template: util/smoke-test-steps.yml
+  parameters:
+    name: 'Linux_PS7_4_X_SmokeTest'
+    agentPoolName: ${{ variables.linuxAgentPoolName }}
+    agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
+    psVersion: ${{ parameters.ps7_4 }}
+    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
+
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'Linux_Latest_PS_SmokeTest'
     agentPoolName: ${{ variables.linuxAgentPoolName }}
     agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
     psVersion: ${{ parameters.latest_ps }}
-    netCoreVersion: ${{ parameters.netCoreVersion_7 }}
+    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'Linux_Preview_PS_SmokeTest'
     agentPoolName: ${{ variables.linuxAgentPoolName }}
     agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
     psVersion: ${{ parameters.preview_ps }}
-    netCoreVersion: ${{ parameters.netCoreVersion_7 }}
+    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
@@ -128,18 +152,26 @@ jobs:
     psVersion: ${{ parameters.ps7_3 }}
     netCoreVersion: ${{ parameters.netCoreVersion_7 }}
 
+- template: util/smoke-test-steps.yml
+  parameters:
+    name: 'MacOS_PS7_4_X_SmokeTest'
+    agentPoolName: ${{ variables.macOsAgentPoolName }}
+    agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
+    psVersion: ${{ parameters.ps7_4 }}
+    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
+
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'MacOS_Latest_PS_SmokeTest'
     agentPoolName: ${{ variables.macOsAgentPoolName }}
     agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
     psVersion: ${{ parameters.latest_ps }}
-    netCoreVersion: ${{ parameters.netCoreVersion_7 }}
+    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
 
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'MacOS_Preview_PS_SmokeTest'
     agentPoolName: ${{ variables.macOsAgentPoolName }}
     agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
     psVersion: ${{ parameters.preview_ps }}
-    netCoreVersion: ${{ parameters.netCoreVersion_7 }}
+    netCoreVersion: ${{ parameters.netCoreVersion_8 }}

.azure-pipelines/sign-tool-installer.yml

@@ -24,7 +24,7 @@ steps:
     custom: msbuild
     arguments: 'tools\Az.Tools.Installer\build.proj /t:"Clean;Build;GenerateHelp" /p:Configuration=Release'
 
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
   displayName: 'Signing'
   inputs:
     ConnectedServiceName: $(signServiceConnection)

.azure-pipelines/sign-tool-predictor.yml

@@ -49,7 +49,7 @@ steps:
     packageType: 'runtime'
     version: '2.1.x'
 
-- task: EsrpCodeSigning@1
+- task: EsrpCodeSigning@4
   displayName: 'Signing'
   inputs:
     ConnectedServiceName: $(signServiceConnection)

.azure-pipelines/sync-aliases.yml

@@ -13,27 +13,24 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: Install .NET 7 SDK
+    displayName: Install .NET 8 SDK
     inputs:
       packageType: sdk
-      version: 7.0.x
+      version: 8.0.x
   - template: util/get-github-pat-steps.yml
 
   - pwsh: |
       dotnet --version
       dotnet new tool-manifest --force
-      dotnet tool install powershell
-    displayName: Install Latest PowerShell (7.3+)
+      dotnet tool install powershell --version 7.4.*
+    displayName: Install PowerShell 7.4.x
 
-  - task: AzurePowerShell@5
-    inputs:
-      azureSubscription: 'Azure SDK Infrastructure'
-      ScriptType: 'InlineScript'
-      Inline: |
-        $ADOTokenValue = Get-AzKeyVaultSecret -VaultName ${env:KEYVAULTNAME} -Name ${env:ADOTOKENNAME} -AsPlainText
-        Write-Host "##vso[task.setvariable variable=ADOToken;issecret=true]$ADOTokenValue"
-      azurePowerShellVersion: 'LatestVersion'
-    displayName: Get ADOToken from Key Vault
+  - template: util/get-keyvault-secret-steps.yml
+    parameters:
+      serviceConnectionName: $(AzureSubscription)
+      keyVaultName: $(KeyVaultName)
+      secretName: $(ADOTokenName)
+      outVar: 'ADOToken'
 
   - pwsh: |
       dotnet tool run pwsh -NoLogo -NoProfile -NonInteractive -File "./tools/Github/ParseServiceContactsList.ps1 -ADOToken $(ADOToken)"

.azure-pipelines/sync-tools-folder.yml

@@ -20,8 +20,6 @@ trigger:
       - src/Az.props
       - src/Az.Shared.props
       - src/Az.Test.props
-      - src/Az.autorest.hybrid.props
-      - src/Az.autorest.hybrid.v2.props
       - src/Az.autorest.props
       - src/Az.Post.props
       - src/psm1.props