Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[net6.0] Update dependencies from xamarin/xamarin-macios to support Xcode 14.3 #14675

Merged
merged 4 commits into from
Apr 20, 2023
Merged

[net6.0] Update dependencies from xamarin/xamarin-macios to support Xcode 14.3 #14675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c30f611
[net6.0] Update dependencies from xamarin/xamarin-macios to support X…
dalexsoto Apr 19, 2023
e05302f
Fix variables to use ventura
rmarinho Apr 20, 2023
0642c20
Fix yaml
rmarinho Apr 20, 2023
efb6a01
Bump xharness
rmarinho Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.22531.1",
"version": "1.0.0-prerelease.23212.1",
"commands": [
"xharness"
]
Expand Down
22 changes: 11 additions & 11 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>2801b26e0dcd7c20b42cf77fa6f23e70b7bce397</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.2.47">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.47">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>97664b121a66fd5713e9936525586c813202ebd1</Sha>
<Sha>08e0d3fe34c09a49cf2a8b6468171eb59729d78e</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="16.2.47">
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.47">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>97664b121a66fd5713e9936525586c813202ebd1</Sha>
<Sha>08e0d3fe34c09a49cf2a8b6468171eb59729d78e</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.1.285">
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.47">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>97664b121a66fd5713e9936525586c813202ebd1</Sha>
<Sha>08e0d3fe34c09a49cf2a8b6468171eb59729d78e</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="13.1.47">
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.47">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>97664b121a66fd5713e9936525586c813202ebd1</Sha>
<Sha>08e0d3fe34c09a49cf2a8b6468171eb59729d78e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.17" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down Expand Up @@ -75,17 +75,17 @@
<Uri>https://github.com/dotnet/Microsoft.Maui.Graphics</Uri>
<Sha>015c4cd2d4ce120e516d75601ef5e80004b141a7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22503.4">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.23212.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a8e8fc0ffeb9b8c56ab799597597ce35d5be6111</Sha>
<Sha>c1a5db9daed957c62a2c803809c7aeb6fc05f4a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22503.4">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23212.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a8e8fc0ffeb9b8c56ab799597597ce35d5be6111</Sha>
<Sha>c1a5db9daed957c62a2c803809c7aeb6fc05f4a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22503.4">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.23212.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a8e8fc0ffeb9b8c56ab799597597ce35d5be6111</Sha>
<Sha>c1a5db9daed957c62a2c803809c7aeb6fc05f4a3</Sha>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>32.0.506</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftiOSSdkPackageVersion>16.2.47</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>16.2.47</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.1.47</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.1.285</MicrosofttvOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.4.47</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>16.4.47</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.3.47</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.4.47</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
Expand Down Expand Up @@ -55,9 +55,9 @@
<_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22531.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22531.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22531.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.23212.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.23212.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.23212.1</MicrosoftDotNetXHarnessCLIVersion>
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
<SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
<FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ variables:
- name: DOTNET_VERSION
value: 5.0.201
- name: REQUIRED_XCODE
value: 14.2.0
value: 14.3.0
- name: DEVICETESTS_REQUIRED_XCODE
value: 14.2.0
value: 14.3.0
- name: LocBranchPrefix
value: 'loc-hb'
- name: isMainBranch
Expand Down
15 changes: 7 additions & 8 deletions eng/pipelines/device-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,16 @@ parameters:
name: $(androidTestsVmPool)
vmImage: $(androidTestsVmImage)
demands:
- macOS.Name -equals Monterey
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- name: iosPool
type: object
default:
name: $(iosTestsVmPool)
vmImage: $(iosTestsVmImage)

name: $(androidTestsVmPool)
vmImage: $(androidTestsVmImage)
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
resources:
repositories:
- repository: xamarin-templates
Expand All @@ -85,7 +87,7 @@ stages:
${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
androidApiLevels: [ 30, 29, 28, 27, 26, 25, 24, 23 ]
# androidApiLevels: [ 30, 29, 28, 27, 26, 25, 24, 23, 22, 21 ] # fix the issue of getting the test results off
iosVersions: [ 'latest', '14.5', '13.7', '12.4' ]
iosVersions: [ 'latest', '14.5', '13.7']
provisionatorChannel: ${{ parameters.provisionatorChannel }}
${{ if not(or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv')))) }}:
androidApiLevels: [ 30, 23 ]
Expand All @@ -102,18 +104,15 @@ stages:
desc: Core
androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
- name: controls
desc: Controls
androidApiLevelsExclude: [25] # Ignore for now API25 since the runs's are not stable
android: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
- name: blazorwebview
desc: BlazorWebView
androidApiLevelsExclude: [ 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
iosVersionsExclude: [ '12.4'] # Ignore iOS 12.4 while we can't make it work on CI
ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj

16 changes: 4 additions & 12 deletions eng/pipelines/handlers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,8 @@ stages:
name: ${{ BuildPlatform.poolName }}
vmImage: ${{ BuildPlatform.vmImage }}
demands:
- macOS.Name -equals Monterey
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- Agent.HasDevices -equals False
- Agent.IsPaired -equals False
steps:
- template: common/provision.yml
parameters:
Expand Down Expand Up @@ -186,10 +184,8 @@ stages:
name: ${{ PackPlatform.poolName }}
vmImage: ${{ PackPlatform.vmImage }}
demands:
- macOS.Name -equals Monterey
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- Agent.HasDevices -equals False
- Agent.IsPaired -equals False
steps:
- template: common/pack.yml
parameters:
Expand Down Expand Up @@ -217,10 +213,8 @@ stages:
name: ${{ BuildPlatform.poolName }}
vmImage: ${{ BuildPlatform.vmImage }}
demands:
- macOS.Name -equals Monterey
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- Agent.HasDevices -equals False
- Agent.IsPaired -equals False
steps:
- template: common/provision.yml
parameters:
Expand Down Expand Up @@ -272,10 +266,8 @@ stages:
name: ${{ BuildPlatform.poolName }}
vmImage: ${{ BuildPlatform.vmImage }}
demands:
- macOS.Name -equals Monterey
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- Agent.HasDevices -equals False
- Agent.IsPaired -equals False
steps:
- template: common/provision.yml
parameters:
Expand Down