Merge branch 'main' into mm-codegen

* main: Bump to dotnet/java-interop@a5756ca8. (dotnet#7226) Bump `$(AndroidNet6Version)` to 32.0.447 (dotnet#7224)
grendello · Aug 3, 2022 · 4d7ec30 · 4d7ec30
2 parents 803b3e3 + 3e4686c
commit 4d7ec30
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/Configuration.props b/Configuration.props
@@ -47,7 +47,7 @@
  <DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
  <Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
  <LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
- <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.415</AndroidNet6Version>
+ <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.447</AndroidNet6Version>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(HostOS)' == '' ">
  <HostOS Condition="$([MSBuild]::IsOSPlatform('windows'))">Windows</HostOS>

diff --git a/external/Java.Interop b/external/Java.Interop
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets
@@ -12,12 +12,6 @@
  LatestRuntimeFrameworkVersion="@NET6_VERSION@"
  TargetingPackVersion="@NET6_VERSION@"
  />
- <!--
- HACK:
- The .NET 7 SDK specifies 6.0.3 for .NET 6, but our .NET 6 libmonodroid.so depends on 6.0.5.
- We should be able to remove this when we get a newer .NET 7 SDK.
- -->
- <KnownRuntimePack Update="Microsoft.NETCore.App" LatestRuntimeFrameworkVersion="6.0.5" />
  </ItemGroup>
 
  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">