[main] Update dependencies from dotnet/installer (#12481)

## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) - **Coherency Updates**: - **Microsoft.NET.ILLink.Tasks**: from 6.0.100-preview.6.21416.1 to 6.0.100-preview.6.21419.1 (parent: Microsoft.Dotnet.Sdk.Internal) ## From https://github.com/dotnet/installer - **Subscription**: df3e6147-3e41-4928-6775-08d8f479343c - **Build**: 20210823.21 - **Date Produced**: 8/24/2021 12:53 AM - **Commit**: 5f5d8bb4a209810fb93c86ce6b0b3172bd909134 - **Branch**: refs/heads/release/6.0.1xx - **Updates**: - **Microsoft.Dotnet.Sdk.Internal**: [from 6.0.100-rc.1.21417.3 to 6.0.100-rc.2.21423.21][1] - **Microsoft.NET.ILLink.Tasks**: [from 6.0.100-preview.6.21416.1 to 6.0.100-preview.6.21419.1][2] [1]: 8c86609...5f5d8bb [2]: 5b2391c...5851f6d
2021-08-25 09:43:54 +02:00 · 2021-08-25 09:43:54 +02:00 · fa4689b533
--- a/Make.config
+++ b/Make.config
@ -75,7 +75,7 @@ endif

 # For release branches, modify the following variables to hardcode a version name
 # Set the NUGET_HARDCODED_PRERELEASE_IDENTIFIER variable to the prerelease identifer you want (say "preview.5." (the trailing dot is important)
-NUGET_HARDCODED_PRERELEASE_IDENTIFIER=rc.1.
+NUGET_HARDCODED_PRERELEASE_IDENTIFIER=rc.2.
 # Set the NUGET_HARDCODED_PRERELEASE_BRANCH variable to the exact name for the branch the above variable should apply to (so that any other branches won't pick it up by accident).
 # For the previous example, this would be "release/6.0.1xx-preview5"
 # When creating a release branch from main, this must be changed from "main" to the new release branch.
--- a/dotnet/Makefile
+++ b/dotnet/Makefile
@ -55,6 +55,7 @@ DIRECTORIES += \
 	$(DOTNET_TEMPLATE_PACKS_PATH) \
 	$(foreach platform,$(DOTNET_PLATFORMS),$(DOTNET_PACKS_PATH)/Microsoft.$(platform).Sdk) \
 	$(foreach platform,$(DOTNET_PLATFORMS),$(DOTNET_PACKS_PATH)/Microsoft.$(platform).Ref) \
+	$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(DOTNET_PACKS_PATH)/Microsoft.$(platform).Runtime.$(rid))) \
 	$(foreach platform,$(DOTNET_PLATFORMS),$(DOTNET_TEMPLATE_PACKS_PATH)/Microsoft.$(platform).Templates) \
 	$(TMP_PKG_DIR) \
 	$(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(DOTNET_DESTDIR)/Microsoft.$(platform).Windows.Sdk/Sdk) \
@ -212,13 +213,11 @@ TARGETS += $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLO
 define InstallWorkload
 # .NET comes with a workload for us, but we don't want that, we want our own. So delete the workload that comes with .NET.
 .stamp-workload-replace-$1-$(DOTNET6_VERSION):
-	$(Q) echo "Removing existing workload shipped with .NET $(DOTNET6_VERSION): $(DOTNET_MANIFESTS_PATH)/Microsoft.NET.Workload.$1"
-	$(Q) rm -Rf $(DOTNET_MANIFESTS_PATH)/Microsoft.NET.Workload.$1
-	$(Q) echo "Removing existing workload shipped with .NET $(DOTNET6_VERSION): $(DOTNET_MANIFESTS_PATH)/Microsoft.NET.Sdk.$1"
-	$(Q) rm -Rf $(DOTNET_MANIFESTS_PATH)/Microsoft.NET.Sdk.$1
+	$(Q) echo "Removing existing workload shipped with .NET $(DOTNET6_VERSION): $(DOTNET_MANIFESTS_PATH)/microsoft.net.sdk.$1"
+	$(Q) rm -Rf $(DOTNET_MANIFESTS_PATH)/microsoft.net.sdk.$3
 	$(Q) touch $$@

