Skip to content

Commit 0d09ce7

Browse files
PranavSenthilnathanPranavSenthilnathan
authored
Merge pull request #120615 from PranavSenthilnathan/release/9.0-staging
[manual] Merge release/9.0-staging into release/9.0
2 parents 2bc6764 + f9d6a58 commit 0d09ce7

File tree

44 files changed

+545
-289
lines changed

Some content is hidden

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

44 files changed

+545
-289
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": "9.0.0-prerelease.25426.1",
18+
"version": "9.0.0-prerelease.25504.2",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/Version.Details.xml‎

Lines changed: 44 additions & 44 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="9.0.0-rtm.25469.1">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="9.0.0-rtm.25509.1">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>4ca307e1d07b3b76d1aa66c15d67de89bcca0cd8</Sha>
5+
<Sha>82b2c68d359fe1f84f592e877aa9e021591b39b8</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="9.0.0-alpha.1.24167.3">
88
<Uri>https://github.com/dotnet/msquic</Uri>
@@ -54,14 +54,14 @@
5454
<Sha>803d8598f98fb4efd94604b32627ee9407f246db</Sha>
5555
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25464.3">
57+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25504.2">
5858
<Uri>https://github.com/dotnet/cecil</Uri>
59-
<Sha>e5381291dd01d040b5b111f3a2ee8508ec990d78</Sha>
59+
<Sha>1b55accc7029bd4038d35b2072ec58841431122f</Sha>
6060
</Dependency>
6161
<!-- Intermediate is necessary for source build. -->
62-
<Dependency Name="Microsoft.SourceBuild.Intermediate.cecil" Version="0.11.5-alpha.25464.3">
62+
<Dependency Name="Microsoft.SourceBuild.Intermediate.cecil" Version="0.11.5-alpha.25504.2">
6363
<Uri>https://github.com/dotnet/cecil</Uri>
64-
<Sha>e5381291dd01d040b5b111f3a2ee8508ec990d78</Sha>
64+
<Sha>1b55accc7029bd4038d35b2072ec58841431122f</Sha>
6565
<SourceBuild RepoName="cecil" ManagedOnly="true" />
6666
</Dependency>
6767
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.11-servicing.25509.4">
@@ -79,9 +79,9 @@
7979
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
8080
</Dependency>
8181
<!-- Intermediate is necessary for source build. -->
82-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25452.2">
82+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25473.1">
8383
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
84-
<Sha>745de7d839fdd3b5884d72e953badcfb15493d13</Sha>
84+
<Sha>bd4018e4d8a9006e7f62378db31522354ab15aae</Sha>
8585
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
8686
</Dependency>
8787
<!-- Intermediate is necessary for source build. -->
@@ -174,57 +174,57 @@
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175175
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
176176
</Dependency>
177-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.25462.1">
177+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.25504.2">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
179-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
179+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
180180
</Dependency>
181-
<Dependency Name="System.Data.Common.TestData" Version="9.0.0-beta.25462.1">
181+
<Dependency Name="System.Data.Common.TestData" Version="9.0.0-beta.25504.2">
182182
<Uri>https://github.com/dotnet/runtime-assets</Uri>
183-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
183+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
184184
</Dependency>
185-
<Dependency Name="System.Drawing.Common.TestData" Version="9.0.0-beta.25462.1">
185+
<Dependency Name="System.Drawing.Common.TestData" Version="9.0.0-beta.25504.2">
186186
<Uri>https://github.com/dotnet/runtime-assets</Uri>
187-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
187+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
188188
</Dependency>
189-
<Dependency Name="System.Formats.Tar.TestData" Version="9.0.0-beta.25462.1">
189+
<Dependency Name="System.Formats.Tar.TestData" Version="9.0.0-beta.25504.2">
190190
<Uri>https://github.com/dotnet/runtime-assets</Uri>
191-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
191+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
192192
</Dependency>
193-
<Dependency Name="System.IO.Compression.TestData" Version="9.0.0-beta.25462.1">
193+
<Dependency Name="System.IO.Compression.TestData" Version="9.0.0-beta.25504.2">
194194
<Uri>https://github.com/dotnet/runtime-assets</Uri>
195-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
195+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
196196
</Dependency>
197-
<Dependency Name="System.IO.Packaging.TestData" Version="9.0.0-beta.25462.1">
197+
<Dependency Name="System.IO.Packaging.TestData" Version="9.0.0-beta.25504.2">
198198
<Uri>https://github.com/dotnet/runtime-assets</Uri>
199-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
199+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
200200
</Dependency>
201-
<Dependency Name="System.Net.TestData" Version="9.0.0-beta.25462.1">
201+
<Dependency Name="System.Net.TestData" Version="9.0.0-beta.25504.2">
202202
<Uri>https://github.com/dotnet/runtime-assets</Uri>
203-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
203+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
204204
</Dependency>
205-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="9.0.0-beta.25462.1">
205+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="9.0.0-beta.25504.2">
206206
<Uri>https://github.com/dotnet/runtime-assets</Uri>
207-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
207+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
208208
</Dependency>
209-
<Dependency Name="System.Runtime.TimeZoneData" Version="9.0.0-beta.25462.1">
209+
<Dependency Name="System.Runtime.TimeZoneData" Version="9.0.0-beta.25504.2">
210210
<Uri>https://github.com/dotnet/runtime-assets</Uri>
211-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
211+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
212212
</Dependency>
213-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="9.0.0-beta.25462.1">
213+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="9.0.0-beta.25504.2">
214214
<Uri>https://github.com/dotnet/runtime-assets</Uri>
215-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
215+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
216216
</Dependency>
217-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="9.0.0-beta.25462.1">
217+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="9.0.0-beta.25504.2">
218218
<Uri>https://github.com/dotnet/runtime-assets</Uri>
219-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
219+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
220220
</Dependency>
221-
<Dependency Name="System.Windows.Extensions.TestData" Version="9.0.0-beta.25462.1">
221+
<Dependency Name="System.Windows.Extensions.TestData" Version="9.0.0-beta.25504.2">
222222
<Uri>https://github.com/dotnet/runtime-assets</Uri>
223-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
223+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
224224
</Dependency>
225-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="9.0.0-beta.25462.1">
225+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="9.0.0-beta.25504.2">
226226
<Uri>https://github.com/dotnet/runtime-assets</Uri>
227-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
227+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
228228
</Dependency>
229229
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="19.1.0-alpha.1.25504.3" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
230230
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -320,17 +320,17 @@
320320
<Uri>https://github.com/dotnet/runtime</Uri>
321321
<Sha>b030c4dfdfa1bf287f10f96006619a06bc2000ae</Sha>
322322
</Dependency>
323-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.25426.1">
323+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.25504.2">
324324
<Uri>https://github.com/dotnet/xharness</Uri>
325-
<Sha>7b6f58237ff2355392960408f4d9fd98dfe58f9b</Sha>
325+
<Sha>47324ca7227e3b6e9f51b85b3e1a4a425e89a0ae</Sha>
326326
</Dependency>
327-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.25426.1">
327+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.25504.2">
328328
<Uri>https://github.com/dotnet/xharness</Uri>
329-
<Sha>7b6f58237ff2355392960408f4d9fd98dfe58f9b</Sha>
329+
<Sha>47324ca7227e3b6e9f51b85b3e1a4a425e89a0ae</Sha>
330330
</Dependency>
331-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.25426.1">
331+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.25504.2">
332332
<Uri>https://github.com/dotnet/xharness</Uri>
333-
<Sha>7b6f58237ff2355392960408f4d9fd98dfe58f9b</Sha>
333+
<Sha>47324ca7227e3b6e9f51b85b3e1a4a425e89a0ae</Sha>
334334
</Dependency>
335335
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.25503.3">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -352,13 +352,13 @@
352352
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
353353
<Sha>9d7532585ce71e30ab55f0364d3cecccaf0775d1</Sha>
354354
</Dependency>
355-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.25462.1">
355+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.25504.3">
356356
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
357-
<Sha>0334eb13c37ab4d8d1b405952e838fc8cad195be</Sha>
357+
<Sha>d29a5b47fc17d7c0cfeedaf44ac7f18388195375</Sha>
358358
</Dependency>
359-
<Dependency Name="System.Runtime.Numerics.TestData" Version="9.0.0-beta.25462.1">
359+
<Dependency Name="System.Runtime.Numerics.TestData" Version="9.0.0-beta.25504.2">
360360
<Uri>https://github.com/dotnet/runtime-assets</Uri>
361-
<Sha>36490ea19fe9622e76fb3534069a6459ff56353b</Sha>
361+
<Sha>a01a686de0c5d8407874b1c79d67efaf03d4c8b6</Sha>
362362
</Dependency>
363363
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.25467.18">
364364
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -136,25 +136,31 @@
136136
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
137137
<runtimenativeSystemIOPortsVersion>9.0.0-rtm.24511.16</runtimenativeSystemIOPortsVersion>
138138
<!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
139+
<MicrosoftBclAsyncInterfacesToolsetVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetVersion>
140+
<SystemBuffersToolsetVersion>4.5.1</SystemBuffersToolsetVersion>
139141
<SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
140-
<SystemTextJsonToolsetVersion>8.0.4</SystemTextJsonToolsetVersion>
142+
<SystemMemoryToolsetVersion>4.5.5</SystemMemoryToolsetVersion>
143+
<SystemTextJsonToolsetVersion>8.0.5</SystemTextJsonToolsetVersion>
141144
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
142145
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
146+
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
147+
<SystemTextEncodingsWebToolsetVersion>8.0.0</SystemTextEncodingsWebToolsetVersion>
148+
<SystemThreadingTasksExtensionsToolsetVersion>4.5.4</SystemThreadingTasksExtensionsToolsetVersion>
143149
<!-- Runtime-Assets dependencies -->
144-
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25462.1</SystemRuntimeNumericsTestDataVersion>
145-
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25462.1</SystemComponentModelTypeConverterTestDataVersion>
146-
<SystemDataCommonTestDataVersion>9.0.0-beta.25462.1</SystemDataCommonTestDataVersion>
147-
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25462.1</SystemDrawingCommonTestDataVersion>
148-
<SystemFormatsTarTestDataVersion>9.0.0-beta.25462.1</SystemFormatsTarTestDataVersion>
149-
<SystemIOCompressionTestDataVersion>9.0.0-beta.25462.1</SystemIOCompressionTestDataVersion>
150-
<SystemIOPackagingTestDataVersion>9.0.0-beta.25462.1</SystemIOPackagingTestDataVersion>
151-
<SystemNetTestDataVersion>9.0.0-beta.25462.1</SystemNetTestDataVersion>
152-
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25462.1</SystemPrivateRuntimeUnicodeDataVersion>
153-
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25462.1</SystemRuntimeTimeZoneDataVersion>
154-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25462.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
155-
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25462.1</SystemTextRegularExpressionsTestDataVersion>
156-
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25462.1</SystemWindowsExtensionsTestDataVersion>
157-
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25462.1</MicrosoftDotNetCilStripSourcesVersion>
150+
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25504.2</SystemRuntimeNumericsTestDataVersion>
151+
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25504.2</SystemComponentModelTypeConverterTestDataVersion>
152+
<SystemDataCommonTestDataVersion>9.0.0-beta.25504.2</SystemDataCommonTestDataVersion>
153+
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25504.2</SystemDrawingCommonTestDataVersion>
154+
<SystemFormatsTarTestDataVersion>9.0.0-beta.25504.2</SystemFormatsTarTestDataVersion>
155+
<SystemIOCompressionTestDataVersion>9.0.0-beta.25504.2</SystemIOCompressionTestDataVersion>
156+
<SystemIOPackagingTestDataVersion>9.0.0-beta.25504.2</SystemIOPackagingTestDataVersion>
157+
<SystemNetTestDataVersion>9.0.0-beta.25504.2</SystemNetTestDataVersion>
158+
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25504.2</SystemPrivateRuntimeUnicodeDataVersion>
159+
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25504.2</SystemRuntimeTimeZoneDataVersion>
160+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25504.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
161+
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25504.2</SystemTextRegularExpressionsTestDataVersion>
162+
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25504.2</SystemWindowsExtensionsTestDataVersion>
163+
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25504.2</MicrosoftDotNetCilStripSourcesVersion>
158164
<!-- dotnet-optimization dependencies -->
159165
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx64MIBCRuntimeVersion>
160166
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -185,11 +191,11 @@
185191
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
186192
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
187193
<!-- xharness -->
188-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25426.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
189-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25426.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
190-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25426.1</MicrosoftDotNetXHarnessCLIVersion>
194+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25504.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
195+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25504.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
196+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25504.2</MicrosoftDotNetXHarnessCLIVersion>
191197
<!-- hotreload-utils -->
192-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25462.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
198+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25504.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
193199
<NUnitVersion>3.12.0</NUnitVersion>
194200
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
195201
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
@@ -217,15 +223,14 @@
217223
<!-- Docs -->
218224
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
219225
<!-- Mono Cecil -->
220-
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25464.3</MicrosoftDotNetCecilVersion>
226+
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25504.2</MicrosoftDotNetCecilVersion>
221227
<!-- ILCompiler -->
222228
<MicrosoftDotNetILCompilerVersion>9.0.0-rtm.24511.16</MicrosoftDotNetILCompilerVersion>
223229
<!-- ICU -->
224-
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25469.1</MicrosoftNETCoreRuntimeICUTransportVersion>
230+
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25509.1</MicrosoftNETCoreRuntimeICUTransportVersion>
225231
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24466.4</MicrosoftNETCoreRuntimeICUTransportVersion>
226232
<!-- MsQuic -->
227233
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
228-
<SystemNetMsQuicTransportVersion>9.0.0-alpha.1.24167.3</SystemNetMsQuicTransportVersion>
229234
<!-- Mono LLVM -->
230235
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.25504.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
231236
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>19.1.0-alpha.1.25504.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>

