From 294dff1ceec4c5a0b3e361f228018e6ea4f65ca5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 12:39:53 -0400 Subject: [PATCH] [release/6.0.1xx-rc1] Update dependencies from xamarin/xamarin-android (#2369) * Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.1xx-rc1-3793f6e34c40e3aa1a00d0dbe6dd0d706283e197-1 Microsoft.Android.Sdk.Windows From Version 31.0.100-rc.1.12 -> To Version 31.0.100-rc.1.16 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-rc.1.21426.8 -> To Version 6.0.0-rc.1.21451.13 (parent: Microsoft.Dotnet.Sdk.Internal * Remove incorrect LangVersion 9.0 and use default Razor Source Generator needs at least 10.0 * Explicitly set LangVersion=10.0 * Use $(LangVersion) preview, because dotnet/maui builds with VS Context: https://github.com/dotnet/sdk/compare/10efeed02f5a0aa68eae07c639d2c33b66b017f3...454eae34a9e8a821ed6b37eab2fb3bb07d720169 This was removed from the dotnet/sdk: preview So I think we need to opt into `preview` to build with the older Roslyn in VS. * Keep Controls.Core.UnitTests on C# 9 This apparently breaks NUnit `Assert.That()` calls. I could build the project locally after this change. * Try start vs4mac with local dotnet * Revert "Try start vs4mac with local dotnet" This reverts commit 85ce42ddaf6445b06f9ef2a2cb4c737168d20635. * Update LifecycleEventsTests.cs I think we might also be hitting some method overloading issues in these test failures: * `CanAddMultipleEventsViaMultipleConfigureLifecycleEvents` * `CanAddMultipleEventsViaBuilder` * `EventsFireExactlyOnce` * Revert "Update LifecycleEventsTests.cs" This reverts commit 90c233d43042a5e5bebf7d5c74400346ad7a1b87. * Keep Core.UnitTests on C# 9 This solves 3 test failures: > .\bin\dotnet\dotnet.exe test src\Core\tests\UnitTests\Core.UnitTests-net6.csproj -bl ... [xUnit.net 00:00:00.60] CanAddMultipleEventsViaMultipleConfigureLifecycleEvents [FAIL] Failed CanAddMultipleEventsViaMultipleConfigureLifecycleEvents [10 ms] Error Message: Assert.Equal() Failure Expected: 1 Actual: 0 Stack Trace: at Microsoft.Maui.UnitTests.LifecycleEvents.LifecycleEventsTests.CanAddMultipleEventsViaMultipleConfigureLifecycleEvents() in C:\src\maui\src\Core\tests\UnitTests\LifecycleEvents\LifecycleEventsTests.cs:line 134 [xUnit.net 00:00:00.62] EventsFireExactlyOnce [FAIL] [xUnit.net 00:00:00.62] CanAddMultipleEventsViaBuilder [FAIL] Failed EventsFireExactlyOnce [2 ms] Error Message: Assert.Equal() Failure Expected: 1 Actual: 0 Stack Trace: at Microsoft.Maui.UnitTests.LifecycleEvents.LifecycleEventsTests.EventsFireExactlyOnce() in C:\src\maui\src\Core\tests\UnitTests\LifecycleEvents\LifecycleEventsTests.cs:line 75 Failed CanAddMultipleEventsViaBuilder [2 ms] Error Message: Assert.Equal() Failure Expected: 1 Actual: 0 Stack Trace: at Microsoft.Maui.UnitTests.LifecycleEvents.LifecycleEventsTests.CanAddMultipleEventsViaBuilder() in C:\src\maui\src\Core\tests\UnitTests\LifecycleEvents\LifecycleEventsTests.cs:line 156 Failed! - Failed: 3, Passed: 367, Skipped: 0, Total: 370, Duration: 192 ms - Microsoft.Maui.UnitTests.dll (net6.0) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Eilon Lipton Co-authored-by: Jonathan Peppers Co-authored-by: Rui Marinho --- eng/Environment.Build.props | 2 +- eng/Version.Details.xml | 88 +++++++++---------- eng/Versions.props | 44 +++++----- ....AspNetCore.Components.WebView.Maui.csproj | 1 - .../Controls.Sample.iOS.csproj | 3 - .../Controls.Core.UnitTests-net6.csproj | 5 ++ .../UnitTests/Core.UnitTests-net6.csproj | 7 +- .../Resizetizer/src/Resizetizer.csproj | 2 +- 8 files changed, 78 insertions(+), 74 deletions(-) diff --git a/eng/Environment.Build.props b/eng/Environment.Build.props index e3be1908ad8e..b935281db76e 100644 --- a/eng/Environment.Build.props +++ b/eng/Environment.Build.props @@ -28,7 +28,7 @@ - latest + preview diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index faef2fc856e8..3ddf71bbbcb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 91aa470f1e6c40e1de1050f5ea63480e14fdc592 + 3f29ca0c1497b2cc723671938299e99dff90069f - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/xamarin/xamarin-android - eadb58fc2d6e32759c1e6a8e500b4cfec36a0a51 + 3793f6e34c40e3aa1a00d0dbe6dd0d706283e197 https://github.com/xamarin/xamarin-macios @@ -28,81 +28,81 @@ https://github.com/xamarin/xamarin-macios 25ff25166b865b5c0869f924706aed115edb11e4 - + https://github.com/dotnet/aspnetcore - 6fe6de59abd1eedacd5fa50493b936e87e1f8132 + 516f7ba4cb94c600ddce4aa4bc7088f6366ef066 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 - + https://github.com/dotnet/aspnetcore - 6fe6de59abd1eedacd5fa50493b936e87e1f8132 + 516f7ba4cb94c600ddce4aa4bc7088f6366ef066 - + https://github.com/dotnet/aspnetcore - 6fe6de59abd1eedacd5fa50493b936e87e1f8132 + 516f7ba4cb94c600ddce4aa4bc7088f6366ef066 - + https://github.com/dotnet/aspnetcore - 6fe6de59abd1eedacd5fa50493b936e87e1f8132 + 516f7ba4cb94c600ddce4aa4bc7088f6366ef066 - + https://github.com/dotnet/aspnetcore - 6fe6de59abd1eedacd5fa50493b936e87e1f8132 + 516f7ba4cb94c600ddce4aa4bc7088f6366ef066 - + https://github.com/dotnet/windowsdesktop - e2050f7eb3a26db403e39fed0da33aa098cc554c + f7325d55937fbfcd28a1b61fcbea420f2fc79c72 - + https://github.com/dotnet/runtime - 476a03e554142c324f05045966d4b9fc28d70bd1 + d7619cd4b165c13430484e381042f055d4c5a9c7 diff --git a/eng/Versions.props b/eng/Versions.props index a04fe868ae53..394dceb698d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,32 +1,32 @@ - 6.0.100-rc.1.21426.23 - 6.0.0-rc.1.21426.8 - 31.0.100-rc.1.12 + 6.0.100-rc.1.21452.4 + 6.0.0-rc.1.21451.13 + 31.0.100-rc.1.16 15.0.100-rc.1.1534 15.0.100-rc.1.1534 15.0.100-rc.1.1534 12.0.100-rc.1.1534 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21426.8 - 6.0.0-rc.1.21425.34 - 6.0.0-rc.1.21425.34 - 6.0.0-rc.1.21425.34 - 6.0.0-rc.1.21425.34 - 6.0.0-rc.1.21425.34 - 6.0.0-rc.1.21426.11 - 6.0.0-rc.1.21426.8 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.13 + 6.0.0-rc.1.21451.36 + 6.0.0-rc.1.21451.36 + 6.0.0-rc.1.21451.36 + 6.0.0-rc.1.21451.36 + 6.0.0-rc.1.21451.36 + 6.0.0-rc.1.21451.3 + 6.0.0-rc.1.21451.13 diff --git a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj index a45718aa7e0e..a9f10bab1333 100644 --- a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj +++ b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj @@ -2,7 +2,6 @@ net6.0;$(MauiPlatforms) - 9.0 enable Build .NET MAUI applications with Blazor web UI in the BlazorWebView control. diff --git a/src/Controls/samples/Controls.Sample.iOS/Controls.Sample.iOS.csproj b/src/Controls/samples/Controls.Sample.iOS/Controls.Sample.iOS.csproj index 9b022fad9b07..f34eee1ac23c 100644 --- a/src/Controls/samples/Controls.Sample.iOS/Controls.Sample.iOS.csproj +++ b/src/Controls/samples/Controls.Sample.iOS/Controls.Sample.iOS.csproj @@ -1,8 +1,5 @@  - - 9.0 - Debug iPhoneSimulator diff --git a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests-net6.csproj b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests-net6.csproj index ce40cf260346..420b1db26ce0 100644 --- a/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests-net6.csproj +++ b/src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests-net6.csproj @@ -5,6 +5,11 @@ Microsoft.Maui.Controls.Core.UnitTests false 0114;0672;0108;0067;0168;0169;0219;0612;0618;1998;4014 + + 9.0 diff --git a/src/Core/tests/UnitTests/Core.UnitTests-net6.csproj b/src/Core/tests/UnitTests/Core.UnitTests-net6.csproj index 0c8e7b3de544..cdeb37850d77 100644 --- a/src/Core/tests/UnitTests/Core.UnitTests-net6.csproj +++ b/src/Core/tests/UnitTests/Core.UnitTests-net6.csproj @@ -4,8 +4,11 @@ net6.0 Microsoft.Maui.UnitTests false - - preview + + 9.0 diff --git a/src/SingleProject/Resizetizer/src/Resizetizer.csproj b/src/SingleProject/Resizetizer/src/Resizetizer.csproj index 8037a6f898b5..9aaebdd08516 100644 --- a/src/SingleProject/Resizetizer/src/Resizetizer.csproj +++ b/src/SingleProject/Resizetizer/src/Resizetizer.csproj @@ -5,7 +5,7 @@ Microsoft.Maui.Resizetizer Microsoft.Maui.Resizetizer - 9.0 + 10.0 false false