Skip to content

Commit 7a6625e

Browse files
author
Mirroring
committed
Merge commit '0e0b141e25b169e1749c7082c18ad916a75821de'
2 parents b6fdc71 + 0e0b141 commit 7a6625e

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
<Uri>https://github.com/dotnet/android</Uri>
1818
<Sha>1dcfb6f8779c33b6f768c996495cb90ecd729329</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
20+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.10971-net10-rc.2">
2121
<Uri>https://github.com/dotnet/macios</Uri>
22-
<Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
22+
<Sha>09be44394b0096f25556306005b445f4aaafb9db</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
24+
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.0" Version="26.0.10971-net10-rc.2">
2525
<Uri>https://github.com/dotnet/macios</Uri>
26-
<Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
26+
<Sha>09be44394b0096f25556306005b445f4aaafb9db</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
28+
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.0" Version="26.0.10971-net10-rc.2">
2929
<Uri>https://github.com/dotnet/macios</Uri>
30-
<Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
30+
<Sha>09be44394b0096f25556306005b445f4aaafb9db</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
32+
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.0" Version="26.0.10971-net10-rc.2">
3333
<Uri>https://github.com/dotnet/macios</Uri>
34-
<Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
34+
<Sha>09be44394b0096f25556306005b445f4aaafb9db</Sha>
3535
</Dependency>
3636
<!-- Previous .NET iOS version(s) -->
3737
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.105</MicrosoftNETSdkAndroidManifest90100PackageVersion>
5656
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
5757
<!-- xamarin/xamarin-macios -->
58-
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosoftMacCatalystSdknet100_260PackageVersion>
59-
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosoftmacOSSdknet100_260PackageVersion>
60-
<MicrosoftiOSSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosoftiOSSdknet100_260PackageVersion>
61-
<MicrosofttvOSSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosofttvOSSdknet100_260PackageVersion>
58+
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.10971-net10-rc.2</MicrosoftMacCatalystSdknet100_260PackageVersion>
59+
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.10971-net10-rc.2</MicrosoftmacOSSdknet100_260PackageVersion>
60+
<MicrosoftiOSSdknet100_260PackageVersion>26.0.10971-net10-rc.2</MicrosoftiOSSdknet100_260PackageVersion>
61+
<MicrosofttvOSSdknet100_260PackageVersion>26.0.10971-net10-rc.2</MicrosofttvOSSdknet100_260PackageVersion>
6262
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
6363
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9752</MicrosoftMacCatalystSdknet90_260PackageVersion>
6464
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9752</MicrosoftmacOSSdknet90_260PackageVersion>

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12134.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public Issue12134(TestDevice testDevice) : base(testDevice)
1515
[Test]
1616
[Category(UITestCategories.WebView)]
1717
[Category(UITestCategories.Compatibility)]
18-
18+
[FlakyTest("Temporarily disabled due to flakiness in CI. Tracking issue: https://github.com/dotnet/maui/issues/31869")]
1919
public void CookiesCorrectlyLoadWithMultipleWebViews()
2020
{
2121
VerifyInternetConnectivity();

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue30575.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public Issue30575(TestDevice device) : base(device) { }
1212

1313
[Test]
1414
[Category(UITestCategories.WebView)]
15+
[FlakyTest("Temporarily disabled due to flakiness in CI. Tracking issue: https://github.com/dotnet/maui/issues/31869")]
1516
public void WebViewShouldNotMirrored()
1617
{
1718
App.WaitForElement("WebViewLabel");

0 commit comments

Comments
 (0)