‎eng/pipelines/coreclr/templates/helix-queues-setup.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ jobs:
105105
# OSX arm64
106106
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
107107
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
108-
- OSX.1200.ARM64.Open
108+
- OSX.13.ARM64.Open
109109
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
110-
- OSX.1200.ARM64
110+
- OSX.13.ARM64
111111

112112
# OSX x64
113113
- ${{ if eq(parameters.platform, 'osx_x64') }}:
114114
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
115-
- OSX.1200.Amd64.Open
115+
- OSX.13.Amd64.Open
116116
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
117-
- OSX.1200.Amd64
117+
- OSX.13.Amd64
118118

119119
# windows x64
120120
- ${{ if eq(parameters.platform, 'windows_x64') }}:

‎eng/pipelines/libraries/helix-queues-setup.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ jobs:
7373

7474
# OSX arm64
7575
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
76-
- OSX.1200.ARM64.Open
76+
- OSX.13.ARM64.Open
7777

7878
# OSX x64
7979
- ${{ if eq(parameters.platform, 'osx_x64') }}:
80-
- OSX.1200.Amd64.Open
80+
- OSX.13.Amd64.Open
8181

8282
# Android
8383
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:

‎src/coreclr/scripts/superpmi_collect_setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ def main(main_args):
465465
else:
466466
helix_queue = "Ubuntu.2204.Amd64"
467467
elif platform_name == "osx":
468-
helix_queue = "OSX.1200.ARM64" if arch == "arm64" else "OSX.1200.Amd64"
468+
helix_queue = "OSX.13.ARM64" if arch == "arm64" else "OSX.13.Amd64"
469469

