Skip to content

Commit 9742b3d

Browse files
authored
Merge branch 'release/8.0' into internal-merge-8.0-2025-07-08-1424
2 parents 5bbd508 + 906ea61 commit 9742b3d

File tree

5 files changed

+24
-19
lines changed

5 files changed

+24
-19
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@
338338
<Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
339339
<SourceBuild RepoName="xdt" ManagedOnly="true" />
340340
</Dependency>
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25269.2">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25316.2">
342342
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
343-
<Sha>cee2d057118e3ad3c58a72a23271ad88b87d4d4d</Sha>
343+
<Sha>3827e68e002064268d4be4b2d1d96048f9794808</Sha>
344344
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
345345
</Dependency>
346346
<!-- Not updated automatically -->
@@ -376,26 +376,26 @@
376376
<Uri>https://github.com/dotnet/winforms</Uri>
377377
<Sha>abda8e3bfa78319363526b5a5f86863ec979940e</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25263.4">
379+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
380380
<Uri>https://github.com/dotnet/arcade</Uri>
381-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
381+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
382382
<SourceBuild RepoName="arcade" ManagedOnly="true" />
383383
</Dependency>
384-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25263.4">
384+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25310.3">
385385
<Uri>https://github.com/dotnet/arcade</Uri>
386-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
386+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
387387
</Dependency>
388-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25263.4">
388+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25310.3">
389389
<Uri>https://github.com/dotnet/arcade</Uri>
390-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
390+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
391391
</Dependency>
392-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25263.4">
392+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25310.3">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
394+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
395395
</Dependency>
396-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25263.4">
396+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25310.3">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
398+
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
399399
</Dependency>
400400
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="8.1.0-preview.23604.1">
401401
<Uri>https://github.com/dotnet/extensions</Uri>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@
162162
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
163163
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
164164
<!-- Packages from dotnet/arcade -->
165-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25263.4</MicrosoftDotNetBuildTasksInstallersVersion>
166-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25263.4</MicrosoftDotNetBuildTasksTemplatingVersion>
167-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25263.4</MicrosoftDotNetRemoteExecutorVersion>
165+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksInstallersVersion>
166+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksTemplatingVersion>
167+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25310.3</MicrosoftDotNetRemoteExecutorVersion>
168168
<!-- Packages from dotnet/source-build-externals -->
169169
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.25202.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
170170
<!-- Packages from dotnet/source-build-reference-packages -->
171-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.25269.2</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
171+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.25316.2</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
172172
<!-- Packages from dotnet/symreader -->
173173
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesymreaderVersion>
174174
<!-- Packages from dotnet/runtime -->

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.22.19",
28-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.4",
29-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25263.4"
28+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
29+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3"
3030
},
3131
"native-tools": {
3232
"jdk": "latest"

src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public RedisEndToEndTests(RedisServerFixture<Startup> serverFixture)
3535
[ConditionalTheory]
3636
[SkipIfDockerNotPresent]
3737
[MemberData(nameof(TransportTypesAndProtocolTypes))]
38+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
3839
public async Task HubConnectionCanSendAndReceiveMessages(HttpTransportType transportType, string protocolName)
3940
{
4041
using (StartVerifiableLog())
@@ -55,6 +56,7 @@ public async Task HubConnectionCanSendAndReceiveMessages(HttpTransportType trans
5556
[ConditionalTheory]
5657
[SkipIfDockerNotPresent]
5758
[MemberData(nameof(TransportTypesAndProtocolTypes))]
59+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
5860
public async Task HubConnectionCanSendAndReceiveGroupMessages(HttpTransportType transportType, string protocolName)
5961
{
6062
using (StartVerifiableLog())
@@ -116,6 +118,7 @@ public async Task CanSendAndReceiveUserMessagesFromMultipleConnectionsWithSameUs
116118
[ConditionalTheory]
117119
[SkipIfDockerNotPresent]
118120
[MemberData(nameof(TransportTypesAndProtocolTypes))]
121+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
119122
public async Task CanSendAndReceiveUserMessagesWhenOneConnectionWithUserDisconnects(HttpTransportType transportType, string protocolName)
120123
{
121124
// Regression test:
@@ -145,6 +148,7 @@ public async Task CanSendAndReceiveUserMessagesWhenOneConnectionWithUserDisconne
145148
[ConditionalTheory]
146149
[SkipIfDockerNotPresent]
147150
[MemberData(nameof(TransportTypesAndProtocolTypes))]
151+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
148152
public async Task HubConnectionCanSendAndReceiveGroupMessagesGroupNameWithPatternIsTreatedAsLiteral(HttpTransportType transportType, string protocolName)
149153
{
150154
using (StartVerifiableLog())
@@ -213,6 +217,7 @@ public async Task CanSendAndReceiveUserMessagesUserNameWithPatternIsTreatedAsLit
213217
[SkipIfDockerNotPresent]
214218
[InlineData("messagepack")]
215219
[InlineData("json")]
220+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")]
216221
public async Task StatefulReconnectPreservesMessageFromOtherServer(string protocolName)
217222
{
218223
using (StartVerifiableLog())

0 commit comments

Comments
 (0)