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

This pull request updates the following dependencies ## From https://github.com/dotnet/installer - **Subscription**: df3e6147-3e41-4928-6775-08d8f479343c - **Build**: 20210720.12 - **Date Produced**: 7/21/2021 6:57 AM - **Commit**: d7279fc09fcfb108c5fb97fa290dbbb11c4c441b - **Branch**: refs/heads/main - **Updates**: - **Microsoft.Dotnet.Sdk.Internal**: [from 6.0.100-preview.7.21330.1 to 6.0.100-rc.1.21370.12][1] - **Microsoft.NET.ILLink.Tasks**: [from 6.0.100-preview.6.21329.2 to 6.0.100-preview.6.21370.1][2] [1]: dotnet/installer@823ff33...d7279fc [2]: dotnet/linker@f549b4e...6eae019 ## 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.21329.2 to 6.0.100-preview.6.21370.1 (parent: Microsoft.Dotnet.Sdk.Internal)
xamarin · Jul 22, 2021 · 76c8461 · 76c8461 · vs-mobiletools-engineering-service2 · Jul 22, 2021
2 parents 042cd71 + 6b911ee
commit 76c8461
Show file tree

Hide file tree

Showing 15 changed files with 83 additions and 18 deletions.
diff --git a/dotnet/Workloads/Microsoft.NET.Sdk.macOS/WorkloadManifest.targets b/dotnet/Workloads/Microsoft.NET.Sdk.macOS/WorkloadManifest.targets
@@ -1,8 +1,6 @@
 <Project>
 	<Import Project="Sdk.props" Sdk="Microsoft.macOS.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'macOS'" />
 
-	<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.RuntimeConfigParser.Task" Condition="'$(TargetPlatformIdentifier)' == 'macOS'" />
-
 	<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
 		<SdkSupportedTargetPlatformIdentifier Include="macos" DisplayName="macOS" />
 	</ItemGroup>

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -48,7 +48,5 @@
 		<SelfContained>true</SelfContained>
 		<_RuntimeIdentifierUsesAppHost>false</_RuntimeIdentifierUsesAppHost>
 		<UseAppHost>false</UseAppHost>
-		<IntermediateOutputPath>$(IntermediateOutputPath)$(RuntimeIdentifier)\</IntermediateOutputPath>
-		<OutputPath>$(OutputPath)$(RuntimeIdentifier)\</OutputPath>
 	</PropertyGroup>
 </Project>
diff --git 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-preview.7.21330.1">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21370.12">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>823ff33acf9c67374d4b1211850b22d3db7f020d</Sha>
+      <Sha>d7279fc09fcfb108c5fb97fa290dbbb11c4c441b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21329.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21370.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>f549b4e8bfdf07c31f2540d05f55b50af0e2f391</Sha>
+      <Sha>6eae01980dc694107bdee0bc723d75a0dd601f0e</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,8 +1,8 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21330.1</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21329.2</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21370.12</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21370.1</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/tests/EmbeddedResources/ResourcesTest.cs b/tests/EmbeddedResources/ResourcesTest.cs
@@ -41,14 +41,12 @@ public void Embedded ()
 			var manager = new ResourceManager ("EmbeddedResources.Welcome", typeof(ResourcesTest).Assembly);
 #endif
 
+#if !(NET && __MACCATALYST__) // https://github.com/xamarin/xamarin-macios/issues/11392
 			Assert.AreEqual ("Welcome", manager.GetString ("String1", new CultureInfo ("en")), "en");
 			Assert.AreEqual ("G'day", manager.GetString ("String1", new CultureInfo ("en-AU")), "en-AU");
 			Assert.AreEqual ("Willkommen", manager.GetString ("String1", new CultureInfo ("de")), "de");
-#if !(NET && __MACCATALYST__) // https://github.com/xamarin/xamarin-macios/issues/11392
 			Assert.AreEqual ("Willkommen", manager.GetString ("String1", new CultureInfo ("de-DE")), "de-DE");
-#endif
 			Assert.AreEqual ("Bienvenido", manager.GetString ("String1", new CultureInfo ("es")), "es");
-#if !(NET && __MACCATALYST__) // https://github.com/xamarin/xamarin-macios/issues/11392
 			Assert.AreEqual ("Bienvenido", manager.GetString ("String1", new CultureInfo ("es-AR")), "es-AR");
 			Assert.AreEqual ("Bienvenido", manager.GetString ("String1", new CultureInfo ("es-ES")), "es-ES");
 #endif

