[main] Update dependencies from dotnet/runtime

eng/Version.Details.xml

@@ -25,37 +25,37 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>e46e279c0365c95116f6cb0cb60b12a7d655eb1b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="16.10.0-preview-21205-05">
       <Uri>https://github.com/dotnet/msbuild</Uri>
@@ -109,21 +109,21 @@
       <Uri>https://github.com/mono/linker</Uri>
       <Sha>55bd0ebd00ddbf2cd817314b1cf6824003cfb463</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="System.CodeDom" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.4.21208.2">
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -219,9 +219,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>86aee6d02b2fb8534b9466db0da25483d7c399a9</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.4.21207.11">
+    <Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.4.21213.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>a06eccb3600b702d911bcdf8fb0caa50970858d9</Sha>
+      <Sha>5d0817a2136b84580a78fea5bfbe9910098bed2b</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -31,23 +31,23 @@
     <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
     <MicrosoftDotNetSignToolVersion>6.0.0-beta.21207.4</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
-    <SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.4.21207.11</SystemSecurityCryptographyProtectedDataPackageVersion>
+    <SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.4.21213.3</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
     <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
     <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
     <SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
-    <SystemReflectionMetadataLoadContextVersion>6.0.0-preview.4.21207.11</SystemReflectionMetadataLoadContextVersion>
+    <SystemReflectionMetadataLoadContextVersion>6.0.0-preview.4.21213.3</SystemReflectionMetadataLoadContextVersion>
     <DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.4.21207.11</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.4.21207.11</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.4.21207.11</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.4.21213.3</MicrosoftNETCoreAppRefPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.4.21213.3</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.4.21213.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.4.21207.11</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.4.21207.11</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>6.0.0-preview.4.21207.11</MicrosoftNETHostModelVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.4.21213.3</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.4.21213.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETHostModelVersion>6.0.0-preview.4.21213.3</MicrosoftNETHostModelVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -79,10 +79,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <SystemCodeDomPackageVersion>6.0.0-preview.4.21207.11</SystemCodeDomPackageVersion>
-    <SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.4.21207.11</SystemTextEncodingCodePagesPackageVersion>
+    <SystemCodeDomPackageVersion>6.0.0-preview.4.21213.3</SystemCodeDomPackageVersion>
+    <SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.4.21213.3</SystemTextEncodingCodePagesPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
-    <SystemResourcesExtensionsPackageVersion>6.0.0-preview.4.21207.11</SystemResourcesExtensionsPackageVersion>
+    <SystemResourcesExtensionsPackageVersion>6.0.0-preview.4.21213.3</SystemResourcesExtensionsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets

@@ -72,7 +72,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <_BlazorOutputPath>wwwroot\_framework\</_BlazorOutputPath>
 
     <!-- Properties for AOT -->
-    <MicrosoftNetCoreAppRuntimePackRidDir>$(NuGetPackageRoot)microsoft.netcore.app.runtime.browser-wasm\$(BundledNETCoreAppPackageVersion)\runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackRidDir>
+    <MicrosoftNetCoreAppRuntimePackRidDir>$(NuGetPackageRoot)microsoft.netcore.app.runtime.mono.browser-wasm\$(BundledNETCoreAppPackageVersion)\runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackRidDir>
     <AOTMode>AotInterp</AOTMode>
     <WasmStripAOTAssemblies>false</WasmStripAOTAssemblies>
     <WasmGenerateAppBundle>false</WasmGenerateAppBundle>

src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs

@@ -108,6 +108,25 @@ void CheckAndReplaceAttribute(XAttribute attribute)
             CheckAndReplaceAttribute(itemGroup
                 .Elements(ns + "KnownCrossgen2Pack").First().Attribute("Crossgen2PackVersion"));
 
+            // TODO: remove this once we're using an SDK that contains https://github.com/dotnet/installer/pull/10206
+            if (itemGroup.Elements(ns + "KnownRuntimePack").FirstOrDefault() == null)
+            {
+                itemGroup.Add(new XElement
+                (
+                    "KnownRuntimePack",
+                    new XAttribute("Include", "Microsoft.NETCore.App"),
+                    new XAttribute("TargetFramework", "net6.0"),
+                    new XAttribute("RuntimeFrameworkName", "Microsoft.NETCore.App"),
+                    new XAttribute("LatestRuntimeFrameworkVersion", originalBundledNETCoreAppPackageVersion),
+                    new XAttribute("RuntimePackNamePatterns", "Microsoft.NETCore.App.Runtime.Mono.**RID**"),
+                    new XAttribute("RuntimePackRuntimeIdentifiers", "browser-wasm"),
+                    new XAttribute("RuntimePackLabels", "Mono"),
+                    new XAttribute("IsTrimmable", "true")
+                ));
+            }
+            CheckAndReplaceAttribute(itemGroup
+                .Elements(ns + "KnownRuntimePack").First().Attribute("LatestRuntimeFrameworkVersion"));
+
             return projectXml.ToString();
         }
 

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets

@@ -115,6 +115,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <SelfContained Condition="'$(SelfContained)' == '' and '$(RuntimeIdentifier)' != ''">true</SelfContained>
     <SelfContained Condition="'$(SelfContained)' == ''">false</SelfContained>
     <_OnOsx>$(NETCoreSdkRuntimeIdentifier.StartsWith('osx'))</_OnOsx>
+    <_RuntimeIdentifierUsesMonoRuntimeByDefault Condition="$(RuntimeIdentifier.StartsWith('ios')) or $(RuntimeIdentifier.StartsWith('tvos')) or $(RuntimeIdentifier.StartsWith('maccatalyst')) or $(RuntimeIdentifier.StartsWith('android')) or $(RuntimeIdentifier.StartsWith('browser'))">true</_RuntimeIdentifierUsesMonoRuntimeByDefault>
     <_RuntimeIdentifierUsesAppHost Condition="$(RuntimeIdentifier.StartsWith('ios')) or $(RuntimeIdentifier.StartsWith('tvos')) or $(RuntimeIdentifier.StartsWith('maccatalyst')) or $(RuntimeIdentifier.StartsWith('android')) or $(RuntimeIdentifier.StartsWith('browser'))">false</_RuntimeIdentifierUsesAppHost>
     <_RuntimeIdentifierUsesAppHost Condition="'$(_RuntimeIdentifierUsesAppHost)' == ''">true</_RuntimeIdentifierUsesAppHost>
     <UseAppHost Condition="'$(UseAppHost)' == '' and
@@ -123,6 +124,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                             ('$(RuntimeIdentifier)' != '' and '$(_TargetFrameworkVersionWithoutV)' >= '2.1') or
                             ('$(_TargetFrameworkVersionWithoutV)' >= '3.0' and $(_OnOsx) != 'true'))">true</UseAppHost>
     <UseAppHost Condition="'$(UseAppHost)' == ''">false</UseAppHost>
+    <UseMonoRuntime Condition="'$(UseMonoRuntime)' == '' and '$(_RuntimeIdentifierUsesMonoRuntimeByDefault)' == 'true'">true</UseMonoRuntime>
   </PropertyGroup>
 
   <!-- Only use the default apphost if building without a RID and without a deps file path (used by GenerateDeps.proj for CLI tools). -->

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.props

@@ -73,7 +73,12 @@ Copyright (c) .NET Foundation. All rights reserved.
     <FrameworkReference Include="Microsoft.NETCore.App" IsImplicitlyDefined="true"
                         Pack="false"
                         PrivateAssets="All"
-                    Condition="('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '3.0')"/>
+                        Condition="('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '3.0')"/>
+
+    <!-- Allow opt-in to Mono runtime pack for .NET 6.0 or higher -->
+    <FrameworkReference Update="Microsoft.NETCore.App"
+                        RuntimePackLabels="Mono"
+                        Condition="'$(UseMonoRuntime)' == 'true' And ('$(_TargetFrameworkVersionWithoutV)' != '') And ('$(_TargetFrameworkVersionWithoutV)' >= '6.0')" />
 
   </ItemGroup>