Merge remote-tracking branch 'origin/release/6.0.4xx' into darc-relea…

…se/6.0.4xx-112ffdbb-9270-4797-b063-aa8b39dd92bd

NuGet.config

@@ -7,10 +7,12 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
+    <add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-pub-dotnet-runtime-531f715" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />

eng/Version.Details.xml

@@ -8,18 +8,18 @@
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>28db36b95cf83c8e2ad11e67a2ad0de301b4cad6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.8">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>00f82acfe45b217bed2c7071828939a9f271253f</Sha>
+      <Sha>531f715f281e7a6456375635c02b6dd301d95996</Sha>
     </Dependency>
     <!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.9" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>52e9452f82e26f9fcae791e84c082ae22f1ef66f</Sha>
+      <Sha>3f6c45a2580cd9387b643163de8136a9691764c8</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -5,8 +5,8 @@
     <MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22219.3</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.8</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.9</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>6.0.9</MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
   </PropertyGroup>
 </Project>

tests/common/DotNet.cs

@@ -55,6 +55,11 @@ public static ExecutionResult AssertRestore (string project, Dictionary<string,
 			return Execute ("restore", project, properties, true);
 		}
 
+		public static ExecutionResult Restore (string project, Dictionary<string, string> properties = null)
+		{
+			return Execute ("restore", project, properties, false);
+		}
+
 		public static ExecutionResult AssertBuild (string project, Dictionary<string, string> properties = null)
 		{
 			return Execute ("build", project, properties, true);

tests/dotnet/UnitTests/ProjectTest.cs

@@ -509,19 +509,27 @@ public void InvalidRuntimeIdentifier (ApplePlatform platform, string runtimeIden
 		}
 
 		[Test]
-		[TestCase (ApplePlatform.iOS, "win10-x86")]
-		[TestCase (ApplePlatform.TVOS, "win10-x64")]
-		[TestCase (ApplePlatform.MacOSX, "win10-arm")]
-		[TestCase (ApplePlatform.MacCatalyst, "win10-arm64")]
-		public void InvalidRuntimeIdentifier_Restore (ApplePlatform platform, string runtimeIdentifier)
+		[TestCase (ApplePlatform.iOS, "win10-x86", null)]
+		[TestCase (ApplePlatform.TVOS, "win10-x64", null)]
+		[TestCase (ApplePlatform.MacOSX, "win10-arm", null)]
+		[TestCase (ApplePlatform.MacCatalyst, "win10-arm64", "Unable to find package Microsoft.NETCore.App.Runtime.Mono.win-arm64. No packages exist with this id in source[(]s[)]:.*")]
+		public void InvalidRuntimeIdentifier_Restore (ApplePlatform platform, string runtimeIdentifier, string? failureMessagePattern)
 		{
 			var project = "MySimpleApp";
 			Configuration.IgnoreIfIgnoredPlatform (platform);
 
 			var project_path = GetProjectPath (project, platform: platform);
 			Clean (project_path);
 			var properties = GetDefaultProperties (runtimeIdentifier);
-			DotNet.AssertRestore (project_path, properties);
+			if (string.IsNullOrEmpty (failureMessagePattern)) {
+				DotNet.AssertRestore (project_path, properties);
+			} else {
+				var rv = DotNet.Restore (project_path, properties);
+				Assert.AreNotEqual (0, rv.ExitCode, "Expected failure");
+				var errors = BinLog.GetBuildLogErrors (rv.BinLogPath).ToArray ();
+				Assert.That (errors.Length, Is.GreaterThan (0), "Error count");
+				Assert.That (errors [0].Message, Does.Match (failureMessagePattern), "Message failure");
+			}
 		}
 
 		[Test]