Merge pull request #1047 from AArnott/libtemplateUpdate

Merge latest Library.Template

Author: AArnott

azure-pipelines/Archive-SourceCode.ps1

@@ -203,16 +203,25 @@ if ($PSCmdlet.ShouldProcess('source archival request', 'post')) {
 
     $Response = Invoke-WebRequest -Uri $SourceCodeArchivalUri -Method POST -Body $RequestJson -ContentType "application/json" -UseBasicParsing -SkipHttpErrorCheck
     Write-Host "Status Code : " -NoNewline
-    $responseContent = ConvertFrom-Json ($Response.Content)
     if ($Response.StatusCode -eq 200) {
         Write-Host $Response.StatusCode -ForegroundColor Green
         Write-Host "Ticket ID   : " -NoNewline
+        $responseContent = ConvertFrom-Json ($Response.Content)
         Write-Host $responseContent
     }
     else {
-        $responseContent = ConvertFrom-Json $Response.Content
         Write-Host $Response.StatusCode -ForegroundColor Red
-        Write-Host "Message     : $($responseContent.message)"
+        try {
+            $responseContent = ConvertFrom-Json $Response.Content
+            Write-Host "Message     : $($responseContent.message)"
+        }
+        catch {
+            Write-Host "JSON Parse Error: $($_.Exception.Message)"
+            Write-Host "Raw response content:"
+            Write-Host $Response.Content
+        }
+
+        exit 2
     }
 } elseif ($SourceCodeArchivalUri) {
     Write-Host "Would have posted to $SourceCodeArchivalUri"

azure-pipelines/OptProf.yml

@@ -17,6 +17,12 @@ schedules:
 #    name: DeploymentScripts
 #    ref: refs/heads/test
 
+parameters:
+  - name: ShouldSkipOptimize
+    displayName: Skip OptProf optimization
+    type: boolean
+    default: false # Should usually be false so that optprof LKG can apply when tests fail, but may need to be set to true in a manually queued pipeline run if all drops have expired.
+
 variables:
 - template: GlobalVariables.yml
 - name: PublicRelease
@@ -37,7 +43,7 @@ stages:
       RealSign: true
       windowsPool: VSEngSS-MicroBuild2022-1ES
       EnableMacOSBuild: false
-      ShouldSkipOptimize: true
+      ShouldSkipOptimize: ${{ parameters.ShouldSkipOptimize }}
       IsOptProf: true
       RunTests: false
 - stage: QueueVSBuild

azure-pipelines/archive-sourcecode.yml

@@ -30,6 +30,7 @@ parameters:
 
 variables:
 - group: VS Core team # Expected to provide ManagerAlias, SourceCodeArchivalUri
+- template: GlobalVariables.yml
 
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate