Skip to content

Commit 6a9355b

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #99577 from carlossanlop/release/6.0-staging
[manual] Merge release/6.0-staging into release/6.0
2 parents c7361d7 + bc5e878 commit 6a9355b

File tree

21 files changed

+945
-69
lines changed

21 files changed

+945
-69
lines changed

‎NuGet.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
1212
<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" />
13+
<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" />
14+
<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" />
15+
<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" />
1316
<!-- End: Package sources from dotnet-emsdk -->
1417
<!-- Begin: Package sources from dotnet-wcf -->
1518
<!-- End: Package sources from dotnet-wcf -->

‎eng/Publishing.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
2-
<!-- TODO: Consolidate the Publishing.props files into here. -->
2+
33
<PropertyGroup>
4-
<PublishingVersion>3</PublishingVersion>
4+
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
55
</PropertyGroup>
6-
</Project>
6+
7+
</Project>

‎eng/Version.Details.xml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.23512.2">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24114.3">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>0a6b6dc4153f52a42dad0cf275e969c2bfaad1a2</Sha>
5+
<Sha>b62077d90972117ad4663128962914864b19ad05</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
88
<Uri>https://github.com/dotnet/msquic</Uri>
99
<Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
1010
</Dependency>
1111
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.28">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>925c59b436d60b9cd6b5df54c3f9be13a9512c95</Sha>
13+
<Sha>ee3546a41338fd3c82167b62d7ff989934c6cb01</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.28">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>925c59b436d60b9cd6b5df54c3f9be13a9512c95</Sha>
17+
<Sha>ee3546a41338fd3c82167b62d7ff989934c6cb01</Sha>
1818
</Dependency>
1919
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.28">
2020
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>925c59b436d60b9cd6b5df54c3f9be13a9512c95</Sha>
21+
<Sha>ee3546a41338fd3c82167b62d7ff989934c6cb01</Sha>
2222
</Dependency>
2323
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
2424
<Uri>https://github.com/dotnet/wcf</Uri>
@@ -102,49 +102,49 @@
102102
<Uri>https://github.com/microsoft/vstest</Uri>
103103
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
104104
</Dependency>
105-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.23512.1">
105+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24124.1">
106106
<Uri>https://github.com/dotnet/runtime-assets</Uri>
107-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
107+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
108108
</Dependency>
109-
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.23512.1">
109+
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24124.1">
110110
<Uri>https://github.com/dotnet/runtime-assets</Uri>
111-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
111+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
112112
</Dependency>
113-
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.23512.1">
113+
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24124.1">
114114
<Uri>https://github.com/dotnet/runtime-assets</Uri>
115-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
115+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
116116
</Dependency>
117-
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.23512.1">
117+
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24124.1">
118118
<Uri>https://github.com/dotnet/runtime-assets</Uri>
119-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
119+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
120120
</Dependency>
121-
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.23512.1">
121+
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24124.1">
122122
<Uri>https://github.com/dotnet/runtime-assets</Uri>
123-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
123+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
124124
</Dependency>
125-
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.23512.1">
125+
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24124.1">
126126
<Uri>https://github.com/dotnet/runtime-assets</Uri>
127-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
127+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
128128
</Dependency>
129-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.23512.1">
129+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24124.1">
130130
<Uri>https://github.com/dotnet/runtime-assets</Uri>
131-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
131+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
132132
</Dependency>
133-
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.23512.1">
133+
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24124.1">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
135-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
135+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
136136
</Dependency>
137-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.23512.1">
137+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24124.1">
138138
<Uri>https://github.com/dotnet/runtime-assets</Uri>
139-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
139+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
140140
</Dependency>
141-
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.23512.1">
141+
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24124.1">
142142
<Uri>https://github.com/dotnet/runtime-assets</Uri>
143-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
143+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.23512.1">
145+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24124.1">
146146
<Uri>https://github.com/dotnet/runtime-assets</Uri>
147-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
147+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
148148
</Dependency>
149149
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
150150
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -242,13 +242,13 @@
242242
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
243243
<Sha>d50065944d8b41d804448a7056351481d583ad3d</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.23518.4">
245+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24115.1">
246246
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
247-
<Sha>453eb973df8f81461022c8a428c717ed87129055</Sha>
247+
<Sha>0d7d008228ffdfeb200fdf8039419a7c019eff50</Sha>
248248
</Dependency>
249-
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.23512.1">
249+
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24124.1">
250250
<Uri>https://github.com/dotnet/runtime-assets</Uri>
251-
<Sha>982dfbc57db3a7ccd49e671ab1ca9779cc7070e5</Sha>
251+
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
252252
</Dependency>
253253
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc1.21413.4">
254254
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

