Skip to content

Commit

Permalink
[main] Update dependencies from xamarin/xamarin-android (dotnet#1101)
Browse files Browse the repository at this point in the history
[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.
  • Loading branch information
dotnet-maestro[bot] authored and lytico committed Jun 8, 2021
1 parent a5d99e6 commit e047347
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/Core/tests/UnitTests/Core.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Essentials/src/SecureStorage/SecureStorage.android.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand Down

0 comments on commit e047347

Please sign in to comment.