diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 352d199e59e..4907216b6f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - 9962c6a686a31ba1e7c20983a810ba7989c3fc0c + 779a6442daf6b95c5662d2f0c20801de5e179a05 - + https://github.com/dotnet/linker - 4b3f78cbc7284b4198652a695e9fe0267133728e + c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 5da4a9e919dcee35f831ab69b6e475baaf798875 + ddb69889684da95dc8d83a51b987774de5e47598 - + https://github.com/dotnet/emsdk - 66b984594a008151bdb14dc60589373e3d44be83 + 5b46122b31036064483ce2e55b5e2240e5548204 diff --git a/eng/Versions.props b/eng/Versions.props index 0ec50925fb4..b6912ea71dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 8.0.100-alpha.1.23063.11 - 8.0.100-1.23055.2 - 8.0.0-alpha.1.23058.2 + 8.0.100-alpha.1.23070.23 + 8.0.100-1.23067.1 + 8.0.0-alpha.1.23070.1 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-alpha.1.22620.1 + 8.0.0-alpha.1.23066.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) 7.0.100-rc.1.22410.7 diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets index d0845544971..a79e8081604 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets @@ -116,14 +116,17 @@ _ResolveAssemblies MSBuild target. <_ResolvedAssemblyFiles Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.dll' " /> <_ResolvedSymbolFiles Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.pdb' " /> + <_ResolvedJavaLibraries Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.jar' " /> + diff --git a/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg b/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg index 87c29d8f212..c0616acdcc7 100644 --- a/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg +++ b/src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg @@ -25,6 +25,9 @@ -keep class md52ce486a14f4bcd95899665e9d932190b.** { *; (...); } -keepclassmembers class md52ce486a14f4bcd95899665e9d932190b.** { *; (...); } +# .NET 8 runtime +-keep class net.dot.android.crypto.DotnetProxyTrustManager { *; (...); } + # Android's template misses fluent setters... -keepclassmembers class * extends android.view.View { *** set*(...); diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ProcessAssemblies.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ProcessAssemblies.cs index d7e2d101c20..80d16a1f72c 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/ProcessAssemblies.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/ProcessAssemblies.cs @@ -32,9 +32,14 @@ public class ProcessAssemblies : AndroidTask public ITaskItem [] InputAssemblies { get; set; } = Array.Empty (); + public ITaskItem [] InputJavaLibraries { get; set; } = Array.Empty (); + [Output] public ITaskItem []? OutputAssemblies { get; set; } + [Output] + public ITaskItem []? OutputJavaLibraries { get; set; } + [Output] public ITaskItem []? ShrunkAssemblies { get; set; } @@ -78,6 +83,19 @@ public override bool RunTask () ShrunkAssemblies = shrunkAssemblies.ToArray (); } + if (InputJavaLibraries != null) { + var javaLibraries = new Dictionary (StringComparer.OrdinalIgnoreCase); + foreach (var item in InputJavaLibraries) { + if (!IsFromAKnownRuntimePack (item)) + continue; + var name = Path.GetFileNameWithoutExtension(item.ItemSpec); + if (!javaLibraries.ContainsKey (name)) { + javaLibraries [name] = item; + } + } + OutputJavaLibraries = javaLibraries.Values.ToArray (); + } + return !Log.HasLoggedErrors; } @@ -112,7 +130,7 @@ void SetMetadataForAssemblies (List output, Dictionary output, Dictionary output, Dictionary