Skip to content

Commit 50ab112

Browse files
github-actions[bot]Mackinnon BuckJamesNK
authored and
captainsafia
committed
Update .NET SDK to 10.0.100-alpha.1.24609.2 (#59389)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Mackinnon Buck <mbuck@microsoft.com> Co-authored-by: James Newton-King <james@newtonking.com>
1 parent 13c46ce commit 50ab112

File tree

47 files changed

+723
-636
lines changed

Some content is hidden

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

47 files changed

+723
-636
lines changed

‎Directory.Build.targets

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,17 @@
172172
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
173173
</Target>
174174

175+
<!--
176+
Remove the implicit package reference for Microsoft.AspNetCore.App.Internal.Assets.
177+
Projects within the repo will consume framework assets by importing
178+
Microsoft.AspNetCore.App.Internal.Assets.targets directly
179+
-->
180+
<Target Name="_RemoveAspNetCoreAppInternalAssetsReference" AfterTargets="ProcessFrameworkReferences">
181+
<ItemGroup>
182+
<PackageReference Remove="Microsoft.AspNetCore.App.Internal.Assets" />
183+
</ItemGroup>
184+
</Target>
185+
175186
<Import Project="eng\Workarounds.targets" />
176187
<Import Project="artifacts\bin\GenerateFiles\Directory.Build.targets" Condition=" '$(MSBuildProjectName)' != 'GenerateFiles' " />
177188
<Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />

‎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-alpha.1.24573.1"
3+
"version": "10.0.100-alpha.1.24609.2"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-alpha.1.24573.1",
6+
"dotnet": "10.0.100-alpha.1.24609.2",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

‎src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void CanModifyHeadDuringAndAfterPrerendering()
4949

5050
// Check that head metadata can be changed after prerendering.
5151
Browser.Equal("Updated title 1", () => Browser.Title);
52-
Browser.Equal("Updated description 1", () => Browser.FindElement(By.Id("meta-description")).GetAttribute("content"));
52+
Browser.Equal("Updated description 1", () => Browser.FindElement(By.Id("meta-description")).GetDomAttribute("content"));
5353
}
5454

5555
private void BeginInteractivity()

‎src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void CanRenderMultipleRootComponents()
7070
Assert.Single(greets, "Hello Abraham");
7171
Assert.Equal(2, greets.Where(g => g == "Hello Blue fish").Count());
7272
Assert.Equal(3, greets.Where(g => string.Equals("Hello", g)).Count()); // 3 server prerendered without parameters
73-
var content = Browser.Exists(By.Id("test-container")).GetAttribute("innerHTML");
73+
var content = Browser.Exists(By.Id("test-container")).GetDomProperty("innerHTML");
7474
var markers = ReadMarkers(content);
7575
var componentSequence = markers.Select(m => m.Item1.PrerenderId != null).ToArray();
7676
var expectedComponentSequence = new bool[]

‎src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ public void CanUseJSInteropFromOnAfterRenderAsync()
5656

5757
// Prerendered output can't use JSInterop
5858
Browser.Equal("No value yet", () => Browser.Exists(By.Id("val-get-by-interop")).Text);
59-
Browser.Equal(string.Empty, () => Browser.Exists(By.Id("val-set-by-interop")).GetAttribute("value"));
59+
Browser.Equal(string.Empty, () => Browser.Exists(By.Id("val-set-by-interop")).GetDomProperty("value"));
6060

6161
BeginInteractivity();
6262

6363
// Once connected, we can
6464
Browser.Equal("Hello from interop call", () => Browser.Exists(By.Id("val-get-by-interop")).Text);
65-
Browser.Equal("Hello from interop call", () => Browser.Exists(By.Id("val-set-by-interop")).GetAttribute("value"));
65+
Browser.Equal("Hello from interop call", () => Browser.Exists(By.Id("val-set-by-interop")).GetDomProperty("value"));
6666
}
6767

6868
[Fact]

‎src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void CanScrollToHashWithoutPerformingFullNavigation()
182182
Browser.True(() => Browser.GetScrollY() > 500);
183183
Browser.True(() => Browser
184184
.Exists(By.Id("uri-on-page-load"))
185-
.GetAttribute("data-value")
185+
.GetDomAttribute("data-value")
186186
.EndsWith("scroll-to-hash", StringComparison.Ordinal));
187187
}
188188

