Skip to content

Commit 8d6d92c

Browse files
authored
[manual] Merge release/8.0-staging into release/8.0
2 parents 95ab6fe + fe08496 commit 8d6d92c

File tree

101 files changed

+1970
-1280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1970
-1280
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "8.0.0-prerelease.24208.4",
18+
"version": "8.0.0-prerelease.24229.2",
1919
"commands": [
2020
"xharness"
2121
]

eng/Subsets.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
<ProjectToBuild Include="$(CoreClrProjectRoot)nativeaot\BuildIntegration\BuildIntegration.proj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />
343343

344344
<ProjectToBuild Condition="'$(NativeAotSupported)' == 'true' and ('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != '')" Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_crossarch.csproj" Category="clr" />
345-
<ProjectToBuild Condition="'$(TargetArchitecture)' != '$(BuildArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != ''" Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_crossarch.csproj" Category="clr" />
345+
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" />
346346

347347
<ProjectToBuild Condition="'$(TargetOS)' == 'windows' or ('$(TargetOS)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')) or '$(TargetOS)' == 'osx'" Include="$(CoreClrProjectRoot)tools\SuperFileCheck\SuperFileCheck.csproj" Category="clr" />
348348
</ItemGroup>
@@ -507,6 +507,7 @@
507507
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and '$(PgoInstrument)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
508508
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
509509
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-hostfxr.proj" />
510+
<SharedFrameworkProjectToBuild Condition="'$(BuildNETStandard21TargetingPack)' == 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\netstandard2.1.proj" />
510511
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-runtime-deps\*.proj" />
511512
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\archives\dotnet-nethost.proj" />
512513
<SharedFrameworkProjectToBuild Condition="'$(MonoCrossAOTTargetOS)' != ''" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\monocrossaot.sfxproj" Pack="true" />

eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@
104104
<Sha>6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb</Sha>
105105
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
106106
</Dependency>
107-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24216.1">
107+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24269.1">
108108
<Uri>https://github.com/dotnet/source-build-externals</Uri>
109-
<Sha>908177a58a41532b3302c17f1e1a8cf1c1234545</Sha>
109+
<Sha>4f2151df120194f0268944f1b723c14820738fc8</Sha>
110110
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
111111
</Dependency>
112112
</ProductDependencies>
@@ -185,57 +185,57 @@
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186186
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
187187
</Dependency>
188-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24211.2">
188+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24270.1">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
190-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
190+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
191191
</Dependency>
192-
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24211.2">
192+
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24270.1">
193193
<Uri>https://github.com/dotnet/runtime-assets</Uri>
194-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
194+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
195195
</Dependency>
196-
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24211.2">
196+
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24270.1">
197197
<Uri>https://github.com/dotnet/runtime-assets</Uri>
198-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
198+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
199199
</Dependency>
200-
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24211.2">
200+
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24270.1">
201201
<Uri>https://github.com/dotnet/runtime-assets</Uri>
202-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
202+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
203203
</Dependency>
204-
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24211.2">
204+
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24270.1">
205205
<Uri>https://github.com/dotnet/runtime-assets</Uri>
206-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
206+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
207207
</Dependency>
208-
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24211.2">
208+
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24270.1">
209209
<Uri>https://github.com/dotnet/runtime-assets</Uri>
210-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
210+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
211211
</Dependency>
212-
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24211.2">
212+
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24270.1">
213213
<Uri>https://github.com/dotnet/runtime-assets</Uri>
214-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
214+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
215215
</Dependency>
216-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24211.2">
216+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24270.1">
217217
<Uri>https://github.com/dotnet/runtime-assets</Uri>
218-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
218+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
219219
</Dependency>
220-
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24211.2">
220+
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24270.1">
221221
<Uri>https://github.com/dotnet/runtime-assets</Uri>
222-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
222+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
223223
</Dependency>
224-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24211.2">
224+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24270.1">
225225
<Uri>https://github.com/dotnet/runtime-assets</Uri>
226-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
226+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
227227
</Dependency>
228-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24211.2">
228+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24270.1">
229229
<Uri>https://github.com/dotnet/runtime-assets</Uri>
230-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
230+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
231231
</Dependency>
232-
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24211.2">
232+
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24270.1">
233233
<Uri>https://github.com/dotnet/runtime-assets</Uri>
234-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
234+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
235235
</Dependency>
236-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24211.2">
236+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24270.1">
237237
<Uri>https://github.com/dotnet/runtime-assets</Uri>
238-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
238+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
239239
</Dependency>
240240
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23566.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
241241
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -322,17 +322,17 @@
322322
<Uri>https://github.com/dotnet/runtime</Uri>
323323
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
324324
</Dependency>
325-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24208.4">
325+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24229.2">
326326
<Uri>https://github.com/dotnet/xharness</Uri>
327-
<Sha>9d21162000c444b2da3d6cdd805d43e1af51453a</Sha>
327+
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
328328
</Dependency>
329-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24208.4">
329+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24229.2">
330330
<Uri>https://github.com/dotnet/xharness</Uri>
331-
<Sha>9d21162000c444b2da3d6cdd805d43e1af51453a</Sha>
331+
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
332332
</Dependency>
333-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24208.4">
333+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24229.2">
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335-
<Sha>9d21162000c444b2da3d6cdd805d43e1af51453a</Sha>
335+
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
336336
</Dependency>
337337
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24266.3">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -354,13 +354,13 @@
354354
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
355355
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
356356
</Dependency>
357-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24229.2">
357+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24271.1">
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
359-
<Sha>61f137aacabdbd8f279415287a2dd70e150f5eb1</Sha>
359+
<Sha>c804541158619aae93105f54698ca7f149d28232</Sha>
360360
</Dependency>
361-
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24211.2">
361+
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24270.1">
362362
<Uri>https://github.com/dotnet/runtime-assets</Uri>
363-
<Sha>dc8ac7417ae48bfbf2516a346723107af0ad603d</Sha>
363+
<Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
364364
</Dependency>
365365
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
366366
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/Versions.props

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,20 @@
143143
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
144144
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
145145
<!-- Runtime-Assets dependencies -->
146-
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24211.2</SystemRuntimeNumericsTestDataVersion>
147-
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24211.2</SystemComponentModelTypeConverterTestDataVersion>
148-
<SystemDataCommonTestDataVersion>8.0.0-beta.24211.2</SystemDataCommonTestDataVersion>
149-
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24211.2</SystemDrawingCommonTestDataVersion>
150-
<SystemFormatsTarTestDataVersion>8.0.0-beta.24211.2</SystemFormatsTarTestDataVersion>
151-
<SystemIOCompressionTestDataVersion>8.0.0-beta.24211.2</SystemIOCompressionTestDataVersion>
152-
<SystemIOPackagingTestDataVersion>8.0.0-beta.24211.2</SystemIOPackagingTestDataVersion>
153-
<SystemNetTestDataVersion>8.0.0-beta.24211.2</SystemNetTestDataVersion>
154-
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24211.2</SystemPrivateRuntimeUnicodeDataVersion>
155-
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24211.2</SystemRuntimeTimeZoneDataVersion>
156-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24211.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
157-
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24211.2</SystemTextRegularExpressionsTestDataVersion>
158-
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24211.2</SystemWindowsExtensionsTestDataVersion>
159-
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24211.2</MicrosoftDotNetCilStripSourcesVersion>
146+
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24270.1</SystemRuntimeNumericsTestDataVersion>
147+
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24270.1</SystemComponentModelTypeConverterTestDataVersion>
148+
<SystemDataCommonTestDataVersion>8.0.0-beta.24270.1</SystemDataCommonTestDataVersion>
149+
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24270.1</SystemDrawingCommonTestDataVersion>
150+
<SystemFormatsTarTestDataVersion>8.0.0-beta.24270.1</SystemFormatsTarTestDataVersion>
151+
<SystemIOCompressionTestDataVersion>8.0.0-beta.24270.1</SystemIOCompressionTestDataVersion>
152+
<SystemIOPackagingTestDataVersion>8.0.0-beta.24270.1</SystemIOPackagingTestDataVersion>
153+
<SystemNetTestDataVersion>8.0.0-beta.24270.1</SystemNetTestDataVersion>
154+
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24270.1</SystemPrivateRuntimeUnicodeDataVersion>
155+
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24270.1</SystemRuntimeTimeZoneDataVersion>
156+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24270.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
157+
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24270.1</SystemTextRegularExpressionsTestDataVersion>
158+
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24270.1</SystemWindowsExtensionsTestDataVersion>
159+
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24270.1</MicrosoftDotNetCilStripSourcesVersion>
160160
<!-- dotnet-optimization dependencies -->
161161
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
162162
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -165,7 +165,7 @@
165165
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationlinuxarm64MIBCRuntimeVersion>
166166
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23566.3</optimizationPGOCoreCLRVersion>
167167
<!-- Not auto-updated. -->
168-
<MicrosoftDiaSymReaderNativeVersion>17.8.7-beta1.24113.1</MicrosoftDiaSymReaderNativeVersion>
168+
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
169169
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
170170
<TraceEventVersion>3.0.3</TraceEventVersion>
171171
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
@@ -183,10 +183,10 @@
183183
<!-- Testing -->
184184
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
185185
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
186-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24208.4</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
187-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24208.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
188-
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24208.4</MicrosoftDotNetXHarnessCLIVersion>
189-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24229.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
186+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
187+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
188+
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessCLIVersion>
189+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24271.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
190190
<XUnitVersion>2.4.2</XUnitVersion>
191191
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
192192
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -260,4 +260,12 @@
260260
<MicrosoftDotnetSdkInternalVersion>8.0.101</MicrosoftDotnetSdkInternalVersion>
261261
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
262262
</PropertyGroup>
263+
<PropertyGroup>
264+
<!--
265+
Targeting pack package for NETStandard 2.1 gets rebuilt on demand.
266+
267+
Set to rebuild with 8.0.8 release, and automatically disabled after that.
268+
-->
269+
<BuildNETStandard21TargetingPack Condition="'$(PatchVersion)' == '8'">true</BuildNETStandard21TargetingPack>
270+
</PropertyGroup>
263271
</Project>

0 commit comments

Comments
 (0)