Merge pull request #221 from microsoft/staging

Release - 6/18/24
microsoft · Jun 17, 2024 · 1945fcb · 1945fcb
2 parents cf7ebb0 + b2a5251
commit 1945fcb
Show file tree

Hide file tree

Showing 17 changed files with 407 additions and 163 deletions.
diff --git a/build/TriggerReleaseBuild.yml b/build/TriggerReleaseBuild.yml
@@ -1,6 +1,38 @@
 trigger:
 - release
 
-steps:
-- script: echo Triggering Azure Build
-  displayName: 'Triggering Azure Build'
+resources:
+  repositories:
+  - repository: templates_onebranch
+    type: git
+    name: OneBranch.Pipelines/GovernedTemplates
+    ref: refs/heads/main
+  - repository: m365Pipelines
+    type: git
+    name: 1ESPipelineTemplates/M365GPT
+    ref: refs/tags/release
+
+extends:
+  template: v1/M365.Official.PipelineTemplate.yml@m365Pipelines
+  parameters:
+    sdl:
+      roslyn:
+        enabled: true
+      arrow:
+        serviceConnection: DevHome Build VM Generation
+      baseline:
+        baselineFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnbaselines
+    pool:
+      name: Azure-Pipelines-1ESPT-ExDShared
+      image: windows-2022
+      os: windows
+    customBuildTags:
+    - ES365AIMigrationTooling
+    stages:
+    - stage: Trigger_Build
+      dependsOn: []
+      jobs:
+      - job: Trigger_Build
+        steps:
+        - script: echo Triggering ADO Build
+          displayName: 'Triggering ADO Build'
diff --git a/build/TriggerStagingBuild.yml b/build/TriggerStagingBuild.yml
@@ -1,6 +1,38 @@
 trigger:
 - staging
 
-steps:
-- script: echo Triggering Azure Build
-  displayName: 'Triggering Azure Build'
+resources:
+  repositories:
+  - repository: templates_onebranch
+    type: git
+    name: OneBranch.Pipelines/GovernedTemplates
+    ref: refs/heads/main
+  - repository: m365Pipelines
+    type: git
+    name: 1ESPipelineTemplates/M365GPT
+    ref: refs/tags/release
+
+extends:
+  template: v1/M365.Official.PipelineTemplate.yml@m365Pipelines
+  parameters:
+    sdl:
+      roslyn:
+        enabled: true
+      arrow:
+        serviceConnection: DevHome Build VM Generation
+      baseline:
+        baselineFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnbaselines
+    pool:
+      name: Azure-Pipelines-1ESPT-ExDShared
+      image: windows-2022
+      os: windows
+    customBuildTags:
+    - ES365AIMigrationTooling
+    stages:
+    - stage: Trigger_Build
+      dependsOn: []
+      jobs:
+      - job: Trigger_Build
+        steps:
+        - script: echo Triggering ADO Build
+          displayName: 'Triggering ADO Build'
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -20,7 +20,7 @@ parameters:
     - release
 
 variables:
-  MSIXVersion: '0.900'
+  MSIXVersion: '0.1000'
   solution: '**/DevHomeAzureExtension.sln'
   appxPackageDir: 'AppxPackages'
   testOutputArtifactDir: 'TestResults'
@@ -62,8 +62,6 @@ extends:
             - task: NuGetToolInstaller@1
 
             - task: NuGetAuthenticate@1
-              inputs:
-                nuGetServiceConnections: 'DevHomeInternal'
 
             - task: PowerShell@2
               displayName: Replace Stubbed Files
@@ -84,9 +82,8 @@ extends:
                 restoreSolution: '$(solution)'
                 feedsToUse: 'config'
                 nugetConfigPath: 'nuget.config'
-                externalFeedCredentials: 'DevHomeInternal'
 
-            - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
+            - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4
               displayName: Send and Download Localization Files for Artifacts
               condition: and(eq(variables['EnableLocalization'], 'true'), eq(variables['UpdateLocalization'], 'true'))
               inputs:
@@ -101,7 +98,7 @@ extends:
                 appendRelativeDir: true
                 pseudoSetting: Included
 
-            - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
+            - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4
               displayName: Download and Use Localization Files
               condition: eq(variables['EnableLocalization'], 'true')
               retryCountOnTaskFailure: 2
@@ -151,46 +148,45 @@ extends:
                 filePath: 'build/scripts/Build.ps1'
                 arguments: -Platform "${{ platform }}" -Configuration "${{ configuration }}" -Version $(MSIXVersion) -BuildStep "msix" -AzureBuildingBranch "$(BuildingBranch)" -IsAzurePipelineBuild
 