‎src/Components/test/E2ETest/ServerRenderingTests/FocusOnNavigateTest.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ public override Task InitializeAsync()
2929
public void FocusIsMoved_AfterInitialPageLoad_WhenNoElementHasFocus()
3030
{
3131
Navigate($"{ServerPathBase}/focus-on-navigate/static");
32-
Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("data-focus-on-navigate") is not null);
32+
Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("data-focus-on-navigate") is not null);
3333
}
3434

3535
[Fact]
3636
public void FocusIsPreserved_AfterInitialPageLoad_WhenAnyElementHasFocus()
3737
{
3838
Navigate($"{ServerPathBase}/focus-on-navigate/static-with-other-focused-element");
39-
Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("data-focus-on-load") is not null);
39+
Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("data-focus-on-load") is not null);
4040
}
4141

4242
[Fact]
4343
public void FocusIsPreserved_AfterInitialPageLoad_WhenAutofocusedElementIsPresent()
4444
{
4545
Navigate($"{ServerPathBase}/focus-on-navigate/autofocus");
46-
Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("autofocus") is not null);
46+
Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("autofocus") is not null);
4747
}
4848

4949
[Fact]
@@ -59,19 +59,19 @@ public void FocusIsMoved_OnEnhancedNavigation_WhenAnyElementMatchesSelector()
5959
{
6060
Navigate($"{ServerPathBase}/focus-on-navigate");
6161
Browser.Click(By.LinkText("Statically rendered"));
62-
Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("data-focus-on-navigate") is not null);
62+
Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("data-focus-on-navigate") is not null);
6363
}
6464

6565
[Fact]
6666
public void FocusIsPreserved_OnEnhancedFormPost_WhenAnyElementMatchesSelector()
6767
{
6868
Navigate($"{ServerPathBase}/focus-on-navigate");
6969
Browser.Click(By.LinkText("Form submission"));
70-
Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("id") == "value-to-submit");
70+
Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("id") == "value-to-submit");
7171
Browser.FindElement(By.Id("value-to-submit")).ReplaceText("Some value");
7272
Browser.Click(By.Id("submit-button"));
7373
Browser.Equal("Some value", () => Browser.FindElement(By.Id("submitted-value")).Text);
74-
Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("id") == "submit-button");
74+
Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("id") == "submit-button");
7575
}
7676

7777
[Fact]
@@ -87,7 +87,7 @@ public void FocusIsMoved_AfterStreaming_WhenElementMatchesSelector()
8787
tcs.SetResult();
8888

8989
Browser.Equal("Complete", () => Browser.FindElement(By.Id("streaming-status")).Text);
90-
Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("data-focus-on-navigate") is not null);
90+
Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("data-focus-on-navigate") is not null);
9191
}
9292

9393
[Fact]
@@ -101,11 +101,11 @@ public void FocusIsPreserved_AfterStreaming_WhenElementMatchesSelector()
101101
Browser.True(() => Browser.SwitchTo().ActiveElement().TagName == "body");
102102

103103
Browser.Click(By.Id("focusable-input"));
104-
Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("id") == "focusable-input");
104+
Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("id") == "focusable-input");
105105

106106
tcs.SetResult();
107107

