Update from upstream

.ci/build-manifest.cake

@@ -1,4 +1,4 @@
-#addin nuget:?package=Cake.XCode&version=4.2.0
+#addin nuget:?package=Cake.XCode&version=5.0.0
 #addin nuget:?package=Cake.Yaml&version=3.1.0&loadDependencies=true
 #addin nuget:?package=Cake.Json&version=4.0.0&loadDependencies=true
 #addin nuget:?package=Xamarin.Nuget.Validator&version=1.1.1
@@ -418,14 +418,6 @@ public class BuildGroup {
 	public override string ToString () => Name;
 }
 
-bool IsRunningOnMacOs () {
-	return System.Environment.OSVersion.Platform == PlatformID.MacOSX || MacPlatformDetector.IsMac.Value;
-}
-
-bool IsRunningOnLinux () {
-	return IsRunningOnUnix () && !IsRunningOnMacOs ();
-}
-
 internal static class MacPlatformDetector {
 	internal static readonly Lazy<bool> IsMac = new Lazy<bool> (IsRunningOnMac);
 

.ci/build.steps.v1.yml

@@ -28,7 +28,7 @@ parameters:
   windowsImage: 'windows-latest'                            # the name of the Windows VM image
   windowsImageOverride: ''                                  # used to access 1ES hardened images: name of ImageOverride demand to use such as AzurePipelinesWindows2022compliant when windowsAgentPoolName set to the AzurePipelines-EO pool
   mono: 'Latest'                                            # the version of mono to use
-  xcode: '13.3.1'                                           # the version of Xcode to use
+  xcode: '13.2.1'                                           # the version of Xcode to use
   dotnet: '6.0.300'                                         # the version of .NET Core to use
   dotnetStable: '6.0.300'                                   # the stable version of .NET Core to use
   cake: '2.2.0'                                             # the version of Cake to use
@@ -231,7 +231,7 @@ steps:
           --gitcommit="$(Build.SourceVersion)" `
           --gitbranch="$(Build.SourceBranch)" `
           --forcebuild="$force" `
-          --names="$names" `
+          --names "$names" `
           --targets="$targets" `
           --copyoutputtoroot=true `
           --configuration="${{ parameters.configuration }}" `
@@ -260,7 +260,7 @@ steps:
           --gitcommit="$(Build.SourceVersion)" `
           --gitbranch="$(Build.SourceBranch)" `
           --forcebuild="$force" `
-          --names="$names" `
+          --names "$names" `
           --targets="$targets" `
           --copyoutputtoroot=true `
           --configuration="${{ parameters.configuration }}" `

.ci/build.v1.yml

@@ -32,7 +32,7 @@ parameters:
   windowsImage: 'windows-latest'                            # the name of the Windows VM image
   windowsImageOverride: ''                                  # used to access 1ES hardened images: name of ImageOverride demand to use such as AzurePipelinesWindows2022compliant when windowsAgentPoolName set to the AzurePipelines-EO pool
   mono: 'Latest'                                            # the version of mono to use
-  xcode: '13.3.1'                                           # the version of Xcode to use
+  xcode: '13.2.1'                                           # the version of Xcode to use
   dotnet: '6.0.300'                                         # the version of .NET Core to use
   dotnetStable: '6.0.300'                                   # the stable version of .NET Core to use
   cake: '2.2.0'                                             # the version of Cake to use

.ci/build.yml

@@ -10,6 +10,7 @@ parameters:
   initSteps: []                                             # any steps to run before .NET global tools are installed
   preBuildSteps: []                                         # any steps that need to run just before the main compilation starts
   postBuildSteps: []                                        # any steps that need to run just after the main compilation ends
+  postDiffBuildSteps: []                                    # any steps that need to run after the API Diff ends
   masterBranchName: 'main'                                  # the "master" branch that should be used - can be something other than "master"
   installAppleCertificates: 'true'                          # whether or not to install the Apple certificates and provisioning profiles
   submodules: false                                         # whether or not to check out submodules
@@ -30,7 +31,7 @@ parameters:
                                                             # macOS-11 required for XCode 13.1
   windowsImage: 'windows-latest'                            # the name of the Windows VM image
   mono: 'Latest'                                            # the version of mono to use
-  xcode: '13.3.1'                                             # the version of Xcode to use
+  xcode: '13.2.1'                                             # the version of Xcode to use
   dotnet: '6.0.300'                                         # the version of .NET Core to use
   dotnetStable: '6.0.300'                                   # the stable version of .NET Core to use
   cake: '2.2.0'                                             # the version of Cake to use
@@ -62,18 +63,23 @@ jobs:
           linux:
             poolName: ${{ parameters.linuxAgentPoolName }}
             imageName: ${{ parameters.linuxImage }}
+            runCodeQL: false
         ${{ if ne(parameters.macosImage, '') }}:
           macos:
             poolName: ${{ parameters.macosAgentPoolName }}
             imageName: ${{ parameters.macosImage }}
+            runCodeQL: false
         ${{ if ne(parameters.windowsImage, '') }}:
           windows:
             poolName: ${{ parameters.windowsAgentPoolName }}
             imageName: ${{ parameters.windowsImage }}
+            runCodeQL: true
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
     continueOnError: ${{ eq(parameters.continueOnError, 'true') }}
     dependsOn: ${{ parameters.dependsOn }}
+    variables:
+      Codeql.Enabled: $(runCodeQL)
     pool:
       name: $(poolName)
       vmImage: $(imageName)
@@ -256,7 +262,7 @@ jobs:
               --gitcommit="$(Build.SourceVersion)" `
               --gitbranch="$(Build.SourceBranch)" `
               --forcebuild="$force" `
-              --names="$names" `
+              --names "$names" `
               --targets="$targets" `
               --copyoutputtoroot=true `
               --configuration="${{ parameters.configuration }}" `
@@ -285,7 +291,7 @@ jobs:
               --gitcommit="$(Build.SourceVersion)" `
               --gitbranch="$(Build.SourceBranch)" `
               --forcebuild="$force" `
-              --names="$names" `
+              --names "$names" `
               --targets="$targets" `
               --copyoutputtoroot=true `
               --configuration="${{ parameters.configuration }}" `
@@ -360,6 +366,8 @@ jobs:
         inputs:
           PathToPublish: output
           ArtifactName: output-$(System.JobName)${{ parameters.publishOutputSuffix }}
+      # custom post-api-diff steps
+      - ${{ parameters.postDiffBuildSteps }}
       # run any required checks
       - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
         - task: ComponentGovernanceComponentDetection@0
@@ -424,7 +432,7 @@ jobs:
             instanceUrlForTsaV2: 'DEVDIV'
             projectNameDEVDIV: 'DevDiv'
             areaPath: '${{ parameters.areaPath }}'
-            iterationPath: 'DevDiv\OneVS'
+            iterationPath: 'DevDiv\Future Backlog'
             uploadAPIScan: false
             uploadBinSkim: false
             uploadCredScan: true