From 090ed06ac4cdabea6fbc2344258baa9b5d84d065 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 14 Jun 2022 10:05:27 -0500 Subject: [PATCH] [ci] Changes to fix CI. --- .ci/build-manifest.cake | 10 +--------- .ci/build.steps.v1.yml | 6 +++--- .ci/build.v1.yml | 2 +- .ci/build.yml | 6 +++--- azure-pipelines.yml | 2 +- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.ci/build-manifest.cake b/.ci/build-manifest.cake index b4ea9800ee..59b26a23b9 100644 --- a/.ci/build-manifest.cake +++ b/.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 IsMac = new Lazy (IsRunningOnMac); diff --git a/.ci/build.steps.v1.yml b/.ci/build.steps.v1.yml index fc0220537d..99ca47e32b 100644 --- a/.ci/build.steps.v1.yml +++ b/.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 }}" ` diff --git a/.ci/build.v1.yml b/.ci/build.v1.yml index 61dc00a69f..0d4c60d5ef 100644 --- a/.ci/build.v1.yml +++ b/.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 diff --git a/.ci/build.yml b/.ci/build.yml index 3373708b4f..c69a1ce6e6 100644 --- a/.ci/build.yml +++ b/.ci/build.yml @@ -31,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 @@ -257,7 +257,7 @@ jobs: --gitcommit="$(Build.SourceVersion)" ` --gitbranch="$(Build.SourceBranch)" ` --forcebuild="$force" ` - --names="$names" ` + --names "$names" ` --targets="$targets" ` --copyoutputtoroot=true ` --configuration="${{ parameters.configuration }}" ` @@ -286,7 +286,7 @@ jobs: --gitcommit="$(Build.SourceVersion)" ` --gitbranch="$(Build.SourceBranch)" ` --forcebuild="$force" ` - --names="$names" ` + --names "$names" ` --targets="$targets" ` --copyoutputtoroot=true ` --configuration="${{ parameters.configuration }}" ` diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f69dff093f..5537fc916f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,7 +34,7 @@ jobs: windowsImage: '' windowsImageOverride: AzurePipelinesWindows2019compliant - xcode: 13.3.1 + xcode: 13.2.1 buildType: 'manifest' linuxAgentPoolName: AzurePipelines-EO