[Storage][Do not squash] Merge latest changes from main to Az.Storage-preview (#23621)

Author: dolauli

.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-oob.yml

@@ -24,7 +24,7 @@ stages:
       inputs:
         command: custom
         custom: msbuild
-        arguments: 'build.proj "/t:Clean;Build" /p:Configuration=Release'
+        arguments: 'build.proj "/t:Clean;Build" /p:Configuration=Release;TargetModule=${{ parameters.ServiceName }}'
     - pwsh: |
           .\tools\RunVersionController.ps1 -ModuleName "Az.${{ parameters.ServiceName }}”
       displayName: 'Bump up version'
@@ -140,6 +140,8 @@ stages:
   - template: ./code-sign.yml
     parameters:
       OOBBranch: $(BumpUpBranch)
+      TargetModule: ${{ parameters.ServiceName }}
+      BuildInstaller: false
   - job: PulishForTest
     dependsOn: Release
     steps:

.azure-pipelines/code-sign.yml

@@ -3,6 +3,14 @@ parameters:
   displayName: Branch for OOB pipeline
   type: string
   default: 'none'
+- name: TargetModule
+  displayName: Build Module List(Split by ':')
+  type: string
+  default: 'none'
+- name: BuildInstaller
+  displayName: Build Installer
+  type: boolean
+  default: true
 jobs:
 - job: Release
   timeoutInMinutes: 180
@@ -31,10 +39,19 @@ jobs:
 
   - task: DotNetCoreCLI@2
     displayName: Build
+    condition: ne('${{ parameters.TargetModule }}', 'none') 
+    inputs:
+      command: custom
+      custom: msbuild
+      arguments: 'build.proj /t:"Build;CopyAboutTopics;GenerateHelp" /p:"Configuration=Release;GenerateDocumentationFile=true;TargetModule=${{ parameters.TargetModule }}"'
+  - task: DotNetCoreCLI@2
+    displayName: Build
+    condition: eq('${{ parameters.TargetModule }}', 'none') 
     inputs:
       command: custom
       custom: msbuild
-      arguments: 'build.proj /t:"Build;CopyAboutTopics;GenerateHelp" /p:"Configuration=Release;GenerateDocumentationFile=true"'
+      arguments: 'build.proj /t:"Build;CopyAboutTopics;GenerateHelp" /p:"Configuration=Release;GenerateDocumentationFile=true;ModifiedModuleBuild=true"'
+
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'Manifest Generator '
@@ -54,7 +71,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 +128,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 +164,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 +190,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 +253,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 +326,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'
@@ -359,9 +376,11 @@ jobs:
       ./setup/generate.ps1 -repository MSIcreationrepository
       Unregister-PSRepository -Name MSIcreationrepository
     displayName: 'Build Installer'
+    condition: eq(${{ parameters.buildInstaller }}, true)
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@4
     displayName: 'Installer Signing [Authenticode]'
+    condition: eq(${{ parameters.buildInstaller }}, true)
     inputs:
       ConnectedServiceName: 'ESRP Signing Service'
       FolderPath: setup
@@ -404,9 +423,11 @@ jobs:
       Get-ChildItem $Env:RepoArtifacts/$folderName
       Copy-Item $Env:RepoArtifacts/$Env:Configuration/InstallModule.ps1 -Destination $Env:RepoArtifacts/$folderName
     displayName: 'Gather nuget packages and install script'
+    condition: eq(${{ parameters.buildInstaller }}, true)
 
   - task: ArchiveFiles@2
     displayName: 'Pack nuget packages as Az-Cmdlets-latest.tar.gz'
+    condition: eq(${{ parameters.buildInstaller }}, true)
     inputs:
       rootFolderOrFile: 'artifacts/$(LocalRepoName)'
       includeRootFolder: false
@@ -432,9 +453,11 @@ jobs:
                   "  - "+$sha256.Hash+"`n"
       New-Item -Path "setup" -Name "ReleaseNotes.txt" -ItemType File -Force -Value $value
     displayName: 'Rename Az-Cmdlets-latest.tar.gz and Calculate SHA256'
+    condition: eq(${{ parameters.buildInstaller }}, true)
 
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: installer'
+    condition: eq(${{ parameters.buildInstaller }}, true)
     inputs:
       PathtoPublish: setup
       ArtifactName: setup
@@ -468,4 +491,4 @@ jobs:
         Get-ChildItem -Path $Env:RepoArtifacts -Filter Az.*.0.*.*.nupkg | Compress-Archive -DestinationPath "$buildName-preview.zip" -PassThru | Set-AzStorageBlobContent -Container $(ContainerName) -Context $context -Force
       azurePowerShellVersion: LatestVersion
       pwsh: true
-    condition: and(succeeded(), eq(variables['PushPackageToStorageAccount'], 'true'))
+    condition: and(succeeded(), eq(variables['PushPackageToStorageAccount'], 'true'), eq(${{ parameters.buildInstaller }}, true))

.azure-pipelines/daily-build.yml

@@ -74,9 +74,9 @@ jobs:
     inputs:
       command: custom
       custom: msbuild
-      arguments: 'build.proj /t:Build /p:Configuration=Release;TurnOnTestCoverage=true'
+      arguments: 'build.proj /t:Build /p:Configuration=Release;TurnOnTestCoverage=true;ModifiedModuleBuild=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