[manual] Merge release/6.0-staging into release/6.0

NuGet.config

@@ -10,6 +10,9 @@
     <!--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-925c59b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-925c59b4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-925c59b-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-925c59b4-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-925c59b-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-925c59b4-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-ee3546a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ee3546a4/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-wcf -->
     <!--  End: Package sources from dotnet-wcf -->

eng/Publishing.props

@@ -1,6 +1,7 @@
 <Project>
-  <!-- TODO: Consolidate the Publishing.props files into here. -->
+
   <PropertyGroup>
-    <PublishingVersion>3</PublishingVersion>
+    <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
   </PropertyGroup>
-</Project>
+
+</Project>

eng/Version.Details.xml

@@ -1,24 +1,24 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.23512.2">
+    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24114.3">
       <Uri>https://github.com/dotnet/icu</Uri>
-      <Sha>0a6b6dc4153f52a42dad0cf275e969c2bfaad1a2</Sha>
+      <Sha>b62077d90972117ad4663128962914864b19ad05</Sha>
     </Dependency>
     <Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
       <Uri>https://github.com/dotnet/msquic</Uri>
       <Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.28">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>925c59b436d60b9cd6b5df54c3f9be13a9512c95</Sha>
+      <Sha>ee3546a41338fd3c82167b62d7ff989934c6cb01</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.28">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>925c59b436d60b9cd6b5df54c3f9be13a9512c95</Sha>
+      <Sha>ee3546a41338fd3c82167b62d7ff989934c6cb01</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.28">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>925c59b436d60b9cd6b5df54c3f9be13a9512c95</Sha>
+      <Sha>ee3546a41338fd3c82167b62d7ff989934c6cb01</Sha>
     </Dependency>
     <Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
       <Uri>https://github.com/dotnet/wcf</Uri>
@@ -102,49 +102,49 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="System.Net.TestData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.Net.TestData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.23512.1">
+    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
     <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -242,13 +242,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
       <Sha>d50065944d8b41d804448a7056351481d583ad3d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.23518.4">
+    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24115.1">
       <Uri>https://github.com/dotnet/hotreload-utils</Uri>
-      <Sha>453eb973df8f81461022c8a428c717ed87129055</Sha>
+      <Sha>0d7d008228ffdfeb200fdf8039419a7c019eff50</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.23512.1">
+    <Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24124.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
+      <Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc1.21413.4">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

eng/Versions.props

@@ -108,18 +108,18 @@
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <runtimenativeSystemIOPortsVersion>6.0.0-rc.1.21415.6</runtimenativeSystemIOPortsVersion>
     <!-- Runtime-Assets dependencies -->
-    <SystemRuntimeNumericsTestDataVersion>6.0.0-beta.23512.1</SystemRuntimeNumericsTestDataVersion>
-    <SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.23512.1</SystemComponentModelTypeConverterTestDataVersion>
-    <SystemDataCommonTestDataVersion>6.0.0-beta.23512.1</SystemDataCommonTestDataVersion>
-    <SystemDrawingCommonTestDataVersion>6.0.0-beta.23512.1</SystemDrawingCommonTestDataVersion>
-    <SystemIOCompressionTestDataVersion>6.0.0-beta.23512.1</SystemIOCompressionTestDataVersion>
-    <SystemIOPackagingTestDataVersion>6.0.0-beta.23512.1</SystemIOPackagingTestDataVersion>
-    <SystemNetTestDataVersion>6.0.0-beta.23512.1</SystemNetTestDataVersion>
-    <SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.23512.1</SystemPrivateRuntimeUnicodeDataVersion>
-    <SystemRuntimeTimeZoneDataVersion>6.0.0-beta.23512.1</SystemRuntimeTimeZoneDataVersion>
-    <SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.23512.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
-    <SystemWindowsExtensionsTestDataVersion>6.0.0-beta.23512.1</SystemWindowsExtensionsTestDataVersion>
-    <MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.23512.1</MicrosoftDotNetCilStripSourcesVersion>
+    <SystemRuntimeNumericsTestDataVersion>6.0.0-beta.24124.1</SystemRuntimeNumericsTestDataVersion>
+    <SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.24124.1</SystemComponentModelTypeConverterTestDataVersion>
+    <SystemDataCommonTestDataVersion>6.0.0-beta.24124.1</SystemDataCommonTestDataVersion>
+    <SystemDrawingCommonTestDataVersion>6.0.0-beta.24124.1</SystemDrawingCommonTestDataVersion>
+    <SystemIOCompressionTestDataVersion>6.0.0-beta.24124.1</SystemIOCompressionTestDataVersion>
+    <SystemIOPackagingTestDataVersion>6.0.0-beta.24124.1</SystemIOPackagingTestDataVersion>
+    <SystemNetTestDataVersion>6.0.0-beta.24124.1</SystemNetTestDataVersion>
+    <SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.24124.1</SystemPrivateRuntimeUnicodeDataVersion>
+    <SystemRuntimeTimeZoneDataVersion>6.0.0-beta.24124.1</SystemRuntimeTimeZoneDataVersion>
+    <SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.24124.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
+    <SystemWindowsExtensionsTestDataVersion>6.0.0-beta.24124.1</SystemWindowsExtensionsTestDataVersion>
+    <MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.24124.1</MicrosoftDotNetCilStripSourcesVersion>
     <!-- dotnet-optimization dependencies -->
     <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx64MIBCRuntimeVersion>
     <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -138,14 +138,14 @@
     <MicrosoftBuildVersion>16.10.0</MicrosoftBuildVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
     <SystemDrawingCommonVersion>4.7.2</SystemDrawingCommonVersion>