108108
Browser.Equal("Complete", () => Browser.FindElement(By.Id("streaming-status")).Text);
109-
Browser.True(() => Browser.SwitchTo().ActiveElement().GetAttribute("id") == "focusable-input");
109+
Browser.True(() => Browser.SwitchTo().ActiveElement().GetDomAttribute("id") == "focusable-input");
110110
}
111111
}

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void DataAnnotationsWorkForForms(bool suppressEnhancedNavigation)
107107
{
108108
var error = Assert.Single(errors);
109109
Assert.Equal("Name is too long", error.Text);
110-
Assert.Equal("John", Browser.FindElement(By.CssSelector("input[name='Parameter.FirstName']")).GetAttribute("value"));
110+
Assert.Equal("John", Browser.FindElement(By.CssSelector("input[name='Parameter.FirstName']")).GetDomProperty("value"));
111111
},
112112
};
113113
DispatchToFormCore(dispatchToForm);
@@ -150,7 +150,7 @@ public void MultipleParametersMultipleFormsDoNotConflict(bool suppressEnhancedNa
150150
{
151151
var error = Assert.Single(errors);
152152
Assert.Equal("The value 'abc' is not valid for 'Id'.", error.Text);
153-
Assert.Equal("abc", Browser.FindElement(By.CssSelector("form[name=bind-integer] input[name=Id]")).GetAttribute("value"));
153+
Assert.Equal("abc", Browser.FindElement(By.CssSelector("form[name=bind-integer] input[name=Id]")).GetDomProperty("value"));
154154
},
155155
SuppressEnhancedNavigation = suppressEnhancedNavigation,
156156
};
@@ -265,8 +265,8 @@ public void CanDisplayErrorsFromMultipleParametersToTheDefaultForm(bool suppress
265265
{
266266
Assert.Equal("The value 'invalid' is not valid for 'OtherParameter'.", error.Text);
267267
});
268-
Assert.Equal("abcd", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetAttribute("value"));
269-
Assert.Equal("invalid", Browser.FindElement(By.CssSelector("input[name=OtherParameter]")).GetAttribute("value"));
268+
Assert.Equal("abcd", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetDomProperty("value"));
269+
Assert.Equal("invalid", Browser.FindElement(By.CssSelector("input[name=OtherParameter]")).GetDomProperty("value"));
270270
},
271271
SuppressEnhancedNavigation = suppressEnhancedNavigation,
272272
};
@@ -294,7 +294,7 @@ public void CanHandleBindingErrorsBindParameterToTheDefaultForm(bool suppressEnh
294294
{
295295
Assert.Equal("The value 'abc' is not valid for 'Parameter'.", error.Text);
296296
});
297-
Assert.Equal("abc", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetAttribute("value"));
297+
Assert.Equal("abc", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetDomProperty("value"));
298298
}
299299
};
300300
DispatchToFormCore(dispatchToForm);
@@ -331,7 +331,7 @@ public void CanBindComplexTypeToDefaultForm(bool suppressEnhancedNavigation)
331331
{
332332
// Verify the same form element is still in the page
333333
// We wouldn't be allowed to read the attribute if the element is stale
334-
Assert.NotEmpty(form.GetAttribute("action"));
334+
Assert.NotEmpty(form.GetDomAttribute("action"));
335335
}
336336
}
337337

@@ -388,7 +388,7 @@ public void CanBreakFormIntoMultipleComponents(bool suppressEnhancedNavigation)
388388
{
389389
// Verify the same form element is still in the page
390390
// We wouldn't be allowed to read the attribute if the element is stale
391-
Assert.NotEmpty(form.GetAttribute("action"));
391+
Assert.NotEmpty(form.GetDomAttribute("action"));
392392
}
393393
}
394394

@@ -439,7 +439,7 @@ public void CanBreakFormIntoMultipleComponentsDisplaysErrorsCorrectly(bool suppr
439439
{
440440
// Verify the same form element is still in the page
441441
// We wouldn't be allowed to read the attribute if the element is stale
442-
Assert.NotEmpty(form.GetAttribute("action"));
442+
Assert.NotEmpty(form.GetDomAttribute("action"));
443443
}
444444
}
445445

@@ -477,7 +477,7 @@ public void CanDisplayBindingErrorsComplexTypeToDefaultForm(bool suppressEnhance
477477
{
478478
// Verify the same form element is still in the page
479479
// We wouldn't be allowed to read the attribute if the element is stale
480-
Assert.NotEmpty(form.GetAttribute("action"));
480+
Assert.NotEmpty(form.GetDomAttribute("action"));
481481
}
482482
}
483483

@@ -512,7 +512,7 @@ public void CanBindDictionaryToDefaultForm(bool suppressEnhancedNavigation)
512512
{
513513
// Verify the same form element is still in the page
514514
// We wouldn't be allowed to read the attribute if the element is stale
515-
Assert.NotEmpty(form.GetAttribute("action"));
515+
Assert.NotEmpty(form.GetDomAttribute("action"));
516516
}
517517
}
518518

