Skip to content

Commit 3e9ae8e

Browse files
wtgodbewtgodbe
authored
Merge pull request #26401 from dotnet-maestro-bot/merge/release/5.0-to-master
[automated] Merge branch 'release/5.0' => 'master'
2 parents dd7d777 + 6332c26 commit 3e9ae8e

File tree

132 files changed

+1474
-212
lines changed

Some content is hidden

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

132 files changed

+1474
-212
lines changed

‎eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@
225225
<GrpcAuthPackageVersion>2.32.0-pre1</GrpcAuthPackageVersion>
226226
<GrpcNetClientPackageVersion>2.32.0-pre1</GrpcNetClientPackageVersion>
227227
<GrpcToolsPackageVersion>2.32.0-pre1</GrpcToolsPackageVersion>
228-
<IdentityServer4AspNetIdentityPackageVersion>4.0.4</IdentityServer4AspNetIdentityPackageVersion>
229-
<IdentityServer4EntityFrameworkPackageVersion>4.0.4</IdentityServer4EntityFrameworkPackageVersion>
230-
<IdentityServer4PackageVersion>4.0.4</IdentityServer4PackageVersion>
231-
<IdentityServer4StoragePackageVersion>4.0.4</IdentityServer4StoragePackageVersion>
232-
<IdentityServer4EntityFrameworkStoragePackageVersion>4.0.4</IdentityServer4EntityFrameworkStoragePackageVersion>
228+
<IdentityServer4AspNetIdentityPackageVersion>4.1.0</IdentityServer4AspNetIdentityPackageVersion>
229+
<IdentityServer4EntityFrameworkPackageVersion>4.1.0</IdentityServer4EntityFrameworkPackageVersion>
230+
<IdentityServer4PackageVersion>4.1.0</IdentityServer4PackageVersion>
231+
<IdentityServer4StoragePackageVersion>4.1.0</IdentityServer4StoragePackageVersion>
232+
<IdentityServer4EntityFrameworkStoragePackageVersion>4.1.0</IdentityServer4EntityFrameworkStoragePackageVersion>
233233
<MessagePackPackageVersion>2.1.90</MessagePackPackageVersion>
234234
<MicrosoftIdentityWebPackageVersion>0.4.0-preview</MicrosoftIdentityWebPackageVersion>
235235
<MicrosoftIdentityWebMicrosoftGraphPackageVersion>0.4.0-preview</MicrosoftIdentityWebMicrosoftGraphPackageVersion>
@@ -248,7 +248,7 @@
248248
<SerilogSinksFilePackageVersion>4.0.0</SerilogSinksFilePackageVersion>
249249
<StackExchangeRedisPackageVersion>2.0.593</StackExchangeRedisPackageVersion>
250250
<SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion>
251-
<SwashbuckleAspNetCorePackageVersion>5.5.1</SwashbuckleAspNetCorePackageVersion>
251+
<SwashbuckleAspNetCorePackageVersion>5.6.3</SwashbuckleAspNetCorePackageVersion>
252252
<XunitAbstractionsPackageVersion>2.0.3</XunitAbstractionsPackageVersion>
253253
<XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
254254
<XunitVersion>2.4.1</XunitVersion>

‎src/Components/Web/src/Virtualization/Virtualize.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Diagnostics;
7+
using System.Globalization;
78
using System.Linq;
89
using System.Threading;
910
using System.Threading.Tasks;
@@ -246,7 +247,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
246247
}
247248

248249
private string GetSpacerStyle(int itemsInSpacer)
249-
=> $"height: {itemsInSpacer * _itemSize}px;";
250+
=> $"height: {(itemsInSpacer * _itemSize).ToString(CultureInfo.InvariantCulture)}px;";
250251

