Skip to content

Commit ac34532

Browse files
jeffhandleyjeffhandley
authored
[manual] Merge release/8.0-staging into release/8.0 (#122240)
No OOB reset needed.
2 parents 56acca8 + 2118a1a commit ac34532

File tree

52 files changed

+599
-848
lines changed

Some content is hidden

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

52 files changed

+599
-848
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.25427.2",
18+
"version": "8.0.0-prerelease.25516.2",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/Version.Details.xml‎

Lines changed: 66 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-rtm.25504.1">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-rtm.25565.1">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>34092c89640d48ae4f54ad425c3357ccfe1df414</Sha>
5+
<Sha>b565264ebc86c4444a7a5d411f69674393d61265</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="8.0.0-alpha.1.23527.1">
88
<Uri>https://github.com/dotnet/msquic</Uri>
@@ -99,9 +99,9 @@
9999
<Sha>87f89d77d2eb70ed29b3e0f37cfbf28bfd49c536</Sha>
100100
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
101101
</Dependency>
102-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25462.3">
102+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25522.3">
103103
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
104-
<Sha>55cc6bb942c12203e42ddb58f72cf5dbf1173eac</Sha>
104+
<Sha>449148366d9105de8a6470ebc4ba198926e9a30a</Sha>
105105
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
106106
</Dependency>
107107
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
@@ -185,57 +185,57 @@
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186186
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
187187
</Dependency>
188-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25504.1">
188+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25565.1">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
190-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
190+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
191191
</Dependency>
192-
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.25504.1">
192+
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.25565.1">
193193
<Uri>https://github.com/dotnet/runtime-assets</Uri>
194-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
194+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
195195
</Dependency>
196-
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.25504.1">
196+
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.25565.1">
197197
<Uri>https://github.com/dotnet/runtime-assets</Uri>
198-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
198+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
199199
</Dependency>
200-
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.25504.1">
200+
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.25565.1">
201201
<Uri>https://github.com/dotnet/runtime-assets</Uri>
202-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
202+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
203203
</Dependency>
204-
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.25504.1">
204+
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.25565.1">
205205
<Uri>https://github.com/dotnet/runtime-assets</Uri>
206-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
206+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
207207
</Dependency>
208-
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.25504.1">
208+
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.25565.1">
209209
<Uri>https://github.com/dotnet/runtime-assets</Uri>
210-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
210+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
211211
</Dependency>
212-
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.25504.1">
212+
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.25565.1">
213213
<Uri>https://github.com/dotnet/runtime-assets</Uri>
214-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
214+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
215215
</Dependency>
216-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.25504.1">
216+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.25565.1">
217217
<Uri>https://github.com/dotnet/runtime-assets</Uri>
218-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
218+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
219219
</Dependency>
220-
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.25504.1">
220+
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.25565.1">
221221
<Uri>https://github.com/dotnet/runtime-assets</Uri>
222-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
222+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
223223
</Dependency>
224-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.25504.1">
224+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.25565.1">
225225
<Uri>https://github.com/dotnet/runtime-assets</Uri>
226-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
226+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
227227
</Dependency>
228-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.25504.1">
228+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.25565.1">
229229
<Uri>https://github.com/dotnet/runtime-assets</Uri>
230-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
230+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
231231
</Dependency>
232-
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.25504.1">
232+
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.25565.1">
233233
<Uri>https://github.com/dotnet/runtime-assets</Uri>
234-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
234+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
235235
</Dependency>
236-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.25504.1">
236+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.25565.1">
237237
<Uri>https://github.com/dotnet/runtime-assets</Uri>
238-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
238+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
239239
</Dependency>
240240
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.25311.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.25427.2">
325+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.25516.2">
326326
<Uri>https://github.com/dotnet/xharness</Uri>
327-
<Sha>fc7f1ca0ff5b949ba7b7500e5aa9a01e4a43d894</Sha>
327+
<Sha>402df9c4f5abe6ee8519181dfb5481e04099fab0</Sha>
328328
</Dependency>
329-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.25427.2">
329+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.25516.2">
330330
<Uri>https://github.com/dotnet/xharness</Uri>
331-
<Sha>fc7f1ca0ff5b949ba7b7500e5aa9a01e4a43d894</Sha>
331+
<Sha>402df9c4f5abe6ee8519181dfb5481e04099fab0</Sha>
332332
</Dependency>
333-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.25427.2">
333+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.25516.2">
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335-
<Sha>fc7f1ca0ff5b949ba7b7500e5aa9a01e4a43d894</Sha>
335+
<Sha>402df9c4f5abe6ee8519181dfb5481e04099fab0</Sha>
336336
</Dependency>
337337
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25562.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.25504.1">
357+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25574.3">
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
359-
<Sha>7741c91e2ddf9791828e1fcf86108844c4222446</Sha>
359+
<Sha>cf2f6ad655ebd5397042ea09d529ecc0c194a499</Sha>
360360
</Dependency>
361-
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25504.1">
361+
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25565.1">
362362
<Uri>https://github.com/dotnet/runtime-assets</Uri>
363-
<Sha>fcd10a83bcad9c9e7ce4556f8b56c2579d7f00d8</Sha>
363+
<Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</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>
@@ -400,9 +400,21 @@
400400
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
401401
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
402402
</Dependency>
403-
<!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
403+
<!-- NuGet dependencies are necessary for source-build. This allows the packages to be retrieved from previously-source-built artifacts
404404
and flow in as dependencies of the packages produced by runtime. -->
405-
<Dependency Name="Nuget.ProjectModel" Version="6.2.4">
405+
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
406+
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
407+
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
408+
</Dependency>
409+
<Dependency Name="NuGet.ProjectModel" Version="6.2.4">
410+
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
411+
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
412+
</Dependency>
413+
<Dependency Name="NuGet.Versioning" Version="6.2.4">
414+
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
415+
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
416+
</Dependency>
417+
<Dependency Name="NuGet.Packaging" Version="6.2.4">
406418
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
407419
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
408420
</Dependency>
@@ -414,6 +426,18 @@
414426
<Uri>https://github.com/dotnet/msbuild</Uri>
415427
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
416428
</Dependency>
429+
<Dependency Name="Microsoft.Build.Framework" Version="17.8.3">
430+
<Uri>https://github.com/dotnet/msbuild</Uri>
431+
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
432+
</Dependency>
433+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.8.3">
434+
<Uri>https://github.com/dotnet/msbuild</Uri>
435+
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
436+
</Dependency>
437+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.8.3">
438+
<Uri>https://github.com/dotnet/msbuild</Uri>
439+
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
440+
</Dependency>
417441
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
418442
<Uri>https://github.com/dotnet/msbuild</Uri>
419443
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -155,20 +155,20 @@
155155
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
156156
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
157157
<!-- Runtime-Assets dependencies -->
158-
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25504.1</SystemRuntimeNumericsTestDataVersion>
159-
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25504.1</SystemComponentModelTypeConverterTestDataVersion>
160-
<SystemDataCommonTestDataVersion>8.0.0-beta.25504.1</SystemDataCommonTestDataVersion>
161-
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25504.1</SystemDrawingCommonTestDataVersion>
162-
<SystemFormatsTarTestDataVersion>8.0.0-beta.25504.1</SystemFormatsTarTestDataVersion>
163-
<SystemIOCompressionTestDataVersion>8.0.0-beta.25504.1</SystemIOCompressionTestDataVersion>
164-
<SystemIOPackagingTestDataVersion>8.0.0-beta.25504.1</SystemIOPackagingTestDataVersion>
165-
<SystemNetTestDataVersion>8.0.0-beta.25504.1</SystemNetTestDataVersion>
166-
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25504.1</SystemPrivateRuntimeUnicodeDataVersion>
167-
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25504.1</SystemRuntimeTimeZoneDataVersion>
168-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25504.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
169-
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25504.1</SystemTextRegularExpressionsTestDataVersion>
170-
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25504.1</SystemWindowsExtensionsTestDataVersion>
171-
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25504.1</MicrosoftDotNetCilStripSourcesVersion>
158+
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25565.1</SystemRuntimeNumericsTestDataVersion>
159+
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25565.1</SystemComponentModelTypeConverterTestDataVersion>
160+
<SystemDataCommonTestDataVersion>8.0.0-beta.25565.1</SystemDataCommonTestDataVersion>
161+
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25565.1</SystemDrawingCommonTestDataVersion>
162+
<SystemFormatsTarTestDataVersion>8.0.0-beta.25565.1</SystemFormatsTarTestDataVersion>
163+
<SystemIOCompressionTestDataVersion>8.0.0-beta.25565.1</SystemIOCompressionTestDataVersion>
164+
<SystemIOPackagingTestDataVersion>8.0.0-beta.25565.1</SystemIOPackagingTestDataVersion>
165+
<SystemNetTestDataVersion>8.0.0-beta.25565.1</SystemNetTestDataVersion>
166+
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25565.1</SystemPrivateRuntimeUnicodeDataVersion>
167+
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25565.1</SystemRuntimeTimeZoneDataVersion>
168+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25565.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
169+
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25565.1</SystemTextRegularExpressionsTestDataVersion>
170+
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25565.1</SystemWindowsExtensionsTestDataVersion>
171+
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25565.1</MicrosoftDotNetCilStripSourcesVersion>
172172
<!-- dotnet-optimization dependencies -->
173173
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
174174
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -197,10 +197,10 @@
197197
<!-- Testing -->
198198
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
199199
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
200-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25427.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
201-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25427.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
202-
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25427.2</MicrosoftDotNetXHarnessCLIVersion>
203-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25504.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
200+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
201+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
202+
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessCLIVersion>
203+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25574.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
204204
<XUnitVersion>2.4.2</XUnitVersion>
205205
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
206206
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -231,7 +231,7 @@
231231
<!-- ILCompiler -->
232232
<MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23406.6</MicrosoftDotNetILCompilerVersion>
233233
<!-- ICU -->
234-
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.25504.1</MicrosoftNETCoreRuntimeICUTransportVersion>
234+
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.25565.1</MicrosoftNETCoreRuntimeICUTransportVersion>
235235
<!-- MsQuic -->
236236
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
237237
<!-- Mono LLVM -->

‎eng/native/configurecompiler.cmake‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,21 @@ if (CLR_CMAKE_HOST_UNIX)
500500
#-fms-compatibility Enable full Microsoft Visual C++ compatibility
501501
#-fms-extensions Accept some non-standard constructs supported by the Microsoft compiler
502502

503-
# Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around
504-
# using twos-complement representation (this is normally undefined according to the C++ spec).
505-
add_compile_options(-fwrapv)
503+
if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0) OR
504+
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0))
505+
# Make signed overflow well-defined. Implies the following flags in clang-20 and above.
506+
# -fwrapv - Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around
507+
# using twos-complement representation (this is normally undefined according to the C++ spec).
508+
# -fwrapv-pointer - The same as -fwrapv but for pointers.
509+
add_compile_options(-fno-strict-overflow)
510+
511+
# Suppress C++ strict aliasing rules. This matches our use of MSVC.
512+
add_compile_options(-fno-strict-aliasing)
513+
else()
514+
# Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around
515+
# using twos-complement representation (this is normally undefined according to the C++ spec).
516+
add_compile_options(-fwrapv)
517+
endif()
506518

507519
if(CLR_CMAKE_HOST_APPLE)
508520
# Clang will by default emit objc_msgSend stubs in Xcode 14, which ld from earlier Xcodes doesn't understand.

‎eng/pipelines/common/templates/pipeline-with-resources.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ extends:
7474

7575
# We use a CentOS Stream 9 image here to test building from source on CentOS Stream 9.
7676
SourceBuild_centos_x64:
77-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
77+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64
7878

7979
# AlmaLinux 8 is a RHEL 8 rebuild, so we use it to test building from source on RHEL 8.
8080
SourceBuild_linux_x64:
81-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
81+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-9-source-build-amd64
8282

8383
linux_s390x:
8484
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-s390x
@@ -99,7 +99,7 @@ extends:
9999
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc13-amd64
100100

101101
linux_x64_llvmaot:
102-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
102+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64
103103

104104
browser_wasm:
105105
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-webassembly-amd64

0 commit comments

Comments
 (0)