Merge branch 'main' into MDO2

azure-pipeline-merge.yml

@@ -28,7 +28,7 @@ extends:
           displayName: "Spell Check"
         - pwsh: |
             cd .\.build
-            .\CodeFormatter.ps1 -Branch $env:TargetBranchName
+            .\CodeFormatter.ps1 -Branch main
           displayName: "Code Formatting Script"
           condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/release'))
           env:
@@ -39,13 +39,13 @@ extends:
           displayName: "Build Script"
         - pwsh: |
             cd .\.build
-            .\Pester.ps1 -NoProgress -Branch $env:TargetBranchName
+            .\Pester.ps1 -NoProgress -Branch main
           displayName: "Running Invoke-Pester"
           env:
             TargetBranchName: $(System.PullRequest.TargetBranch)
         - pwsh: |
             cd .\.build
-            .\ValidateMerge.ps1 -Branch $env:TargetBranchName
+            .\ValidateMerge.ps1 -Branch main
           displayName: "Validate commit times"
           env:
             TargetBranchName: $(System.PullRequest.TargetBranch)

azure-pipeline-release.yml

@@ -2,71 +2,39 @@ trigger:
   branches:
     include:
     - release
+variables:
+  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
 resources:
   repositories:
-  - repository: 1ESPipelineTemplates
+  - repository: templates
     type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
+    name: OneBranch.Pipelines/GovernedTemplates
+    ref: refs/heads/main
 extends:
-  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  template: v2/OneBranch.Official.CrossPlat.yml@templates
   parameters:
-    pool:
-      name: MSSecurity-1ES-Build-Agents-Pool
-      image: MSSecurity-1ES-Windows-2022
-      os: windows
-    customBuildTags:
-    - ES365AIMigrationTooling
+    featureFlags:
+      WindowsHostVersion: 1ESWindows2022
     stages:
-    - stage: stage
+    - stage: build
       jobs:
-      - job: job
+      - job: main
+        pool:
+          type: windows
+        variables:
+          ob_outputDirectory: 'dist'
         steps:
         - pwsh: |
             cd .\.build
             .\Build.ps1
           displayName: "Build Script"
-        - task: EsrpCodeSigning@2
+        - task: onebranch.pipeline.signing@1
           condition: and(succeeded(), ne (variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release'))
           inputs:
-            ConnectedServiceName: 'CSS Exchange Code Sign'
-            FolderPath: 'dist'
-            Pattern: '*.ps1'
-            signConfigType: 'inlineSignParams'
-            inlineOperation: |
-              [
-                {
-                  "keyCode": "CP-230012",
-                  "operationSetCode": "SigntoolSign",
-                  "parameters": [
-                    {
-                      "parameterName": "OpusName",
-                      "parameterValue": "CSS Exchange"
-                    },
-                    {
-                      "parameterName": "OpusInfo",
-                      "parameterValue": "https://github.com/microsoft/CSS-Exchange"
-                    },
-                    {
-                      "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'
+            command: 'sign'
+            signing_profile: 'external_distribution'
+            files_to_sign: '*.ps1'
+            search_root: 'dist'
         - pwsh: |
             cd .\.build
             .\BuildScriptVersions.ps1
@@ -84,7 +52,7 @@ extends:
           displayName: 'Create GitHub Release - Draft'
           condition: and(succeeded(), ne (variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release'))
           inputs:
-            gitHubConnection: 'GitHub Release'
+            gitHubConnection: 'github.com_bill-long'
             repositoryName: microsoft/CSS-Exchange
             action: create
             tagSource: manual
@@ -105,7 +73,7 @@ extends:
           displayName: 'Publish GitHub Release'
           condition: and(succeeded(), ne (variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release'))
           inputs:
-            gitHubConnection: 'GitHub Release'
+            gitHubConnection: 'github.com_bill-long'
             repositoryName: microsoft/CSS-Exchange
             action: edit
             tagSource: manual