diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml index ca4f098d20..bd45d7ffb8 100644 --- a/tools/releaseBuild/azureDevOps/releaseBuild.yml +++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml @@ -189,7 +189,9 @@ stages: - job: release_json displayName: Create and Upload release.json pool: - vmImage: 'windows-latest' + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 steps: - checkout: self clean: true diff --git a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml index 9000d42bd6..8019a5de3b 100644 --- a/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml +++ b/tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml @@ -8,7 +8,9 @@ jobs: - group: Azure Blob variable group displayName: Delete blob is exists pool: - vmImage: windows-latest + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 steps: - checkout: self clean: true diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml index 497dfc8613..9e6c7ad1c6 100644 --- a/tools/releaseBuild/azureDevOps/templates/compliance.yml +++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml @@ -8,11 +8,17 @@ jobs: value : false - name: NugetSecurityAnalysisWarningLevel value: none + + # Defines the variables APIScanClient, APIScanTenant and APIScanSecret + - group: PS-PS-APIScan + displayName: Compliance dependsOn: ${{ parameters.parentJobs }} pool: - name: Package ES Standard Build + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 # APIScan can take a long time timeoutInMinutes: 180 @@ -115,6 +121,8 @@ jobs: softwareVersionNum: '$(ReleaseTagVar)' isLargeApp: false preserveTempFiles: true + env: + AzureServicesAuthConnectionString: RunAs=App;AppId=$(APIScanClient);TenantId=$(APIScanTenant);AppKey=$(APIScanSecret) continueOnError: true - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2 diff --git a/tools/releaseBuild/azureDevOps/templates/json.yml b/tools/releaseBuild/azureDevOps/templates/json.yml index 0dca065e25..570a658756 100644 --- a/tools/releaseBuild/azureDevOps/templates/json.yml +++ b/tools/releaseBuild/azureDevOps/templates/json.yml @@ -13,7 +13,9 @@ jobs: ${{ parameters.parentJobs }} condition: succeeded() pool: - vmImage: windows-latest + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 steps: #- task: @ diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml index 952b12183c..bf7662a971 100644 --- a/tools/releaseBuild/azureDevOps/templates/linux.yml +++ b/tools/releaseBuild/azureDevOps/templates/linux.yml @@ -8,7 +8,9 @@ jobs: displayName: Build ${{ parameters.buildName }} condition: succeeded() pool: - vmImage: ubuntu-16.04 + name: PowerShell1ES + demands: + - ImageOverride -equals MMSUbuntu20.04 dependsOn: ${{ parameters.parentJob }} variables: - name: runCodesignValidationInjection @@ -66,7 +68,9 @@ jobs: dependsOn: build_${{ parameters.buildName }} condition: succeeded() pool: - vmImage: windows-latest + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 variables: - name: buildName value: ${{ parameters.buildName }} diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml index bc111a46b0..1f43d39ab6 100644 --- a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml +++ b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml @@ -7,7 +7,9 @@ jobs: dependsOn: build_macOS_${{ parameters.buildArchitecture }} condition: succeeded() pool: - name: Package ES Standard Build + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 variables: - group: ESRP - name: runCodesignValidationInjection diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml index c8a7ab7e2b..cba0ed6f9c 100644 --- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml +++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml @@ -7,7 +7,9 @@ jobs: dependsOn: package_macOS_${{ parameters.buildArchitecture }} condition: succeeded() pool: - name: Package ES Standard Build + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 variables: - group: ESRP - name: runCodesignValidationInjection diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml index c6f21ec81f..cd3972d5fa 100644 --- a/tools/releaseBuild/azureDevOps/templates/nuget.yml +++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml @@ -7,7 +7,10 @@ jobs: ${{ parameters.parentJobs }} displayName: Build NuGet packages condition: succeeded() - pool: Package ES Standard Build + pool: + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 timeoutInMinutes: 90 diff --git a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml index 572be144c5..b21ab208f1 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-component-governance.yml @@ -10,7 +10,9 @@ jobs: condition: succeeded() pool: - name: Package ES Standard Build + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 steps: - checkout: self diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml index 2c5f4cc138..2820654d16 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml @@ -14,7 +14,9 @@ jobs: condition: succeeded() dependsOn: ${{ parameters.parentJob }} pool: - vmImage: windows-latest + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 variables: - name: runCodesignValidationInjection value: false diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml index e06ea954c5..dd547da6a6 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml @@ -8,7 +8,9 @@ jobs: ${{ parameters.parentJobs }} condition: succeeded() pool: - vmImage: windows-latest + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 variables: - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE value: 1 diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml index 0aa0f23516..5ce2c90a8e 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -14,7 +14,9 @@ jobs: condition: succeeded() dependsOn: ${{ parameters.parentJob }} pool: - vmImage: windows-latest + name: PowerShell1ES + demands: + - ImageOverride -equals MMS2019 variables: - name: BuildConfiguration value: ${{ parameters.BuildConfiguration }}