diff --git a/tests/linker/ios/dont link/CalendarTest.cs b/tests/linker/ios/dont link/CalendarTest.cs
@@ -10,7 +10,7 @@ namespace DontLink.Calendars {
 	[TestFixture]
 	// we want the tests to be available because we use the linker
 	[Preserve (AllMembers = true)]
-#if NET
+#if NET && __MACCATALYST__
 	[Ignore ("No globalization data yet - https://github.com/xamarin/xamarin-macios/issues/8906")]
 #endif
 	public class CalendarTest {
@@ -21,14 +21,22 @@ public class CalendarTest {
 		public void UmAlQura ()
 		{
 			var ci = CultureInfo.GetCultureInfo ("ar");
+#if NET // https://github.com/dotnet/runtime/issues/50859
+			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.GregorianCalendar"), "Calendar");
+#else
 			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.UmAlQuraCalendar"), "Calendar");
+#endif
 		}
 
 		[Test]
 		public void Hijri ()
 		{
 			var ci = CultureInfo.GetCultureInfo ("ps");
+#if NET // https://github.com/dotnet/runtime/issues/50859
+			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.PersianCalendar"), "Calendar");
+#else
 			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.HijriCalendar"), "Calendar");
+#endif
 		}
 
 		[Test]

diff --git a/tests/linker/ios/link all/CalendarTest.cs b/tests/linker/ios/link all/CalendarTest.cs
@@ -10,8 +10,8 @@ namespace LinkAll.Calendars {
 	[TestFixture]
 	// we want the tests to be available because we use the linker
 	[Preserve (AllMembers = true)]
-#if NET
-	[Ignore ("No globalization data yet - https://github.com/xamarin/xamarin-macios/issues/8906")]
+#if NET && __MACCATALYST__
+	[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
 #endif
 	public class CalendarTest {
 
@@ -21,14 +21,22 @@ public class CalendarTest {
 		public void UmAlQura ()
 		{
 			var ci = CultureInfo.GetCultureInfo ("ar");
+#if NET // https://github.com/dotnet/runtime/issues/50859
+			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.GregorianCalendar"), "Calendar");
+#else
 			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.UmAlQuraCalendar"), "Calendar");
+#endif
 		}
 
 		[Test]
 		public void Hijri ()
 		{
 			var ci = CultureInfo.GetCultureInfo ("ps");
+#if NET // https://github.com/dotnet/runtime/issues/50859
+			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.PersianCalendar"), "Calendar");
+#else
 			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.HijriCalendar"), "Calendar");
+#endif
 		}
 
 		[Test]

diff --git a/tests/linker/ios/link sdk/CalendarTest.cs b/tests/linker/ios/link sdk/CalendarTest.cs
@@ -10,6 +10,9 @@ namespace LinkSdk.Calendars {
 	[TestFixture]
 	// we want the tests to be available because we use the linker
 	[Preserve (AllMembers = true)]
+#if NET && __MACCATALYST__
+	[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
+#endif
 	public class CalendarTest {
 
 		// application must *NOT* be build with I18N.MidEast and I18N.Other (Thai)
@@ -25,14 +28,22 @@ public void UmAlQura ()
 		public void Hijri ()
 		{
 			var ci = CultureInfo.GetCultureInfo ("ps");
+#if NET // https://github.com/dotnet/runtime/issues/50859
+			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.PersianCalendar"), "Calendar");
+#else
 			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.GregorianCalendar"), "Calendar");
+#endif
 		}
 
 		[Test]
 		public void ThaiBuddhist ()
 		{
 			var ci = CultureInfo.GetCultureInfo ("th");
+#if NET // https://github.com/dotnet/runtime/issues/50859
+			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.ThaiBuddhistCalendar"), "Calendar");
+#else
 			Assert.That (ci.Calendar.ToString (), Is.EqualTo ("System.Globalization.GregorianCalendar"), "Calendar");
+#endif
 		}
 	}
 }
diff --git a/tests/linker/ios/link sdk/HttpClientHandlerTest.cs b/tests/linker/ios/link sdk/HttpClientHandlerTest.cs
@@ -20,19 +20,36 @@ public void HttpClient ()
 		{
 			using (var handler = new HttpClientHandler ()) {
 				Assert.True (handler.AllowAutoRedirect, "AllowAutoRedirect");
+#if NET && !__MACCATALYST__ // 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 // 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 // https://github.com/dotnet/runtime/issues/55986
+				Assert.Throws<PlatformNotSupportedException> (() => GC.KeepAlive (handler.UseProxy), "UseProxy");
+#else
 				Assert.True (handler.UseProxy, "UseProxy");
+#endif
 			}
 		}
 

diff --git a/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs b/tests/linker/ios/link sdk/LinkSdkRegressionTest.cs
@@ -468,6 +468,9 @@ public void OpenTk_Preserved ()
 #endif // !__WATCHOS__ && !__MACCATALYST__
 
 		[Test]
+#if NET && __MACCATALYST__
+		[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
+#endif
 		public void XElement_3137 ()
 		{
 			CultureInfo current = Thread.CurrentThread.CurrentCulture;

diff --git a/tests/linker/ios/link sdk/LocaleTest.cs b/tests/linker/ios/link sdk/LocaleTest.cs
@@ -14,13 +14,19 @@ public class LocaleTest {
 
 		[Test]
 		[SetCulture ("cs-CZ")]
+#if NET && __MACCATALYST__
+		[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
+#endif
 		public void CzechDictComparer ()
 		{
 			DictComparer ();
 		}
 
 		[Test]
 		[SetCulture ("en-US")]
+#if NET && __MACCATALYST__
+		[Ignore ("No globalization data yet for Mac Catalyst - https://github.com/xamarin/xamarin-macios/issues/11392")]
+#endif
 		public void EnglishDictComparer ()
 		{
 			DictComparer ();

diff --git a/tests/monotouch-test/Foundation/NSTimeZoneTest.cs b/tests/monotouch-test/Foundation/NSTimeZoneTest.cs
@@ -39,6 +39,9 @@ public void AbbreviationTest ()
 		}
 
 		[Test]
+#if NET && __MACCATALYST__
+		[Ignore ("https://github.com/dotnet/runtime/issues/55941")]
+#endif
 		public void All_28300 ()
 		{
 			foreach (var name in NSTimeZone.KnownTimeZoneNames) {

diff --git a/tests/monotouch-test/HttpClient/HttpClientTest.cs b/tests/monotouch-test/HttpClient/HttpClientTest.cs
@@ -1,6 +1,7 @@
 #if !__WATCHOS__
 using System;
 using System.Net.Http;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -99,7 +100,16 @@ public void EnsureModifiabilityPostSend (Type handlerType, int macOSMinVersion)
 			using (var request = new HttpRequestMessage (HttpMethod.Get, "http://xamarin.com")) {
 				var token = new CancellationTokenSource ();
 				client.SendAsync (request, token.Token);
-				Assert.Throws<InvalidOperationException> (() => wrapper.AllowAutoRedirect = !wrapper.AllowAutoRedirect);
+				Exception e = null;
+				try {
+					wrapper.AllowAutoRedirect = !wrapper.AllowAutoRedirect;
+					Assert.Fail ("Unexpectedly able to change AllowAutoRedirect");
+				} catch (InvalidOperationException ioe) {
+					e = ioe;
+				} catch (TargetInvocationException tie) {
+					e = tie.InnerException;
+				}
+				Assert.That (e, Is.InstanceOf<InvalidOperationException> (), "AllowAutoRedirect");
 				// cancel to ensure that we do not have side effects
 				token.Cancel ();
 			}

diff --git a/tests/monotouch-test/ObjCRuntime/TrampolineTest.cs b/tests/monotouch-test/ObjCRuntime/TrampolineTest.cs
@@ -637,7 +637,7 @@ public class FloatingPointStretTrampolines : NSObject
 
 		static float ParseString (string str)
 		{
-			return float.Parse (str, new CultureInfo ("en-US").NumberFormat);
+			return float.Parse (str, CultureInfo.InvariantCulture.NumberFormat);
 		}
 
 		[Export ("testCGRect")]

diff --git a/tests/monotouch-test/System.Net.Http/MessageHandlers.cs b/tests/monotouch-test/System.Net.Http/MessageHandlers.cs
@@ -370,6 +370,11 @@ public void RejectSslCertificatesServicePointManager (Type handlerType)
 				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;