Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 9a5806c

Browse files
authored
[ci] Changes to fix CI. (#1385)
1 parent 6c44369 commit 9a5806c

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

.ci/build-manifest.cake

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#addin nuget:?package=Cake.XCode&version=4.2.0
1+
#addin nuget:?package=Cake.XCode&version=5.0.0
22
#addin nuget:?package=Cake.Yaml&version=3.1.0&loadDependencies=true
33
#addin nuget:?package=Cake.Json&version=4.0.0&loadDependencies=true
44
#addin nuget:?package=Xamarin.Nuget.Validator&version=1.1.1
@@ -418,14 +418,6 @@ public class BuildGroup {
418418
public override string ToString () => Name;
419419
}
420420

421-
bool IsRunningOnMacOs () {
422-
return System.Environment.OSVersion.Platform == PlatformID.MacOSX || MacPlatformDetector.IsMac.Value;
423-
}
424-
425-
bool IsRunningOnLinux () {
426-
return IsRunningOnUnix () && !IsRunningOnMacOs ();
427-
}
428-
429421
internal static class MacPlatformDetector {
430422
internal static readonly Lazy<bool> IsMac = new Lazy<bool> (IsRunningOnMac);
431423

.ci/build.steps.v1.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ parameters:
2828
windowsImage: 'windows-latest' # the name of the Windows VM image
2929
windowsImageOverride: '' # used to access 1ES hardened images: name of ImageOverride demand to use such as AzurePipelinesWindows2022compliant when windowsAgentPoolName set to the AzurePipelines-EO pool
3030
mono: 'Latest' # the version of mono to use
31-
xcode: '13.3.1' # the version of Xcode to use
31+
xcode: '13.2.1' # the version of Xcode to use
3232
dotnet: '6.0.300' # the version of .NET Core to use
3333
dotnetStable: '6.0.300' # the stable version of .NET Core to use
3434
cake: '2.2.0' # the version of Cake to use
@@ -231,7 +231,7 @@ steps:
231231
--gitcommit="$(Build.SourceVersion)" `
232232
--gitbranch="$(Build.SourceBranch)" `
233233
--forcebuild="$force" `
234-
--names="$names" `
234+
--names "$names" `
235235
--targets="$targets" `
236236
--copyoutputtoroot=true `
237237
--configuration="${{ parameters.configuration }}" `
@@ -260,7 +260,7 @@ steps:
260260
--gitcommit="$(Build.SourceVersion)" `
261261
--gitbranch="$(Build.SourceBranch)" `
262262
--forcebuild="$force" `
263-
--names="$names" `
263+
--names "$names" `
264264
--targets="$targets" `
265265
--copyoutputtoroot=true `
266266
--configuration="${{ parameters.configuration }}" `

.ci/build.v1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ parameters:
3232
windowsImage: 'windows-latest' # the name of the Windows VM image
3333
windowsImageOverride: '' # used to access 1ES hardened images: name of ImageOverride demand to use such as AzurePipelinesWindows2022compliant when windowsAgentPoolName set to the AzurePipelines-EO pool
3434
mono: 'Latest' # the version of mono to use
35-
xcode: '13.3.1' # the version of Xcode to use
35+
xcode: '13.2.1' # the version of Xcode to use
3636
dotnet: '6.0.300' # the version of .NET Core to use
3737
dotnetStable: '6.0.300' # the stable version of .NET Core to use
3838
cake: '2.2.0' # the version of Cake to use

.ci/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ parameters:
3131
# macOS-11 required for XCode 13.1
3232
windowsImage: 'windows-latest' # the name of the Windows VM image
3333
mono: 'Latest' # the version of mono to use
34-
xcode: '13.3.1' # the version of Xcode to use
34+
xcode: '13.2.1' # the version of Xcode to use
3535
dotnet: '6.0.300' # the version of .NET Core to use
3636
dotnetStable: '6.0.300' # the stable version of .NET Core to use
3737
cake: '2.2.0' # the version of Cake to use
@@ -257,7 +257,7 @@ jobs:
257257
--gitcommit="$(Build.SourceVersion)" `
258258
--gitbranch="$(Build.SourceBranch)" `
259259
--forcebuild="$force" `
260-
--names="$names" `
260+
--names "$names" `
261261
--targets="$targets" `
262262
--copyoutputtoroot=true `
263263
--configuration="${{ parameters.configuration }}" `
@@ -286,7 +286,7 @@ jobs:
286286
--gitcommit="$(Build.SourceVersion)" `
287287
--gitbranch="$(Build.SourceBranch)" `
288288
--forcebuild="$force" `
289-
--names="$names" `
289+
--names "$names" `
290290
--targets="$targets" `
291291
--copyoutputtoroot=true `
292292
--configuration="${{ parameters.configuration }}" `

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
windowsImage: ''
3535
windowsImageOverride: AzurePipelinesWindows2019compliant
3636

37-
xcode: 13.3.1
37+
xcode: 13.2.1
3838
buildType: 'manifest'
3939

4040
linuxAgentPoolName: AzurePipelines-EO

0 commit comments

Comments
 (0)