Skip to content

Commit aa1b149

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix-45654
2 parents 2c380ea + eecefd0 commit aa1b149

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,9 @@
343343
<Sha>1156b9aac00609107c21cf3458b797c76db6be7a</Sha>
344344
<SourceBuild RepoName="xdt" ManagedOnly="true" />
345345
</Dependency>
346-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.616001">
346+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.616401">
347347
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
348-
<Sha>8f9f6fa14523b2f2475ea0a86be1cf60b5de5336</Sha>
348+
<Sha>c3d4c372a15c2de79a2f26fe2b6b3644996d8550</Sha>
349349
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
350350
</Dependency>
351351
<!-- Not updated automatically -->

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
<!-- Packages from dotnet/source-build-externals -->
175175
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.615601</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
176176
<!-- Packages from dotnet/source-build-reference-packages -->
177-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>10.0.616001</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
177+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>10.0.616401</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
178178
<!-- Packages from dotnet/symreader -->
179179
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.2.0-beta.25124.1</MicrosoftSourceBuildIntermediatesymreaderVersion>
180180
<!-- Packages from dotnet/xdt -->

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.3.25125.5"
3+
"version": "10.0.100-preview.3.25167.4"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-preview.3.25125.5",
6+
"dotnet": "10.0.100-preview.3.25167.4",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,6 @@ void AssertUiState(string expectedStringValue, bool expectedBoolValue)
13621362
}
13631363

13641364
[Fact]
1365-
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60873")]
13661365
public void RadioButtonGetsResetAfterSubmittingEnhancedForm()
13671366
{
13681367
GoTo("forms/form-with-checkbox-and-radio-button");
@@ -1378,8 +1377,8 @@ public void RadioButtonGetsResetAfterSubmittingEnhancedForm()
13781377

13791378
Browser.Exists(By.Id("submit-button")).Click();
13801379

1381-
Assert.False(Browser.Exists(By.Id("checkbox")).Selected);
1382-
Assert.False(Browser.Exists(By.Id("radio-button")).Selected);
1380+
WaitAssert.False(Browser, () => Browser.Exists(By.Id("checkbox")).Selected);
1381+
WaitAssert.False(Browser, () => Browser.Exists(By.Id("radio-button")).Selected);
13831382
}
13841383

13851384
[Fact]

0 commit comments

Comments
 (0)