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

Commit 3784089

Browse files
committed
[ci] Revert cake version bump to fix CI.
1 parent 6c44369 commit 3784089

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,14 @@ resources:
1212
name: xamarin/yaml-templates
1313
endpoint: xamarin
1414
ref: refs/heads/main
15-
- repository: components
16-
type: github
17-
name: xamarin/XamarinComponents
18-
endpoint: xamarin
19-
ref: refs/heads/main
2015

2116
variables:
2217
DotNet6Version: 6.0.300
2318
XamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-1-windows
2419
# NOTE: there wasn't a public release of 16.11 for macOS
2520
XamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/5673868/d17-1/19b97b7614b275a84d9e38096bd1fe0e25a494d4/xamarin.android-12.2.0.4.pkg
2621
jobs:
27-
- template: .ci/build.v1.yml@components
22+
- template: .ci/build.v1.yml
2823
parameters:
2924
timeoutInMinutes: 360
3025
areaPath: 'DevDiv\Xamarin SDK\Android'

0 commit comments

Comments
 (0)