@@ -551,7 +551,7 @@ public void CanDisplayBindingErrorsDictionaryToDefaultForm(bool suppressEnhanced
551551
{
552552
// Verify the same form element is still in the page
553553
// We wouldn't be allowed to read the attribute if the element is stale
554-
Assert.NotEmpty(form.GetAttribute("action"));
554+
Assert.NotEmpty(form.GetDomAttribute("action"));
555555
}
556556
}
557557

@@ -595,7 +595,7 @@ public void CanBindCollectionsToDefaultForm(bool suppressEnhancedNavigation)
595595
{
596596
// Verify the same form element is still in the page
597597
// We wouldn't be allowed to read the attribute if the element is stale
598-
Assert.NotEmpty(form.GetAttribute("action"));
598+
Assert.NotEmpty(form.GetDomAttribute("action"));
599599
}
600600
}
601601

@@ -644,7 +644,7 @@ public void CanDisplayBindingErrorsCollectionsToDefaultForm(bool suppressEnhance
644644
{
645645
// Verify the same form element is still in the page
646646
// We wouldn't be allowed to read the attribute if the element is stale
647-
Assert.NotEmpty(form.GetAttribute("action"));
647+
Assert.NotEmpty(form.GetDomAttribute("action"));
648648
}
649649
}
650650

@@ -670,7 +670,7 @@ public void CanHandleBindingErrorsBindParameterToNamedForm(bool suppressEnhanced
670670
{
671671
Assert.Equal("The value 'abc' is not valid for 'Parameter'.", error.Text);
672672
});
673-
Assert.Equal("abc", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetAttribute("value"));
673+
Assert.Equal("abc", Browser.FindElement(By.CssSelector("input[name=Parameter]")).GetDomProperty("value"));
674674
}
675675
};
676676
DispatchToFormCore(dispatchToForm);
@@ -977,14 +977,14 @@ public void CanUsePlainForm(bool suppressEnhancedNavigation)
977977
Browser.Exists(By.Id("send")).Click();
978978
Browser.Exists(By.Id("pass"));
979979

980-
Browser.Equal("StringViaExplicitPropertyName value", () => Browser.Exists(By.CssSelector("#StringViaExplicitPropertyName input")).GetAttribute("value"));
981-
Browser.Equal("StringViaOverriddenName value", () => Browser.Exists(By.CssSelector("#StringViaOverriddenName input")).GetAttribute("value"));
982-
Browser.Equal(/* should not match */ "", () => Browser.Exists(By.CssSelector("#StringViaOverriddenNameUnmatched input")).GetAttribute("value"));
983-
Browser.Equal("StringViaExpression value", () => Browser.Exists(By.CssSelector("#StringViaExpression input")).GetAttribute("value"));
984-
Browser.Equal("StringViaExpressionWithHandler value", () => Browser.Exists(By.CssSelector("#StringViaExpressionWithHandler input")).GetAttribute("value"));
985-
Browser.Equal(/* should not match */ "", () => Browser.Exists(By.CssSelector("#StringViaExpressionWithUnmatchedHandler input")).GetAttribute("value"));
986-
Browser.Equal("PersonName value", () => Browser.Exists(By.CssSelector("#PersonName input")).GetAttribute("value"));
987-
Browser.Equal("123", () => Browser.Exists(By.CssSelector("#PersonAge input")).GetAttribute("value"));
980+
Browser.Equal("StringViaExplicitPropertyName value", () => Browser.Exists(By.CssSelector("#StringViaExplicitPropertyName input")).GetDomProperty("value"));
981+
Browser.Equal("StringViaOverriddenName value", () => Browser.Exists(By.CssSelector("#StringViaOverriddenName input")).GetDomProperty("value"));
982+
Browser.Equal(/* should not match */ "", () => Browser.Exists(By.CssSelector("#StringViaOverriddenNameUnmatched input")).GetDomProperty("value"));
983+
Browser.Equal("StringViaExpression value", () => Browser.Exists(By.CssSelector("#StringViaExpression input")).GetDomProperty("value"));
984+
Browser.Equal("StringViaExpressionWithHandler value", () => Browser.Exists(By.CssSelector("#StringViaExpressionWithHandler input")).GetDomProperty("value"));
985+
Browser.Equal(/* should not match */ "", () => Browser.Exists(By.CssSelector("#StringViaExpressionWithUnmatchedHandler input")).GetDomProperty("value"));
986+
Browser.Equal("PersonName value", () => Browser.Exists(By.CssSelector("#PersonName input")).GetDomProperty("value"));
987+
Browser.Equal("123", () => Browser.Exists(By.CssSelector("#PersonAge input")).GetDomProperty("value"));
988988
}
989989