-$(DOTNET_MANIFESTS_PATH)/Microsoft.NET.Sdk.$1: .stamp-workload-replace-$1-$(DOTNET6_VERSION) | $(DOTNET_MANIFESTS_PATH)
+$(DOTNET_MANIFESTS_PATH)/microsoft.net.sdk.$3: .stamp-workload-replace-$1-$(DOTNET6_VERSION) | $(DOTNET_MANIFESTS_PATH)
 	$$(Q_LN) ln -Fhs $$(abspath Workloads/Microsoft.NET.Sdk.$1) $$(abspath $$@)

 $(DOTNET_PACKS_PATH)/Microsoft.$1.Sdk/$2: | $(DOTNET_PACKS_PATH)/Microsoft.$1.Sdk
@ -232,11 +231,20 @@ $(DOTNET_TEMPLATE_PACKS_PATH)/Microsoft.$1.Templates.$(2).nupkg: $(TEMPLATE_PACK

 WORKLOAD_TARGETS += \
 	$(DOTNET_TEMPLATE_PACKS_PATH)/Microsoft.$1.Templates.$(2).nupkg \
-	$(DOTNET_MANIFESTS_PATH)/Microsoft.NET.Sdk.$1 \
+	$(DOTNET_MANIFESTS_PATH)/microsoft.net.sdk.$3 \
 	$(DOTNET_PACKS_PATH)/Microsoft.$1.Sdk/$2 \
 	$(DOTNET_PACKS_PATH)/Microsoft.$1.Ref/$2
 endef
-$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call InstallWorkload,$(platform),$($(platform)_NUGET_VERSION_NO_METADATA))))
+$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call InstallWorkload,$(platform),$($(platform)_NUGET_VERSION_NO_METADATA),$(shell echo $(platform) | tr A-Z a-z))))
+
+define InstallRuntimeWorkload
+$(DOTNET_PACKS_PATH)/Microsoft.$1.Runtime.$2/$3: | $(DOTNET_PACKS_PATH)/Microsoft.$1.Runtime.$2
+	$$(Q_LN) ln -Fhs $$(abspath $(DOTNET_DESTDIR)/Microsoft.$1.Runtime.$2) $$(abspath $$@)
+
+WORKLOAD_TARGETS += \
+	$(DOTNET_PACKS_PATH)/Microsoft.$1.Runtime.$2/$3
+endef
+$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(eval $(call InstallRuntimeWorkload,$(platform),$(rid),$($(platform)_NUGET_VERSION_NO_METADATA)))))

 # We create four packages: one for the workload, one for the sdk package, one for the ref package, and one for templates
 # and then bundle them into a single pkg for distribution (named Microsoft.<platform>.Bundle.<version>.pkg).
@ -348,11 +356,7 @@ MSI_TARGETS += $(DOTNET_PKG_DIR)/Microsoft.NET.Workload.$1.$2.msi
 endef
 $(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(call CreateMsi,$(platform),$($(platform)_NUGET_VERSION_NO_METADATA))))

-export DOTNETSDK_WORKLOAD_MANIFEST_ROOTS:=$(abspath ./Workloads)
-
 .stamp-install-workloads: Makefile $(WORKLOAD_TARGETS) $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLOAD_PACKS)
-	@# The microsoft.net.sdk.maui workload has a reference to the microsoft-ios-sdk-full workload, which has been renamed, so 'dotnet workload install' fails. Just remove the maui workload, we don't need it here.
-	$(Q) rm -Rf $(DOTNET6_DIR)/sdk-manifests/6.0.100/microsoft.net.sdk.maui
 	$(Q) $(DOTNET6) workload install --skip-manifest-update \
 		--source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json \
 		--source $(DOTNET_NUPKG_DIR) --verbosity diag \
--- 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-rc.1.21417.3">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.2.21423.21">
      <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>8c866090a67ce1f4be18c353f6e9f12db93f85d0</Sha>
