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.

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

[release/7.0.3xx-sr9] Bump iOS to correct 16.4.7121 #18222

Merged
merged 4 commits into from Oct 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Expand Up @@ -21,7 +21,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "8.0.0-prerelease.23431.1",
"version": "8.0.0-prerelease.23519.1",
"commands": [
"xharness"
]
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
Expand Up @@ -12,21 +12,21 @@
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>6678e0213cbced08ab39aa1563b84068e751d836</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.7117">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.7121">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>c0a2ffed7195092a50d3ed55a2be7e9f0bc25a24</Sha>
<Sha>7d5f56e6baef33132a077a2f00e352877ad2e4af</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.7117">
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.7121">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>c0a2ffed7195092a50d3ed55a2be7e9f0bc25a24</Sha>
<Sha>7d5f56e6baef33132a077a2f00e352877ad2e4af</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.7117">
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.7121">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>c0a2ffed7195092a50d3ed55a2be7e9f0bc25a24</Sha>
<Sha>7d5f56e6baef33132a077a2f00e352877ad2e4af</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.7117">
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.7121">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>c0a2ffed7195092a50d3ed55a2be7e9f0bc25a24</Sha>
<Sha>7d5f56e6baef33132a077a2f00e352877ad2e4af</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.11" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down Expand Up @@ -87,17 +87,17 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23431.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23519.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>1446eababf78d7787af2aa86d5393c342c4b1b0b</Sha>
<Sha>de2e6a5e7ac1f33558ba06af1173122d93f0962e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23431.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23519.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>1446eababf78d7787af2aa86d5393c342c4b1b0b</Sha>
<Sha>de2e6a5e7ac1f33558ba06af1173122d93f0962e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23431.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23519.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>1446eababf78d7787af2aa86d5393c342c4b1b0b</Sha>
<Sha>de2e6a5e7ac1f33558ba06af1173122d93f0962e</Sha>
</Dependency>
</ProductDependencies>
</Dependencies>
14 changes: 7 additions & 7 deletions eng/Versions.props
Expand Up @@ -22,10 +22,10 @@
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.95</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>16.4.7117</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.3.7117</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.4.7117</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.4.7117</MicrosofttvOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>16.4.7121</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.3.7121</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.4.7121</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.4.7121</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.120</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
Expand Down Expand Up @@ -71,9 +71,9 @@
<_HarfBuzzSharpVersion>7.3.0</_HarfBuzzSharpVersion>
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.e2c5c86249621857107c779af0f79b4d06613766.655</_SkiaSharpNativeAssetsVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23431.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23431.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23431.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23519.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23519.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23519.1</MicrosoftDotNetXHarnessCLIVersion>
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
<SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
<FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/variables.yml
Expand Up @@ -10,7 +10,7 @@ variables:
- name: REQUIRED_XCODE
value: 14.3.1
- name: DEVICETESTS_REQUIRED_XCODE
value: 14.3.1
value: 15.0.0
- name: LocBranchPrefix
value: 'loc-hb'
- name: isMainBranch
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/device-tests.yml
Expand Up @@ -73,6 +73,7 @@ parameters:
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
- Agent.OSVersion -equals 13.5

resources:
repositories:
Expand Down