Skip to content

Commit 853112e

Browse files
authored
Merge pull request #39923 from vseanreesermsft/branding-5.0.15-2022-02-01-1227
Update branding to 5.0.15
2 parents 68dde4f + e27e594 commit 853112e

File tree

5 files changed

+102
-117
lines changed

5 files changed

+102
-117
lines changed

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>14</AspNetCorePatchVersion>
12-
<ValidateBaseline>true</ValidateBaseline>
11+
<AspNetCorePatchVersion>15</AspNetCorePatchVersion>
12+
<ValidateBaseline>false</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->

src/Security/Authentication/test/CertificateTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public async Task VerifyClientCertWithUntrustedRootAndTrustedChainEndsUpInForbid
306306
Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
307307
}
308308

309-
[Fact]
309+
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/39669")]
310310
public async Task VerifyValidClientCertWithTrustedChainAuthenticates()
311311
{
312312
using var host = await CreateHost(

src/SignalR/clients/ts/FunctionalTests/EchoConnectionHandler.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,13 @@
44
using System.Buffers;
55
using System.Threading.Tasks;
66
using Microsoft.AspNetCore.Connections;
7-
using Microsoft.AspNetCore.Http.Connections;
87

98
namespace FunctionalTests
109
{
1110
public class EchoConnectionHandler : ConnectionHandler
1211
{
1312
public async override Task OnConnectedAsync(ConnectionContext connection)
1413
{
15-
var context = connection.GetHttpContext();
16-
// The 'withCredentials' tests wont send a cookie for cross-site requests
17-
if (!context.WebSockets.IsWebSocketRequest && !context.Request.Cookies.ContainsKey("testCookie"))
18-
{
19-
return;
20-
}
21-
2214
while (true)
2315
{
2416
var result = await connection.Transport.Input.ReadAsync();

src/SignalR/clients/ts/FunctionalTests/ts/ConnectionTests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ describe("connection", () => {
176176
withCredentials: false,
177177
});
178178

179-
connection.onreceive = (data: any) => {
180-
fail(new Error(`Unexpected messaged received '${data}'.`));
179+
connection.onreceive = (_: any) => {
180+
connection.stop();
181181
};
182182

183183
// @ts-ignore: We don't use the error parameter intentionally.

0 commit comments

Comments
 (0)