‎eng/Versions.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,18 @@
108108
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
109109
<runtimenativeSystemIOPortsVersion>6.0.0-rc.1.21415.6</runtimenativeSystemIOPortsVersion>
110110
<!-- Runtime-Assets dependencies -->
111-
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.23512.1</SystemRuntimeNumericsTestDataVersion>
112-
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.23512.1</SystemComponentModelTypeConverterTestDataVersion>
113-
<SystemDataCommonTestDataVersion>6.0.0-beta.23512.1</SystemDataCommonTestDataVersion>
114-
<SystemDrawingCommonTestDataVersion>6.0.0-beta.23512.1</SystemDrawingCommonTestDataVersion>
115-
<SystemIOCompressionTestDataVersion>6.0.0-beta.23512.1</SystemIOCompressionTestDataVersion>
116-
<SystemIOPackagingTestDataVersion>6.0.0-beta.23512.1</SystemIOPackagingTestDataVersion>
117-
<SystemNetTestDataVersion>6.0.0-beta.23512.1</SystemNetTestDataVersion>
118-
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.23512.1</SystemPrivateRuntimeUnicodeDataVersion>
119-
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.23512.1</SystemRuntimeTimeZoneDataVersion>
120-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.23512.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
121-
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.23512.1</SystemWindowsExtensionsTestDataVersion>
122-
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.23512.1</MicrosoftDotNetCilStripSourcesVersion>
111+
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.24124.1</SystemRuntimeNumericsTestDataVersion>
112+
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.24124.1</SystemComponentModelTypeConverterTestDataVersion>
113+
<SystemDataCommonTestDataVersion>6.0.0-beta.24124.1</SystemDataCommonTestDataVersion>
114+
<SystemDrawingCommonTestDataVersion>6.0.0-beta.24124.1</SystemDrawingCommonTestDataVersion>
115+
<SystemIOCompressionTestDataVersion>6.0.0-beta.24124.1</SystemIOCompressionTestDataVersion>
116+
<SystemIOPackagingTestDataVersion>6.0.0-beta.24124.1</SystemIOPackagingTestDataVersion>
117+
<SystemNetTestDataVersion>6.0.0-beta.24124.1</SystemNetTestDataVersion>
118+
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.24124.1</SystemPrivateRuntimeUnicodeDataVersion>
119+
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.24124.1</SystemRuntimeTimeZoneDataVersion>
120+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.24124.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
121+
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.24124.1</SystemWindowsExtensionsTestDataVersion>
122+
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.24124.1</MicrosoftDotNetCilStripSourcesVersion>
123123
<!-- dotnet-optimization dependencies -->
124124
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx64MIBCRuntimeVersion>
125125
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -138,14 +138,14 @@
138138
<MicrosoftBuildVersion>16.10.0</MicrosoftBuildVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
140140
<SystemDrawingCommonVersion>4.7.2</SystemDrawingCommonVersion>
141-
<NugetProjectModelVersion>6.7.0</NugetProjectModelVersion>
141+
<NugetProjectModelVersion>6.7.1</NugetProjectModelVersion>
142142
<NugetPackagingVersion>6.2.2</NugetPackagingVersion>
143143
<!-- Testing -->
144144
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
145145
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
146146
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.23531.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
147147
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.23531.3</MicrosoftDotNetXHarnessCLIVersion>
148-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.23518.4</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
148+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.24115.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
149149
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.23367.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
150150
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
151151
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
@@ -163,7 +163,7 @@
163163
<MicrosoftNETILLinkTasksVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksVersion>
164164
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
165165
<!-- ICU -->
166-
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.23512.2</MicrosoftNETCoreRuntimeICUTransportVersion>
166+
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.24114.3</MicrosoftNETCoreRuntimeICUTransportVersion>
167167
<!-- MsQuic -->
168168
<SystemNetMsQuicTransportVersion>6.0.0-servicing.22205.1</SystemNetMsQuicTransportVersion>
169169
<!-- Mono LLVM -->