251252
void IVirtualizeJsCallbacks.OnBeforeSpacerVisible(float spacerSize, float spacerSeparation, float containerSize)
252253
{
@@ -367,7 +368,7 @@ private ValueTask<ItemsProviderResult<TItem>> DefaultItemsProvider(ItemsProvider
367368
private RenderFragment DefaultPlaceholder(PlaceholderContext context) => (builder) =>
368369
{
369370
builder.OpenElement(0, "div");
370-
builder.AddAttribute(1, "style", $"height: {_itemSize}px;");
371+
builder.AddAttribute(1, "style", $"height: {_itemSize.ToString(CultureInfo.InvariantCulture)}px;");
371372
builder.CloseElement();
372373
};
373374

‎src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</head>
77
<body>
88
<app>Loading...</app>
9+
<script src="seleniumworkaround.js"></script>
910
<script src="customJsFileForTests.js"></script>
1011
<script src="_framework/blazor.webassembly.js" autostart="false"></script>
1112

‎src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/seleniumworkaround.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
(function () {
2+
// Note: there are multiple copies of this file throughout the repo. If you're editing it, please look for
3+
// other seleniumworkaround.js files and keep them all in sync.
4+
const logs = [];
5+
6+
const defaultLog = console.log;
7+
console.log = function () {
8+
defaultLog.apply(console, arguments);
9+
logs.push(Array.from(arguments).join(' '));
10+
}
11+
12+
const defaultError = console.error;
13+
console.error = function () {
14+
defaultError.apply(console, arguments);
15+
logs.push(Array.from(arguments).join(' '));
16+
}
17+
18+
const defaultWarn = console.warn;
19+
console.warn = function () {
20+
defaultWarn.apply(console, arguments);
21+
logs.push(Array.from(arguments).join(' '));
22+
}
23+
24+
window.getBrowserLogs = () => logs;
25+
})();
26+

‎src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<a href="" class="reload">Reload</a>
1818
<a class="dismiss">🗙</a>
1919
</div>
20+
21+
<script src="seleniumworkaround.js"></script>
2022
<script src="_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js"></script>
2123
<script src="_framework/blazor.webassembly.js"></script>
2224
</body>

‎src/Components/WebAssembly/testassets/Wasm.Authentication.Client/wwwroot/seleniumworkaround.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
(function () {
2+
// Note: there are multiple copies of this file throughout the repo. If you're editing it, please look for
3+
// other seleniumworkaround.js files and keep them all in sync.
4+
const logs = [];
5+
6+
const defaultLog = console.log;
7+
console.log = function () {
8+
defaultLog.apply(console, arguments);
9+
logs.push(Array.from(arguments).join(' '));
10+
}
11+
12+
const defaultError = console.error;
13+
console.error = function () {
14+
defaultError.apply(console, arguments);
15+
logs.push(Array.from(arguments).join(' '));
16+
}
17+
18+
const defaultWarn = console.warn;
19+
console.warn = function () {
20+
defaultWarn.apply(console, arguments);
21+
logs.push(Array.from(arguments).join(' '));
22+
}
23+
24+
window.getBrowserLogs = () => logs;
25+
})();
26+

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ private void PerformReconnection()
6262
((IJavaScriptExecutor)Browser).ExecuteScript("Blazor._internal.forceCloseConnection()");
6363

6464
// Wait until the reconnection dialog has been shown but is now hidden
65-
new WebDriverWait(Browser, TimeSpan.FromSeconds(10))
66-
.Until(driver => driver.FindElement(By.Id("components-reconnect-modal"))?.GetCssValue("display") == "none");
65+
var reconnectModel = Browser.Exists(By.Id("components-reconnect-modal"));
66+
Browser.Equal("none", () => reconnectModel.GetCssValue("display"));
6767
}
6868
}
6969
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ public void DotNetExceptionDetailsAreNotLoggedByDefault()
4848
var interopButton = Browser.FindElement(By.Id("btn-interop"));
4949
interopButton.Click();
5050

51-
var wait = new WebDriverWait(Browser, TimeSpan.FromSeconds(10))
52-
.Until(d => d.FindElement(By.Id("done-with-interop")));
51+
Browser.Exists(By.Id("done-with-interop"));
5352

5453
foreach (var expectedValue in expectedValues)
5554
{

‎src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
using BasicTestApp;
65
using BasicTestApp.HttpClientTest;
76
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
87
using Microsoft.AspNetCore.E2ETesting;
98
using Microsoft.AspNetCore.Testing;
109
using OpenQA.Selenium;
11-
using OpenQA.Selenium.Support.UI;
1210
using TestServer;
1311
using Xunit;
1412
using Xunit.Abstractions;
@@ -61,9 +59,7 @@ private void IssueRequest(string relativeUri)
6159

6260
_appElement.FindElement(By.Id("send-request")).Click();
6361

64-
new WebDriverWait(Browser, TimeSpan.FromSeconds(30)).Until(
65-
driver => driver.FindElement(By.Id("response-status")) != null);
66-
_responseStatus = _appElement.FindElement(By.Id("response-status"));
62+
_responseStatus = Browser.Exists(By.Id("response-status"));
6763
_responseStatusText = _appElement.FindElement(By.Id("response-status-text"));
6864
_testOutcome = _appElement.FindElement(By.Id("test-outcome"));
6965
}

‎src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ private IReadOnlyCollection<string> GetAndClearRequestedPaths()
148148

149149
private void WaitUntilLoaded()
150150
{
151-
new WebDriverWait(Browser, TimeSpan.FromSeconds(30)).Until(
152-
driver => driver.FindElement(By.TagName("h1")).Text == "Hello, world!");
151+
var element = Browser.Exists(By.TagName("h1"));
152+
Browser.Equal("Hello, world!", () => element.Text);
153153
}
154154
}
155155
}

0 commit comments

Comments
 (0)