From e047347f0199459a66d300f355c8aeb60fa7ab13 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 28 May 2021 13:44:22 +0000
Subject: [PATCH] [main] Update dependencies from xamarin/xamarin-android
 (#1101)

[main] Update dependencies from xamarin/xamarin-android
- Coherency Updates:
  - Microsoft.Dotnet.Sdk.Internal: from 6.0.100-preview.5.21260.2 to 6.0.100-preview.5.21275.1 (parent: Microsoft.Android.Sdk.Windows)

 - Merge branch 'main' into darc-main-e5d2e046-584d-497f-91b1-14b49fe0e7c1

 - [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.

 - [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.
---
 eng/Version.Details.xml                                   | 8 ++++----
 eng/Versions.props                                        | 4 ++--
 src/Core/tests/UnitTests/Core.UnitTests.csproj            | 2 ++
 src/Essentials/src/SecureStorage/SecureStorage.android.cs | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ed03b6ef7a00..e9cf1281ec25 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,12 +1,12 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.5.21260.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.5.21275.1" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>c1feef4a98dfc1bd2913b876e620d2ed2a01b90b</Sha>
+      <Sha>74b69d2926768f9f8c9d3e70381a754dc3ea4c7e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-ci.main.2">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-preview.5.18">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>92efdccb686454be32d742b8ca9f6a166a7c1808</Sha>
+      <Sha>198eefffbb663bf1a5b9bbae9873b40bd9713c4a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="14.5.100-preview.5.879">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 6512a55ac741..fa24a908034d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,8 +1,8 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.5.21260.2</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-ci.main.2</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.5.21275.1</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-preview.5.18</MicrosoftAndroidSdkWindowsPackageVersion>
     <MicrosoftMacCatalystSdkPackageVersion>14.5.100-preview.5.879</MicrosoftMacCatalystSdkPackageVersion>
     <MicrosoftiOSSdkPackageVersion>14.5.100-preview.5.879</MicrosoftiOSSdkPackageVersion>
     <MicrosofttvOSSdkPackageVersion>14.5.100-preview.5.879</MicrosofttvOSSdkPackageVersion>
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 @@
     <TargetFramework Condition="'$(BuildForNet6)' == 'true'">net6.0</TargetFramework>
     <AssemblyName>Microsoft.Maui.UnitTests</AssemblyName>
     <IsPackable>false</IsPackable>
+    <!-- Solves: 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. -->
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
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++)