‎src/coreclr/vm/win32threadpool.h‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -752,17 +752,23 @@ class ThreadpoolMgr
752752

753753
#ifndef TARGET_UNIX
754754
if (CPUGroupInfo::CanEnableThreadUseAllCpuGroups())
755-
processorNumber = CPUGroupInfo::CalculateCurrentProcessorNumber();
755+
{
756+
// The current processor number may not be within the total number of active processors determined at
757+
// initialization time.
758+
processorNumber = CPUGroupInfo::CalculateCurrentProcessorNumber() % CPUGroupInfo::GetNumActiveProcessors();
759+
}
756760
else
761+
{
757762
// Turns out GetCurrentProcessorNumber can return a value greater than the number of processors reported by
758763
// GetSystemInfo, if we're running in WOW64 on a machine with >32 processors.
759-
processorNumber = GetCurrentProcessorNumber()%NumberOfProcessors;
764+
processorNumber = GetCurrentProcessorNumber() % g_SystemInfo.dwNumberOfProcessors;
765+
}
760766
#else // !TARGET_UNIX
761767
if (PAL_HasGetCurrentProcessorNumber())
762768
{
763769
// On linux, GetCurrentProcessorNumber which uses sched_getcpu() can return a value greater than the number
764770
// of processors reported by sysconf(_SC_NPROCESSORS_ONLN) when using OpenVZ kernel.
765-
processorNumber = GetCurrentProcessorNumber()%NumberOfProcessors;
771+
processorNumber = GetCurrentProcessorNumber() % PAL_GetTotalCpuCount();
766772
}
767773
#endif // !TARGET_UNIX
768774
return pRecycledListPerProcessor[processorNumber][memType];

‎src/installer/prepare-artifacts.proj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
</PropertyGroup>
2424
<Import Project="../tools/Sign.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
2525

26+
<Import Project="$(RepositoryEngineeringDir)Publishing.props" Condition="Exists('$(RepositoryEngineeringDir)Publishing.props')" />
27+
2628
<UsingTask TaskName="GenerateChecksums" AssemblyFile="$(InstallerTasksAssemblyPath)" />
2729

2830
<PropertyGroup>
@@ -56,6 +58,16 @@
5658
<ManifestBuildData Include="AzureDevOpsBranch=$(BUILD_SOURCEBRANCH)" />
5759
</ItemGroup>
5860

61+
<!--
62+
Set metadata for assets that are not marked as NonShipping.
63+
This is used to determine if the asset should be shipped as part of .NET release.
64+
-->
65+
<ItemDefinitionGroup>
66+
<ItemsToPush>
67+
<ManifestArtifactData Condition="'$(ProducesDotNetReleaseShippingAssets)' == 'true'">DotNetReleaseShipping=true</ManifestArtifactData>
68+
</ItemsToPush>
69+
</ItemDefinitionGroup>
70+
5971
<!--
6072
Take assets from the build jobs, prepare them for publishing (signing, arrangement) then upload
6173
them to the pipeline for Arcade and custom steps to publish.

0 commit comments

Comments
 (0)