990990
[Fact]
@@ -1159,15 +1159,15 @@ public void CanMutateDataSuppliedFromForm(bool suppressEnhancedNavigation)
11591159
// Remember that the rendercount would be reset to zero since this is SSR, so
11601160
// receiving 2 here shows we did render twice on this cycle
11611161
Browser.Exists(By.Id("mutate-and-notify")).Click();
1162-
Browser.Equal("Abc Modified", () => Browser.Exists(By.Id("simple-value")).GetAttribute("value"));
1163-
Browser.Equal("Def Modified", () => Browser.Exists(By.Id("complex-value")).GetAttribute("value"));
1162+
Browser.Equal("Abc Modified", () => Browser.Exists(By.Id("simple-value")).GetDomProperty("value"));
1163+
Browser.Equal("Def Modified", () => Browser.Exists(By.Id("complex-value")).GetDomProperty("value"));
11641164
Browser.Equal("2", () => Browser.Exists(By.Id("render-count")).Text);
11651165
Browser.Exists(By.Id("received-notification"));
11661166

11671167
// Can perform a submit that replaces the received object entirely
11681168
Browser.Exists(By.Id("clear-and-notify")).Click();
1169-
Browser.Equal("", () => Browser.Exists(By.Id("simple-value")).GetAttribute("value"));
1170-
Browser.Equal("", () => Browser.Exists(By.Id("complex-value")).GetAttribute("value"));
1169+
Browser.Equal("", () => Browser.Exists(By.Id("simple-value")).GetDomProperty("value"));
1170+
Browser.Equal("", () => Browser.Exists(By.Id("complex-value")).GetDomProperty("value"));
11711171
Browser.Equal("2", () => Browser.Exists(By.Id("render-count")).Text);
11721172
Browser.Exists(By.Id("received-notification"));
11731173
}
@@ -1495,14 +1495,14 @@ public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry
14951495

14961496
// Submit the form
14971497
Browser.FindElement(By.Id("some-text")).SendKeys("test string");
1498-
Browser.Equal("test string", () => Browser.FindElement(By.Id("some-text")).GetAttribute("value"));
1498+
Browser.Equal("test string", () => Browser.FindElement(By.Id("some-text")).GetDomProperty("value"));
14991499
Browser.Exists(By.Id("submit-button")).Click();
15001500

15011501
// Wait for the async/streaming process to complete. We know this happened
15021502
// if the loading indicator says we're done, and the textbox was cleared
15031503
// due to the refresh
15041504
Browser.Equal("False", () => Browser.FindElement(By.Id("loading-indicator")).Text);
1505-
Browser.Equal("", () => Browser.FindElement(By.Id("some-text")).GetAttribute("value"));
1505+
Browser.Equal("", () => Browser.FindElement(By.Id("some-text")).GetDomProperty("value"));
15061506

15071507
// Checking that the history entry was not pushed
15081508
Browser.Navigate().Back();
@@ -1532,7 +1532,7 @@ private void DispatchToFormCore(DispatchToForm dispatch)
15321532
if (dispatch.ExpectedHandlerValue != null)
15331533
{
15341534
var handlerInput = form.FindElement(By.CssSelector("input[type=hidden][name=_handler]"));
1535-
Assert.Equal(dispatch.ExpectedHandlerValue, handlerInput.GetAttribute("value"));
1535+
Assert.Equal(dispatch.ExpectedHandlerValue, handlerInput.GetDomProperty("value"));
15361536
}
15371537

15381538
if (!dispatch.DispatchEvent)
@@ -1598,7 +1598,7 @@ private void DispatchToFormCore(DispatchToForm dispatch)
15981598
{
15991599
// Verify the same form element is still in the page
16001600
// We wouldn't be allowed to read the attribute if the element is stale
1601-
Assert.Equal("post", form.GetAttribute("method"));
1601+
Assert.Equal("post", form.GetDomAttribute("method"), ignoreCase: true);
16021602
}
16031603
}
16041604
}

0 commit comments

Comments
 (0)