From 05407f5bb34eb88f2fc0ec9491b7ba64e2d37cad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 May 2021 09:07:13 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.1xx-preview5-13ea326da0459d7d24d9b265796a21b8a2516bfa-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-ci.main.2 -> To Version 30.0.100-ci.6-0-1xx-preview5.13 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.5.21260.2 -> To Version 6.0.100-preview.5.21266.3 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ee2cbf3cd6a..f2481107ea01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/installer - c1feef4a98dfc1bd2913b876e620d2ed2a01b90b + f442964a34125c76240b1bf2d2c53fdb00d53e41 - + https://github.com/xamarin/xamarin-android - 92efdccb686454be32d742b8ca9f6a166a7c1808 + 13ea326da0459d7d24d9b265796a21b8a2516bfa https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 8f95b9f0a634..ba57349ea7cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,8 +1,8 @@ - 6.0.100-preview.5.21260.2 - 30.0.100-ci.main.2 + 6.0.100-preview.5.21266.3 + 30.0.100-ci.6-0-1xx-preview5.13 14.5.100-ci.main.873 14.5.100-ci.main.873 14.5.100-ci.main.873 From 950422d43b816e15f982d0289a01a7f7942d3533 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 27 May 2021 11:20:35 -0500 Subject: [PATCH 2/4] [essentials] remove usage of obsolete type Context: https://github.com/dotnet/runtime/blob/5dcc340a17e32d81dc12f644449c8b58396b2fd7/src/libraries/System.Security.Cryptography.Csp/src/System/Security/Cryptography/MD5CryptoServiceProvider.cs#L9 Build was failing with: SecureStorage.android.cs(134,26): error SYSLIB0021: 'MD5CryptoServiceProvider' is obsolete: 'Derived cryptographic types are obsolete. Use the Create method on the base type instead.' This API appears to have changed with the latest dotnet/installer. We can just use `MD5.Create()` instead. --- src/Essentials/src/SecureStorage/SecureStorage.android.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Essentials/src/SecureStorage/SecureStorage.android.cs b/src/Essentials/src/SecureStorage/SecureStorage.android.cs index 8671ca7606f5..1b468108d4c0 100644 --- a/src/Essentials/src/SecureStorage/SecureStorage.android.cs +++ b/src/Essentials/src/SecureStorage/SecureStorage.android.cs @@ -131,7 +131,7 @@ static void PlatformRemoveAll() => internal static string Md5Hash(string input) { var hash = new StringBuilder(); - var md5provider = new System.Security.Cryptography.MD5CryptoServiceProvider(); + var md5provider = System.Security.Cryptography.MD5.Create(); var bytes = md5provider.ComputeHash(Encoding.UTF8.GetBytes(input)); for (var i = 0; i < bytes.Length; i++) From 113dbc1c7d09d553ab7ef8e1cd08d6b4432dbc4b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 27 May 2021 11:40:16 -0500 Subject: [PATCH 3/4] [Core.UnitTests] set $(LangVersion) to preview Build currently fails for a .NET 6.0 project: LifecycleEventsTests.cs(26,77): error CS8652: The feature 'inferred delegate type' is currently in Preview and *unsupported*. To use Preview features, use the 'preview' language version. I think we can just set `$(LangVersion)` to `preview` for now. --- src/Core/tests/UnitTests/Core.UnitTests.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Core/tests/UnitTests/Core.UnitTests.csproj b/src/Core/tests/UnitTests/Core.UnitTests.csproj index e0ea601cc5bf..f54cf66c0e79 100644 --- a/src/Core/tests/UnitTests/Core.UnitTests.csproj +++ b/src/Core/tests/UnitTests/Core.UnitTests.csproj @@ -5,6 +5,8 @@ net6.0 Microsoft.Maui.UnitTests false + + preview From a6a4dda88ef5825a0794b2db02666827d1d3bbf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 May 2021 12:32:34 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.1xx-preview5-198eefffbb663bf1a5b9bbae9873b40bd9713c4a-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-ci.main.2 -> To Version 30.0.100-preview.5.18 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.5.21260.2 -> To Version 6.0.100-preview.5.21275.1 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04a93d33c963..e9cf1281ec25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/installer - f442964a34125c76240b1bf2d2c53fdb00d53e41 + 74b69d2926768f9f8c9d3e70381a754dc3ea4c7e - + https://github.com/xamarin/xamarin-android - 13ea326da0459d7d24d9b265796a21b8a2516bfa + 198eefffbb663bf1a5b9bbae9873b40bd9713c4a https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index a66a2996e5e8..227d61c9fbf0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,8 +1,8 @@ - 6.0.100-preview.5.21266.3 - 30.0.100-ci.6-0-1xx-preview5.13 + 6.0.100-preview.5.21275.1 + 30.0.100-preview.5.18 14.5.100-preview.5.879 14.5.100-preview.5.879 14.5.100-preview.5.879