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

[iOS][MacOS] Run tests on iOS 17 and MacOS 14 scouting queues #88479

Closed
wants to merge 5 commits into from
Closed

[iOS][MacOS] Run tests on iOS 17 and MacOS 14 scouting queues #88479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
159d4d6
[iOS][MacOS] Run tests on iOS 17 and MacOS 14 scouting queues
Jul 6, 2023
f3c7626
Merge remote-tracking branch 'upstream/main' into test-ios17-macos14
Jul 25, 2023
e5e7316
Bump min ios / tvos version to 12.0
Jul 27, 2023
df8d7d3
Merge remote-tracking branch 'upstream/main' into test-ios17-macos14
Sep 27, 2023
0d9b176
Merge remote-tracking branch 'upstream/main' into test-ios17-macos14
Oct 27, 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
6 changes: 4 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,10 @@
- dotnet/installer repo > src/redist/targets/GeneratePKG.targets
-->
<AndroidApiLevelMin>21</AndroidApiLevelMin>
<iOSVersionMin>11.0</iOSVersionMin>
<tvOSVersionMin>11.0</tvOSVersionMin>
<iOSVersionMin>12.0</iOSVersionMin>
<tvOSVersionMin>12.0</tvOSVersionMin>
<watchOSVersionMin>2.0</watchOSVersionMin>
<watchOS64_32VersionMin>5.1</watchOS64_32VersionMin>
<macOSVersionMin>10.15</macOSVersionMin>
<macOSVersionMin Condition="('$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst') and '$(TargetArchitecture)' == 'arm64'">11.0</macOSVersionMin>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- OSX.1200.Amd64.Open
- OSX.Amd64.Scouting.Open

# Android
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
Expand All @@ -112,11 +112,11 @@ jobs:

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- OSX.13.Amd64.Iphone.Open
- OSX.Amd64.Iphone.Scouting.Open

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
- OSX.13.Amd64.AppleTV.Open
- OSX.Amd64.AppleTV.Scouting.Open

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/AppleAppBuilder/Xcode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public void CreateXcodeProject(string projectName, string cmakeDirectoryPath)
targetName = Target.ToString();
break;
}
var deployTarget = (Target == TargetNames.MacCatalyst) ? " -DCMAKE_OSX_ARCHITECTURES=" + XcodeArch : " -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0";
var deployTarget = (Target == TargetNames.MacCatalyst) ? " -DCMAKE_OSX_ARCHITECTURES=" + XcodeArch : " -DCMAKE_OSX_DEPLOYMENT_TARGET=12.0";
var cmakeArgs = new StringBuilder();
cmakeArgs
.Append("-S.")
Expand Down
Loading