Merge pull request #2137 from microsoft/main

Test Release

Calendar/Get-RBASummary.ps1

@@ -177,7 +177,6 @@ function RBACriteria {
     `t MaximumConflictInstances:       $($RbaSettings.MaximumConflictInstances)
     `t MaximumConflictPercentage:      $($RbaSettings.MaximumConflictPercentage)
     `t EnforceSchedulingHorizon:       $($RbaSettings.EnforceSchedulingHorizon)
-    `t SchedulingHorizonInDays:        $($RbaSettings.SchedulingHorizonInDays)
 "@
     Write-Host -NoNewline "`r`nIf all the above criteria are met, the request is "
     Write-Host -ForegroundColor Yellow -NoNewline "In-Policy."
@@ -273,14 +272,23 @@ function RBAProcessingValidation {
 }
 
 # Write out a list of Mailboxes
+# We get CN from the cmdlet and want Display Name and Primary SMTP Address
 function OutputMBList {
     param (
         [Parameter(Mandatory)]
         [string[]]$MBList
     )
     foreach ($User in $MBList) {
-        $User = Get-Mailbox -Identity $User
-        Write-Host " `t `t [$($User.DisplayName)] -- $($User.PrimarySmtpAddress)"
+        # MS Support will error as we need the Organization to process from CN
+        $Org = $Identity.Split('@')[1]
+
+        if ($null -ne $Org) {
+            $User = Get-Mailbox -Identity $User -organization $Org
+            Write-Host " `t `t [$($User.DisplayName)] -- $($User.PrimarySmtpAddress)"
+        } else {
+            $User = Get-Mailbox -Identity $User
+            Write-Host " `t `t [$($User.DisplayName)] -- $($User.PrimarySmtpAddress)"
+        }
     }
 }
 

azure-pipeline-merge.yml

@@ -7,6 +7,8 @@ resources:
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
+    settings:
+      skipBuildTagsForGitHubPullRequests: true
     pool:
       name: MSSecurity-1ES-Build-Agents-Pool
       image: MSSecurity-1ES-Windows-2022
@@ -26,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:
@@ -37,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

@@ -26,47 +26,13 @@ extends:
             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