+      <Sha>5f5d8bb4a209810fb93c86ce6b0b3172bd909134</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21416.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21419.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
      <Uri>https://github.com/mono/linker</Uri>
-      <Sha>5b2391c2c56af47350a5789375e8dbddc692e67f</Sha>
+      <Sha>5851f6d62fedd9eb2edea9712c9764ca2ad6ab60</Sha>
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -1,8 +1,8 @@
 <Project>
  <!--Package versions-->
  <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21417.3</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21416.1</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.2.21423.21</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21419.1</MicrosoftNETILLinkTasksPackageVersion>
    <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
  </PropertyGroup>
 </Project>
--- a/src/Foundation/NSUrlSessionHandler.cs
+++ b/src/Foundation/NSUrlSessionHandler.cs
@ -33,6 +33,8 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Runtime.InteropServices;
+using System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Text;
@ -527,6 +529,84 @@ namespace Foundation {
 			return await tcs.Task.ConfigureAwait (false);
 		}

+#if NET
+		// Properties that will be called by the default HttpClientHandler
+		public bool AutomaticDecompression {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public bool CheckCertificateRevocationList {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public X509CertificateCollection ClientCertificates {
+			get => throw new PlatformNotSupportedException ();
+		}
+
+		public ClientCertificateOption ClientCertificateOptions {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public ICredentials DefaultProxyCredentials {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public int MaxAutomaticRedirections {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public int MaxConnectionsPerServer {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public int MaxResponseHeadersLength {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public bool PreAuthenticate {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public IDictionary<string, object> Properties {
+			get => throw new PlatformNotSupportedException ();
+		}
+
+		public IWebProxy Proxy {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public SslProtocols SslProtocols {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+
+		public bool SupportsAutomaticDecompression {
+			get => throw new PlatformNotSupportedException ();
+		}
+
+		public bool SupportsProxy {
+			get => throw new PlatformNotSupportedException ();
+		}
+
+		public bool SupportsRedirectConfiguration {
+			get => throw new PlatformNotSupportedException ();
+		}
+
+		public bool UseProxy {
+			get => throw new PlatformNotSupportedException ();
+			set => throw new PlatformNotSupportedException ();
+		}
+#endif // NET
+
 		partial class NSUrlSessionHandlerDelegate : NSUrlSessionDataDelegate
 		{
 			readonly NSUrlSessionHandler sessionHandler;
--- a/sdk/HttpClientHandlerTest.cs
+++ b/sdk/HttpClientHandlerTest.cs
@ -20,36 +20,19 @@ namespace LinkSdk.Net.Http {
 		{
 			using (var handler = new HttpClientHandler ()) {
 				Assert.True (handler.AllowAutoRedirect, "AllowAutoRedirect");
-#if NET && !__MACOS__// https://github.com/dotnet/runtime/issues/55986
-				Assert.Null (handler.CookieContainer, "CookieContainer");
-#else
 				Assert.NotNull (handler.CookieContainer, "CookieContainer");
-#endif
 				Assert.Null (handler.Credentials, "Credentials");
 				// (so far) not exposed in other, native handlers
-#if NET && !__MACOS__ // https://github.com/dotnet/runtime/issues/55986
-				Assert.Throws<PlatformNotSupportedException> (() => GC.KeepAlive (handler.AutomaticDecompression), "AutomaticDecompression");
-				Assert.Throws<PlatformNotSupportedException> (() => GC.KeepAlive (handler.ClientCertificateOptions), "ClientCertificateOptions");
-				Assert.Throws<PlatformNotSupportedException> (() => GC.KeepAlive (handler.MaxAutomaticRedirections), "MaxAutomaticRedirections");
-				Assert.Throws<PlatformNotSupportedException> (() => GC.KeepAlive (handler.Proxy), "Proxy");
-				Assert.False (handler.SupportsAutomaticDecompression, "SupportsAutomaticDecompression");
-				Assert.False (handler.SupportsProxy, "SupportsProxy");
-#else
 				Assert.That (handler.AutomaticDecompression, Is.EqualTo (DecompressionMethods.None), "AutomaticDecompression");
 				Assert.That (handler.ClientCertificateOptions, Is.EqualTo (ClientCertificateOption.Manual), "ClientCertificateOptions");
 				Assert.That (handler.MaxAutomaticRedirections, Is.EqualTo (50), "MaxAutomaticRedirections");
 				Assert.Null (handler.Proxy, "Proxy");
 				Assert.True (handler.SupportsAutomaticDecompression, "SupportsAutomaticDecompression");
 				Assert.True (handler.SupportsProxy, "SupportsProxy");
-#endif
 				Assert.True (handler.SupportsRedirectConfiguration, "SupportsRedirectConfiguration");
 				Assert.True (handler.UseCookies, "UseCookies");
 				Assert.False (handler.UseDefaultCredentials, "UseDefaultCredentials");
-#if NET && !__MACOS__ // https://github.com/dotnet/runtime/issues/55986
-				Assert.Throws<PlatformNotSupportedException> (() => GC.KeepAlive (handler.UseProxy), "UseProxy");
-#else
 				Assert.True (handler.UseProxy, "UseProxy");
-#endif
 			}
 		}

--- a/sdk/dotnet/shared.csproj
+++ b/sdk/dotnet/shared.csproj
@ -13,6 +13,7 @@
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <RootTestsDirectory>$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\..\..\..\..\..'))</RootTestsDirectory>
    <ThisTestDirectory>$(RootTestsDirectory)\linker\ios\link sdk</ThisTestDirectory>
+    <UseNativeHttpHandler>false</UseNativeHttpHandler>
  </PropertyGroup>

  <Import Project="$(RootTestsDirectory)/common/shared-dotnet.csproj" />
--- a/tests/monotouch-test/System.Net.Http/MessageHandlers.cs
+++ b/tests/monotouch-test/System.Net.Http/MessageHandlers.cs
@ -9,6 +9,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Net;
 using System.Net.Http;
+#if NET
+using System.Net.Security;
+#endif
 using System.Linq;
 using System.IO;

@ -372,7 +375,12 @@ namespace MonoTests.System.Net.Http
 		}

 #if !__WATCHOS__
+#if !NET // By default HttpClientHandler redirects to a NSUrlSessionHandler, so no need to test that here.
 		[TestCase (typeof (HttpClientHandler))]
+#endif
+#endif
+#if NET
+		[TestCase (typeof (SocketsHttpHandler))]
 #endif
 		[TestCase (typeof (NSUrlSessionHandler))]
 		public void RejectSslCertificatesServicePointManager (Type handlerType)
@ -385,11 +393,6 @@ namespace MonoTests.System.Net.Http
 				Assert.Ignore ("Fails on macOS 10.10: https://github.com/xamarin/maccore/issues/1645");
 #endif

-#if NET
-			if (handlerType == typeof (HttpClientHandler))
-				Assert.Ignore ("https://github.com/dotnet/runtime/issues/55986");
-#endif
-
 			bool validationCbWasExecuted = false;
 			bool customValidationCbWasExecuted = false;
 			bool invalidServicePointManagerCbWasExcuted = false;
@ -410,6 +413,20 @@ namespace MonoTests.System.Net.Http
 					invalidServicePointManagerCbWasExcuted = true;
 					return false;
 				};
+#if NET
+			} else if (handler is SocketsHttpHandler shh) {
+				expectedExceptionType = typeof (AuthenticationException);
+				var sslOptions = new SslClientAuthenticationOptions
+				{
+					// Leave certs unvalidated for debugging
+					RemoteCertificateValidationCallback = delegate {
+						validationCbWasExecuted = true;
+						// return false, since we want to test that the exception is raised
+						return false;
+					},
+				};
+				shh.SslOptions = sslOptions;
+#endif // NET
 			} else if (handler is NSUrlSessionHandler ns) {
 				expectedExceptionType = typeof (WebException);
 				ns.TrustOverride += (a,b) => {