Skip to content

Commit 726e36c

Browse files
authored
Merge branch 'main' into ossl3-hmac
2 parents a5f05ed + cab811a commit 726e36c

19 files changed

Lines changed: 2827 additions & 344 deletions

File tree

.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": "11.0.0-prerelease.26174.1",
18+
"version": "11.0.0-prerelease.26204.1",
1919
"commands": [
2020
"xharness"
2121
]

eng/Version.Details.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ This file should be imported by eng/Versions.props
111111
<SystemTextRegularExpressionsTestDataPackageVersion>11.0.0-beta.26180.1</SystemTextRegularExpressionsTestDataPackageVersion>
112112
<SystemWindowsExtensionsTestDataPackageVersion>11.0.0-beta.26180.1</SystemWindowsExtensionsTestDataPackageVersion>
113113
<!-- dotnet-xharness dependencies -->
114-
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.26174.1</MicrosoftDotNetXHarnessCLIPackageVersion>
115-
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>11.0.0-prerelease.26174.1</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
116-
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>11.0.0-prerelease.26174.1</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
114+
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.26204.1</MicrosoftDotNetXHarnessCLIPackageVersion>
115+
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>11.0.0-prerelease.26204.1</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
116+
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>11.0.0-prerelease.26204.1</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
117117
</PropertyGroup>
118118
<!--Property group for alternate package version names-->
119119
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,17 +287,17 @@
287287
<Uri>https://github.com/dotnet/dotnet</Uri>
288288
<Sha>5bed4499b04cbbaec57ac4209ae993acca3648cc</Sha>
289289
</Dependency>
290-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="11.0.0-prerelease.26174.1">
290+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="11.0.0-prerelease.26204.1">
291291
<Uri>https://github.com/dotnet/xharness</Uri>
292-
<Sha>e5857fbbc3f1d39d2776af5a5e3235c9ff485afa</Sha>
292+
<Sha>0668c80ec27851f3c7f1b3e4536110a1d39af587</Sha>
293293
</Dependency>
294-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="11.0.0-prerelease.26174.1">
294+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="11.0.0-prerelease.26204.1">
295295
<Uri>https://github.com/dotnet/xharness</Uri>
296-
<Sha>e5857fbbc3f1d39d2776af5a5e3235c9ff485afa</Sha>
296+
<Sha>0668c80ec27851f3c7f1b3e4536110a1d39af587</Sha>
297297
</Dependency>
298-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="11.0.0-prerelease.26174.1">
298+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="11.0.0-prerelease.26204.1">
299299
<Uri>https://github.com/dotnet/xharness</Uri>
300-
<Sha>e5857fbbc3f1d39d2776af5a5e3235c9ff485afa</Sha>
300+
<Sha>0668c80ec27851f3c7f1b3e4536110a1d39af587</Sha>
301301
</Dependency>
302302
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="11.0.0-beta.26210.111">
303303
<Uri>https://github.com/dotnet/dotnet</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<!-- Docs -->
167167
<MicrosoftPrivateIntellisenseVersion>10.0.0-preview-20251006.1</MicrosoftPrivateIntellisenseVersion>
168168
<!-- MsQuic -->
169-
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.16</MicrosoftNativeQuicMsQuicSchannelVersion>
169+
<MicrosoftNativeQuicMsQuicSchannelVersion>2.5.7</MicrosoftNativeQuicMsQuicSchannelVersion>
170170
<!-- emscripten workload package when testing workloads -->
171171
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftDotNetApiCompatTaskPackageVersion)</MicrosoftNETRuntimeEmscriptenVersion>
172172
<EmsdkPackageVersion>10.0.0</EmsdkPackageVersion>

src/coreclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/AsyncHelpers.CoreCLR.cs

Lines changed: 389 additions & 106 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)