Skip to content

Commit a73cba4

Browse files
dalexsotormarinho
dalexsoto
and
rmarinho
authored
[net6.0] Update dependencies from xamarin/xamarin-macios to support Xcode 14.3 (#14675)
* [net6.0] Update dependencies from xamarin/xamarin-macios to support Xcode 14.3 * Fix variables to use ventura * Fix yaml * Bump xharness --------- Co-authored-by: Rui Marinho <[email protected]>
1 parent d34136e commit a73cba4

File tree

6 files changed

+32
-41
lines changed

6 files changed

+32
-41
lines changed

Diff for: ‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "1.0.0-prerelease.22531.1",
18+
"version": "1.0.0-prerelease.23212.1",
1919
"commands": [
2020
"xharness"
2121
]

Diff for: ‎eng/Version.Details.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
<Uri>https://github.com/xamarin/xamarin-android</Uri>
1313
<Sha>62133656a097f5c27714e8207c1d2eb2397ea3a4</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.2.47">
15+
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.47">
1616
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
17-
<Sha>97664b121a66fd5713e9936525586c813202ebd1</Sha>
17+
<Sha>08e0d3fe34c09a49cf2a8b6468171eb59729d78e</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.iOS.Sdk" Version="16.2.47">
19+
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.47">
2020
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
21-
<Sha>97664b121a66fd5713e9936525586c813202ebd1</Sha>
21+
<Sha>08e0d3fe34c09a49cf2a8b6468171eb59729d78e</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.1.285">
23+
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.47">
2424
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
25-
<Sha>97664b121a66fd5713e9936525586c813202ebd1</Sha>
25+
<Sha>08e0d3fe34c09a49cf2a8b6468171eb59729d78e</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.macOS.Sdk" Version="13.1.47">
27+
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.47">
2828
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
29-
<Sha>97664b121a66fd5713e9936525586c813202ebd1</Sha>
29+
<Sha>08e0d3fe34c09a49cf2a8b6468171eb59729d78e</Sha>
3030
</Dependency>
3131
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.17" CoherentParentDependency="Microsoft.NETCore.App.Ref">
3232
<Uri>https://github.com/dotnet/emsdk</Uri>
@@ -75,17 +75,17 @@
7575
<Uri>https://github.com/dotnet/Microsoft.Maui.Graphics</Uri>
7676
<Sha>015c4cd2d4ce120e516d75601ef5e80004b141a7</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22503.4">
78+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.23212.1">
7979
<Uri>https://github.com/dotnet/xharness</Uri>
8080
<Sha>a8e8fc0ffeb9b8c56ab799597597ce35d5be6111</Sha>
8181
<Sha>c1a5db9daed957c62a2c803809c7aeb6fc05f4a3</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22503.4">
83+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23212.1">
8484
<Uri>https://github.com/dotnet/xharness</Uri>
8585
<Sha>a8e8fc0ffeb9b8c56ab799597597ce35d5be6111</Sha>
8686
<Sha>c1a5db9daed957c62a2c803809c7aeb6fc05f4a3</Sha>
8787
</Dependency>
88-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22503.4">
88+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.23212.1">
8989
<Uri>https://github.com/dotnet/xharness</Uri>
9090
<Sha>a8e8fc0ffeb9b8c56ab799597597ce35d5be6111</Sha>
9191
<Sha>c1a5db9daed957c62a2c803809c7aeb6fc05f4a3</Sha>

Diff for: ‎eng/Versions.props

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<!-- xamarin/xamarin-android -->
1212
<MicrosoftAndroidSdkWindowsPackageVersion>32.0.507</MicrosoftAndroidSdkWindowsPackageVersion>
1313
<!-- xamarin/xamarin-macios -->
14-
<MicrosoftiOSSdkPackageVersion>16.2.47</MicrosoftiOSSdkPackageVersion>
15-
<MicrosoftMacCatalystSdkPackageVersion>16.2.47</MicrosoftMacCatalystSdkPackageVersion>
16-
<MicrosoftmacOSSdkPackageVersion>13.1.47</MicrosoftmacOSSdkPackageVersion>
17-
<MicrosofttvOSSdkPackageVersion>16.1.285</MicrosofttvOSSdkPackageVersion>
14+
<MicrosoftiOSSdkPackageVersion>16.4.47</MicrosoftiOSSdkPackageVersion>
15+
<MicrosoftMacCatalystSdkPackageVersion>16.4.47</MicrosoftMacCatalystSdkPackageVersion>
16+
<MicrosoftmacOSSdkPackageVersion>13.3.47</MicrosoftmacOSSdkPackageVersion>
17+
<MicrosofttvOSSdkPackageVersion>16.4.47</MicrosofttvOSSdkPackageVersion>
1818
<!-- Samsung/Tizen.NET -->
1919
<SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>
2020
<!-- emsdk -->
@@ -55,9 +55,9 @@
5555
<_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
5656
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
5757
<MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
58-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22531.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
59-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22531.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
60-
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22531.1</MicrosoftDotNetXHarnessCLIVersion>
58+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.23212.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
59+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.23212.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
60+
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.23212.1</MicrosoftDotNetXHarnessCLIVersion>
6161
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
6262
<SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
6363
<FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

Diff for: ‎eng/pipelines/common/variables.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ variables:
88
- name: DOTNET_VERSION
99
value: 5.0.201
1010
- name: REQUIRED_XCODE
11-
value: 14.2.0
11+
value: 14.3.0
1212
- name: DEVICETESTS_REQUIRED_XCODE
13-
value: 14.2.0
13+
value: 14.3.0
1414
- name: LocBranchPrefix
1515
value: 'loc-hb'
1616
- name: isMainBranch

Diff for: ‎eng/pipelines/device-tests.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,16 @@ parameters:
6060
name: $(androidTestsVmPool)
6161
vmImage: $(androidTestsVmImage)
6262
demands:
63-
- macOS.Name -equals Monterey
63+
- macOS.Name -equals Ventura
6464
- macOS.Architecture -equals x64
6565
- name: iosPool
6666
type: object
6767
default:
68-
name: $(iosTestsVmPool)
69-
vmImage: $(iosTestsVmImage)
70-
68+
name: $(androidTestsVmPool)
69+
vmImage: $(androidTestsVmImage)
70+
demands:
71+
- macOS.Name -equals Ventura
72+
- macOS.Architecture -equals x64
7173
resources:
7274
repositories:
7375
- repository: xamarin-templates
@@ -85,7 +87,7 @@ stages:
8587
${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
8688
androidApiLevels: [ 30, 29, 28, 27, 26, 25, 24, 23 ]
8789
# androidApiLevels: [ 30, 29, 28, 27, 26, 25, 24, 23, 22, 21 ] # fix the issue of getting the test results off
88-
iosVersions: [ 'latest', '14.5', '13.7', '12.4' ]
90+
iosVersions: [ 'latest', '14.5', '13.7']
8991
provisionatorChannel: ${{ parameters.provisionatorChannel }}
9092
${{ if not(or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv')))) }}:
9193
androidApiLevels: [ 30, 23 ]
@@ -102,18 +104,15 @@ stages:
102104
desc: Core
103105
androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
104106
android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
105-
iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
106107
ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
107108
- name: controls
108109
desc: Controls
109110
androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
110111
android: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
111-
iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
112112
ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
113113
- name: blazorwebview
114114
desc: BlazorWebView
115115
androidApiLevelsExclude: [ 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
116116
android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
117-
iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
118117
ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
119118

Diff for: ‎eng/pipelines/handlers.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,8 @@ stages:
139139
name: ${{ BuildPlatform.poolName }}
140140
vmImage: ${{ BuildPlatform.vmImage }}
141141
demands:
142-
- macOS.Name -equals Monterey
142+
- macOS.Name -equals Ventura
143143
- macOS.Architecture -equals x64
144-
- Agent.HasDevices -equals False
145-
- Agent.IsPaired -equals False
146144
steps:
147145
- template: common/provision.yml
148146
parameters:
@@ -186,10 +184,8 @@ stages:
186184
name: ${{ PackPlatform.poolName }}
187185
vmImage: ${{ PackPlatform.vmImage }}
188186
demands:
189-
- macOS.Name -equals Monterey
187+
- macOS.Name -equals Ventura
190188
- macOS.Architecture -equals x64
191-
- Agent.HasDevices -equals False
192-
- Agent.IsPaired -equals False
193189
steps:
194190
- template: common/pack.yml
195191
parameters:
@@ -217,10 +213,8 @@ stages:
217213
name: ${{ BuildPlatform.poolName }}
218214
vmImage: ${{ BuildPlatform.vmImage }}
219215
demands:
220-
- macOS.Name -equals Monterey
216+
- macOS.Name -equals Ventura
221217
- macOS.Architecture -equals x64
222-
- Agent.HasDevices -equals False
223-
- Agent.IsPaired -equals False
224218
steps:
225219
- template: common/provision.yml
226220
parameters:
@@ -272,10 +266,8 @@ stages:
272266
name: ${{ BuildPlatform.poolName }}
273267
vmImage: ${{ BuildPlatform.vmImage }}
274268
demands:
275-
- macOS.Name -equals Monterey
269+
- macOS.Name -equals Ventura
276270
- macOS.Architecture -equals x64
277-
- Agent.HasDevices -equals False
278-
- Agent.IsPaired -equals False
279271
steps:
280272
- template: common/provision.yml
281273
parameters:

0 commit comments

Comments
 (0)