-    <NugetProjectModelVersion>6.7.0</NugetProjectModelVersion>
+    <NugetProjectModelVersion>6.7.1</NugetProjectModelVersion>
     <NugetPackagingVersion>6.2.2</NugetPackagingVersion>
     <!-- Testing -->
     <MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
     <MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
     <MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.23531.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
     <MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.23531.3</MicrosoftDotNetXHarnessCLIVersion>
-    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.23518.4</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
+    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.24115.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.23367.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <XUnitVersion>2.4.2-pre.9</XUnitVersion>
     <XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
@@ -163,7 +163,7 @@
     <MicrosoftNETILLinkTasksVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksVersion>
     <MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
     <!-- ICU -->
-    <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.23512.2</MicrosoftNETCoreRuntimeICUTransportVersion>
+    <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.24114.3</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- MsQuic -->
     <SystemNetMsQuicTransportVersion>6.0.0-servicing.22205.1</SystemNetMsQuicTransportVersion>
     <!-- Mono LLVM -->

src/coreclr/vm/win32threadpool.h

@@ -752,17 +752,23 @@ class ThreadpoolMgr
 
 #ifndef TARGET_UNIX
             if (CPUGroupInfo::CanEnableThreadUseAllCpuGroups())
-                processorNumber = CPUGroupInfo::CalculateCurrentProcessorNumber();
+            {
+                // The current processor number may not be within the total number of active processors determined at
+                // initialization time.
+                processorNumber = CPUGroupInfo::CalculateCurrentProcessorNumber() % CPUGroupInfo::GetNumActiveProcessors();
+            }
             else
+            {
                 // Turns out GetCurrentProcessorNumber can return a value greater than the number of processors reported by
                 // GetSystemInfo, if we're running in WOW64 on a machine with >32 processors.
-        	    processorNumber = GetCurrentProcessorNumber()%NumberOfProcessors;
+                processorNumber = GetCurrentProcessorNumber() % g_SystemInfo.dwNumberOfProcessors;
+            }
 #else // !TARGET_UNIX
             if (PAL_HasGetCurrentProcessorNumber())
             {
                 // On linux, GetCurrentProcessorNumber which uses sched_getcpu() can return a value greater than the number
                 // of processors reported by sysconf(_SC_NPROCESSORS_ONLN) when using OpenVZ kernel.
-                processorNumber = GetCurrentProcessorNumber()%NumberOfProcessors;
+                processorNumber = GetCurrentProcessorNumber() % PAL_GetTotalCpuCount();
             }
 #endif // !TARGET_UNIX
             return pRecycledListPerProcessor[processorNumber][memType];

src/installer/prepare-artifacts.proj

@@ -23,6 +23,8 @@
   </PropertyGroup>
   <Import Project="../tools/Sign.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
+  <Import Project="$(RepositoryEngineeringDir)Publishing.props" Condition="Exists('$(RepositoryEngineeringDir)Publishing.props')" />
+
   <UsingTask TaskName="GenerateChecksums" AssemblyFile="$(InstallerTasksAssemblyPath)" />
 
   <PropertyGroup>
@@ -56,6 +58,16 @@
     <ManifestBuildData Include="AzureDevOpsBranch=$(BUILD_SOURCEBRANCH)" />
   </ItemGroup>
 
+  <!-- 
+    Set metadata for assets that are not marked as NonShipping. 
+    This is used to determine if the asset should be shipped as part of .NET release.
+  -->
+  <ItemDefinitionGroup>
+    <ItemsToPush>
+      <ManifestArtifactData Condition="'$(ProducesDotNetReleaseShippingAssets)' == 'true'">DotNetReleaseShipping=true</ManifestArtifactData>
+    </ItemsToPush>
+  </ItemDefinitionGroup>
+
   <!--
     Take assets from the build jobs, prepare them for publishing (signing, arrangement) then upload
     them to the pipeline for Arcade and custom steps to publish.