470470
# Copy the superpmi scripts
471471

‎src/coreclr/tools/Common/TypeSystem/IL/UnsafeAccessors.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,12 @@ private static bool DoesMethodMatchUnsafeAccessorDeclaration(ref GenerationConte
318318
return false;
319319
}
320320

321+
// Validate generic parameter.
322+
if (declSig.GenericParameterCount != maybeSig.GenericParameterCount)
323+
{
324+
return false;
325+
}
326+
321327
// Validate argument count and return type
322328
if (context.Kind == UnsafeAccessorKind.Constructor)
323329
{

‎src/coreclr/vm/gcheaputilities.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,12 @@ HMODULE LoadStandaloneGc(LPCWSTR libFileName, LPCWSTR libFilePath)
186186
return nullptr;
187187
}
188188

189+
// The APP_CONTEXT_BASE_DIRECTORY is always set by the host. In cases
190+
// where the runtime is activated as a component, the base directory
191+
// will be an empty string. If the base directory is an empty string, skip it.
189192
SString appBase;
190-
if (HostInformation::GetProperty("APP_CONTEXT_BASE_DIRECTORY", appBase))
193+
if (HostInformation::GetProperty("APP_CONTEXT_BASE_DIRECTORY", appBase)
194+
&& u16_strlen(appBase.GetUnicode()) != 0)
191195
{
192196
PathString libPath = appBase.GetUnicode();
193197
libPath.Append(libFileName);

0 commit comments

Comments
 (0)