-            - task: EsrpCodeSigning@2
-              inputs:
-                ConnectedServiceName: 'Xlang Code Signing'
-                FolderPath: '$(appxPackageDir)\${{ configuration }}'
-                Pattern: '*.msix'
-                signConfigType: 'inlineSignParams'
-                inlineOperation: |
-                  [
-                    {
-                      "keycode": "CP-230012",
-                      "operationSetCode": "SigntoolSign",
-                      "parameters": [
-                        {
-                          "parameterName": "OpusName",
-                          "parameterValue": "Microsoft"
-                        },
-                        {
-                          "parameterName": "OpusInfo",
-                          "parameterValue": "http://www.microsoft.com"
-                        },
-                        {
-                          "parameterName": "PageHash",
-                          "parameterValue": "/NPH"
-                        },
-                        {
-                          "parameterName": "FileDigest",
-                          "parameterValue": "/fd sha256"
-                        },
-                        {
-                          "parameterName": "TimeStamp",
-                          "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                        }
-                      ],
-                      "toolName": "signtool.exe",
-                      "toolVersion": "6.2.9304.0"
-                    }
-                  ]
-                SessionTimeout: '60'
-                MaxConcurrency: '50'
-                MaxRetryAttempts: '5'
+            - template: ./build/templates/EsrpSigning-Steps.yml@self
+              parameters:
+                displayName: Submit *.msix to ESRP for code signing
+                inputs:
+                  FolderPath: '$(appxPackageDir)\${{ configuration }}'
+                  Pattern: '*.msix'
+                  UseMinimatch: true
+                  signConfigType: inlineSignParams
+                  inlineOperation: |
+                    [
+                      {
+                        "keycode": "CP-230012",
+                        "operationSetCode": "SigntoolSign",
+                        "parameters": [
+                          {
+                            "parameterName": "OpusName",
+                            "parameterValue": "Microsoft"
+                          },
+                          {
+                            "parameterName": "OpusInfo",
+                            "parameterValue": "http://www.microsoft.com"
+                          },
+                          {
+                            "parameterName": "PageHash",
+                            "parameterValue": "/NPH"
+                          },
+                          {
+                            "parameterName": "FileDigest",
+                            "parameterValue": "/fd sha256"
+                          },
+                          {
+                            "parameterName": "TimeStamp",
+                            "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                          }
+                        ],
+                        "toolName": "signtool.exe",
+                        "toolVersion": "6.2.9304.0"
+                      }
+                    ]
 
             # Commented out until our implementation is fixed
             # - task: AzureKeyVault@1
@@ -295,46 +291,45 @@ extends:
                 filePath: 'build/scripts/Build.ps1'
                 arguments: -Configuration "${{ configuration }}" -Version $(MSIXVersion) -BuildStep "msixbundle" -IsAzurePipelineBuild
 
-            - task: EsrpCodeSigning@2
-              inputs:
-                ConnectedServiceName: 'Xlang Code Signing'
-                FolderPath: 'AppxBundles\${{ configuration }}'
-                Pattern: '*.msixbundle'
-                signConfigType: 'inlineSignParams'
-                inlineOperation: |
-                  [
-                    {
-                      "keycode": "CP-230012",
-                      "operationSetCode": "SigntoolSign",
-                      "parameters": [
-                        {
-                          "parameterName": "OpusName",
-                          "parameterValue": "Microsoft"
-                        },
-                        {
-                          "parameterName": "OpusInfo",
-                          "parameterValue": "http://www.microsoft.com"
-                        },
-                        {
-                          "parameterName": "PageHash",
-                          "parameterValue": "/NPH"
-                        },
-                        {
-                          "parameterName": "FileDigest",
-                          "parameterValue": "/fd sha256"
-                        },
-                        {
-                          "parameterName": "TimeStamp",
-                          "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                        }
-                      ],
-                      "toolName": "signtool.exe",
-                      "toolVersion": "6.2.9304.0"
-                    }
-                  ]
-                SessionTimeout: '60'
-                MaxConcurrency: '50'
-                MaxRetryAttempts: '5'
+            - template: ./build/templates/EsrpSigning-Steps.yml@self
+              parameters:
+                displayName: Submit *.msixbundle to ESRP for code signing
+                inputs:
+                  FolderPath: 'AppxBundles\${{ configuration }}'
+                  Pattern: '*.msixbundle'
+                  UseMinimatch: true
+                  signConfigType: inlineSignParams
+                  inlineOperation: |
+                    [
+                      {
+                        "keycode": "CP-230012",
+                        "operationSetCode": "SigntoolSign",
+                        "parameters": [
+                          {
+                            "parameterName": "OpusName",
+                            "parameterValue": "Microsoft"
+                          },
+                          {
+                            "parameterName": "OpusInfo",
+                            "parameterValue": "http://www.microsoft.com"
+                          },
+                          {
+                            "parameterName": "PageHash",
+                            "parameterValue": "/NPH"
+                          },
+                          {
+                            "parameterName": "FileDigest",
+                            "parameterValue": "/fd sha256"
+                          },
+                          {
+                            "parameterName": "TimeStamp",
+                            "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                          }
+                        ],
+                        "toolName": "signtool.exe",
+                        "toolVersion": "6.2.9304.0"
+                      }
+                    ]
 
         templateContext:
           outputs:
@@ -368,7 +363,7 @@ extends:
             artifactName: MsixBundle_Release
             targetPath: StorePublish
 
-        - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
+        - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@4
           displayName: Download and Use Localization Files
           condition: eq(variables['EnableLocalization'], 'true')
           retryCountOnTaskFailure: 2
@@ -393,11 +388,11 @@ extends:
               $Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
             pwsh: true
 
-        - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2
+        - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@3
           displayName: 'Create Staging StoreBroker Package'
           condition: eq(variables['BuildingBranch'], 'staging')
           inputs:
-            serviceEndpoint: 'DevHomeAzureExtensionCanary StoreBroker'
+            serviceEndpoint: 'DevHomeAzureExtensionCanary StoreBroker ServiceConnection'
             sbConfigPath: '$(System.DefaultWorkingDirectory)\build\store\canary\SBConfig.json'
             sourceFolder: 'StorePublish'
             contents: '*.msixbundle'
@@ -406,11 +401,11 @@ extends:
             outSBName: DevHomeStoreSubmissionPackage
             pdpInclude: 'PDP.xml'
 
-        - task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@2
+        - task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@3
           displayName: 'Publish Staging StoreBroker Package'
           condition: eq(variables['BuildingBranch'], 'staging')
           inputs:
-            serviceEndpoint: 'DevHomeAzureExtensionCanary StoreBroker'
+            serviceEndpoint: 'DevHomeAzureExtensionCanary StoreBroker ServiceConnection'
             appId: 9NBVFRMSFXHW
             inputMethod: JsonAndZip
             jsonPath: '$(System.DefaultWorkingDirectory)\SBOutDir\DevHomeStoreSubmissionPackage.json'
@@ -421,11 +416,11 @@ extends:
             jsonZipUpdateMetadata: true
             updateImages: true
 
-        - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@2
+        - task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@3
           displayName: 'Create Release StoreBroker Package'
           condition: eq(variables['BuildingBranch'], 'release')
           inputs:
-            serviceEndpoint: 'DevHomeAzureExtension StoreBroker'
+            serviceEndpoint: 'DevHomeAzureExtension StoreBroker ServiceConnection'
             sbConfigPath: '$(System.DefaultWorkingDirectory)\build\store\preview\SBConfig.json'
             sourceFolder: 'StorePublish'
             contents: '*.msixbundle'
@@ -434,11 +429,11 @@ extends:
             outSBName: DevHomeStoreSubmissionPackage
             pdpInclude: 'PDP.xml'
 
-        - task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@2
+        - task: MS-RDX-MRO.windows-store-publish-dev.publish-task.store-publish@3
           displayName: 'Publish Release StoreBroker Package'
           condition: eq(variables['BuildingBranch'], 'release')
           inputs:
-            serviceEndpoint: 'DevHomeAzureExtension StoreBroker'
+            serviceEndpoint: 'DevHomeAzureExtension StoreBroker ServiceConnection'
             appId: 9MV8F79FGXTR
             inputMethod: JsonAndZip
             jsonPath: '$(System.DefaultWorkingDirectory)\SBOutDir\DevHomeStoreSubmissionPackage.json'

diff --git a/build/scripts/CreateBuildInfo.ps1 b/build/scripts/CreateBuildInfo.ps1
@@ -5,7 +5,7 @@ Param(
 )
 
 $Major = "0"
-$Minor = "9"
+$Minor = "10"
 $Patch = "99" # default to 99 for local builds
 
 $versionSplit = $Version.Split(".");

diff --git a/build/templates/EsrpSigning-Steps.yml b/build/templates/EsrpSigning-Steps.yml
@@ -0,0 +1,22 @@
+parameters:
+  - name: displayName
+    type: string
+    default: ESRP Code Signing
+  - name: inputs
+    type: object
+    default: {}
+
+steps:
+  - task: EsrpCodeSigning@5
+    displayName: ${{ parameters.displayName }}
+    inputs:
+      ConnectedServiceName: $(EsrpConnectedServiceName)
+      AppRegistrationClientId: $(EsrpAppRegistrationClientId)
+      AppRegistrationTenantId: $(EsrpAppRegistrationTenantId)
+      AuthAKVName: $(EsrpAuthAKVName)
+      AuthCertName: $(EsrpAuthCertName)
+      AuthSignCertName: $(EsrpAuthSignCertName)
+      SessionTimeout: '60'
+      MaxConcurrency: '50'
+      MaxRetryAttempts: '5'
+      ${{ insert }}: ${{ parameters.inputs }}