Skip to content

Commit f432909

Browse files
wtgodbewtgodbe
authored
Merge branch 'release/9.0' into internal-merge-9.0-2025-07-08-1439
2 parents 52895e9 + 3444eab commit f432909

File tree

7 files changed

+37
-25
lines changed

7 files changed

+37
-25
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,39 @@
388388
<Uri>https://github.com/dotnet/winforms</Uri>
389389
<Sha>9b822fd70005bf5632d12fe76811b97b3dd044e4</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
393+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25302.2">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25325.4">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
398+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25302.2">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25325.4">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
403+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25302.2">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25325.4">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
407+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25302.2">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25325.4">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
411+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25302.2">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25325.4">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
415+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.7.0-preview.1.25306.2">
417+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.8.0-preview.1.25354.1">
418418
<Uri>https://github.com/dotnet/extensions</Uri>
419-
<Sha>04bd58871e6dd4dfd2fbcf5f0365c89d2466fffe</Sha>
419+
<Sha>f9c61b4a372e372b9a11914a7dbdbdca59a912fe</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.7.0-preview.1.25306.2">
421+
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.8.0-preview.1.25354.1">
422422
<Uri>https://github.com/dotnet/extensions</Uri>
423-
<Sha>04bd58871e6dd4dfd2fbcf5f0365c89d2466fffe</Sha>
423+
<Sha>f9c61b4a372e372b9a11914a7dbdbdca59a912fe</Sha>
424424
</Dependency>
425425
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
426426
<Uri>https://github.com/nuget/nuget.client</Uri>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@
143143
<SystemIOHashingVersion>9.0.7</SystemIOHashingVersion>
144144
<SystemRuntimeCachingVersion>9.0.7</SystemRuntimeCachingVersion>
145145
<!-- Packages from dotnet/extensions -->
146-
<MicrosoftExtensionsDiagnosticsTestingVersion>9.7.0-preview.1.25306.2</MicrosoftExtensionsDiagnosticsTestingVersion>
147-
<MicrosoftExtensionsTimeProviderTestingVersion>9.7.0-preview.1.25306.2</MicrosoftExtensionsTimeProviderTestingVersion>
146+
<MicrosoftExtensionsDiagnosticsTestingVersion>9.8.0-preview.1.25354.1</MicrosoftExtensionsDiagnosticsTestingVersion>
147+
<MicrosoftExtensionsTimeProviderTestingVersion>9.8.0-preview.1.25354.1</MicrosoftExtensionsTimeProviderTestingVersion>
148148
<!-- Packages from dotnet/efcore -->
149149
<dotnetefVersion>9.0.7</dotnetefVersion>
150150
<MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.7</MicrosoftEntityFrameworkCoreInMemoryVersion>
@@ -166,10 +166,10 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25302.2</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25302.2</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksInstallersVersion>
170+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksTemplatingVersion>
171+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25325.4</MicrosoftDotNetRemoteExecutorVersion>
172+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25325.4</MicrosoftSourceBuildIntermediatearcadeVersion>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24575.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/core-templates/job/job.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jobs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139+
${{ else }}:
140+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137141
env:
138142
TeamName: $(_TeamName)
139143
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

‎eng/common/internal/NuGet.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<clear />
55
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
66
</packageSources>
7+
<packageSourceMapping>
8+
<clear />
9+
</packageSourceMapping>
710
</configuration>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4"
3232
}
3333
}

‎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())

‎src/submodules/googletest‎

0 commit comments

Comments
 (0)