diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37282c869c8..3dedeed34f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 78a1bc32ce1ec6a18d4e2b759e08de11aee37b43 + 5c2d8ef2b3e254260f7c703d8d35d2f2c5b43d97 - + https://github.com/mono/linker 5b2391c2c56af47350a5789375e8dbddc692e67f - + https://github.com/dotnet/runtime - 14b34eb02bc8969b77c0d3a1e39fb38f450625cf + 5a5d7f0518b564e7f840c6c939bb6618c778b21b diff --git a/eng/Versions.props b/eng/Versions.props index 095ae611579..460ec8a0b45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.100-rc.1.21418.8 - 6.0.100-preview.6.21416.1 + 6.0.100-rc.2.21418.44 + 6.0.100-preview.6.21418.3 5.0.0-beta.20181.7 6.0.0-beta.21212.6 - 6.0.0-rc.1.21417.1 + 6.0.0-rc.2.21417.16 diff --git a/src/Mono.Android/Xamarin.Android.Net/AndroidMessageHandler.cs b/src/Mono.Android/Xamarin.Android.Net/AndroidMessageHandler.cs index 949b87b4618..c31b9407782 100644 --- a/src/Mono.Android/Xamarin.Android.Net/AndroidMessageHandler.cs +++ b/src/Mono.Android/Xamarin.Android.Net/AndroidMessageHandler.cs @@ -6,6 +6,8 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; +using System.Security.Authentication; +using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -70,9 +72,9 @@ sealed class RequestRedirectionState // uncompress it any longer, doh. And they don't support 'deflate' so we need to handle it ourselves. bool decompress_here; - internal const bool SupportsAutomaticDecompression = true; - internal const bool SupportsProxy = true; - internal const bool SupportsRedirectConfiguration = true; + public bool SupportsAutomaticDecompression => true; + public bool SupportsProxy => true; + public bool SupportsRedirectConfiguration => true; public DecompressionMethods AutomaticDecompression { @@ -93,7 +95,7 @@ public CookieContainer CookieContainer } // NOTE: defaults here are based on: - // https://github.com/dotnet/runtime/blob/ccfe21882e4a2206ce49cd5b32d3eb3cab3e530f/src/libraries/Common/src/System/Net/Http/HttpHandlerDefaults.cs + // https://github.com/dotnet/runtime/blob/f3b77e64b87895aa7e697f321eb6d4151a4333df/src/libraries/Common/src/System/Net/Http/HttpHandlerDefaults.cs public bool UseCookies { get; set; } = true; @@ -107,6 +109,25 @@ public CookieContainer CookieContainer public bool AllowAutoRedirect { get; set; } = true; + public ClientCertificateOption ClientCertificateOptions { get; set; } + + public X509CertificateCollection ClientCertificates { get; set; } + + public ICredentials DefaultProxyCredentials { get; set; } + + public int MaxConnectionsPerServer { get; set; } = int.MaxValue; + + public int MaxResponseHeadersLength { get; set; } = 64; // Units in K (1024) bytes. + + public bool CheckCertificateRevocationList { get; set; } = false; + + // See: https://developer.android.com/reference/javax/net/ssl/SSLSocket#protocols + public SslProtocols SslProtocols { get; set; } = + (int)Build.VERSION.SdkInt >= 29 ? + SslProtocols.Tls13 | SslProtocols.Tls12 : SslProtocols.Tls12; + + public IDictionary Properties { get; set; } + int maxAutomaticRedirections = 50; public int MaxAutomaticRedirections diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs index 3ed2c53e192..438edc95fda 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs @@ -432,6 +432,10 @@ public static void Foo () { [Category ("LLVM")] public void NoSymbolsArgShouldReduceAppSize ([Values ("", "Hybrid")] string androidAotMode) { + if (Builder.UseDotNet) { + Assert.Ignore ("https://github.com/dotnet/runtime/issues/57800"); + } + AssertAotModeSupported (androidAotMode); var proj = new XamarinAndroidApplicationProject () { diff --git a/tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs b/tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs index 9b504a033e6..c249382a315 100644 --- a/tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs +++ b/tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs @@ -88,11 +88,7 @@ public void Properties_Defaults () Assert.IsTrue (h.UseCookies, "#12"); Assert.IsFalse (h.UseDefaultCredentials, "#13"); Assert.IsTrue (h.UseProxy, "#14"); - try { - Assert.AreEqual (ClientCertificateOption.Manual, h.ClientCertificateOptions, "#15"); - } catch (PlatformNotSupportedException) { - // https://github.com/dotnet/runtime/blob/07336810acf3b4e7bdd0fb7da87b54920ea9c382/src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.AnyMobile.cs#L310-L314 - } + Assert.AreEqual (ClientCertificateOption.Manual, h.ClientCertificateOptions, "#15"); } [Test] @@ -103,16 +99,12 @@ public void Properties_Invalid () h.MaxAutomaticRedirections = 0; Assert.Fail ("#1"); } catch (ArgumentOutOfRangeException) { - } catch (TargetInvocationException) { - // See: https://github.com/dotnet/runtime/issues/56089 } try { h.MaxRequestContentBufferSize = -1; Assert.Fail ("#2"); } catch (ArgumentOutOfRangeException) { - } catch (TargetInvocationException) { - // See: https://github.com/dotnet/runtime/issues/56089 } }