Skip to content

Commit 619a992

Browse files
author
msftbot[bot]
authored
Merge pull request #26500 from dotnet-maestro-bot/merge/release/5.0-to-master
[automated] Merge branch 'release/5.0' => 'master'
2 parents b394a87 + e90bd88 commit 619a992

File tree

8 files changed

+120
-7
lines changed

8 files changed

+120
-7
lines changed

‎src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,56 @@
2424
<?endif?>
2525
<?endif?>
2626

27+
<!-- Ensure upgrades from 3.1.0 thru 3.1.9 for x64. -->
28+
<?if $(var.MajorVersion)=3 and $(var.MinorVersion)=1?>
29+
<?if $(var.Platform)=x64?>
30+
<!--'Microsoft ASP.NET Core 3.1.9 - Shared Framework'-->
31+
<RelatedBundle Action="Upgrade" Id="{9BD9F5C9-7DE4-3A3C-AB10-29B30D48CB39}"/>
32+
<!--'Microsoft ASP.NET Core 3.1.8 - Shared Framework'-->
33+
<RelatedBundle Action="Upgrade" Id="{BA264433-7668-3F63-BA27-0B842B591B41}"/>
34+
<!--'Microsoft ASP.NET Core 3.1.7 - Shared Framework'-->
35+
<RelatedBundle Action="Upgrade" Id="{E843D8AB-9AE4-3BBA-B417-E920A145D4D2}"/>
36+
<!--'Microsoft ASP.NET Core 3.1.6 - Shared Framework'-->
37+
<RelatedBundle Action="Upgrade" Id="{598E3E3B-DFA5-3F58-B2CF-EA59B0CD04E6}"/>
38+
<!--'Microsoft ASP.NET Core 3.1.5 - Shared Framework'-->
39+
<RelatedBundle Action="Upgrade" Id="{C2718AD8-4EC1-300D-A871-E98A1AC69180}"/>
40+
<!--'Microsoft ASP.NET Core 3.1.4 - Shared Framework'-->
41+
<RelatedBundle Action="Upgrade" Id="{F6D32B6E-2736-3FCC-B0F8-CB4C5AF95B2E}"/>
42+
<!--'Microsoft ASP.NET Core 3.1.3 - Shared Framework'-->
43+
<RelatedBundle Action="Upgrade" Id="{33468842-C5B0-3189-96D7-8CD8D28585B9}"/>
44+
<!--'Microsoft ASP.NET Core 3.1.2 - Shared Framework'-->
45+
<RelatedBundle Action="Upgrade" Id="{54EE87B3-B909-37F1-85AD-EE2296ABD2F1}"/>
46+
<!--'Microsoft ASP.NET Core 3.1.1 - Shared Framework'-->
47+
<RelatedBundle Action="Upgrade" Id="{90F6AF22-13B2-3D34-9CF0-C7F407DF4195}"/>
48+
<!--'Microsoft ASP.NET Core 3.1.0 - Shared Framework'-->
49+
<RelatedBundle Action="Upgrade" Id="{A65A6022-E10B-3AEF-802C-B9AFE0B000E2}"/>
50+
<?endif?>
51+
52+
<!-- Ensure upgrades from 3.1.0 thru 3.1.9 for x86. -->
53+
<?if $(var.Platform)=x86?>
54+
<!--'Microsoft ASP.NET Core 3.1.9 - Shared Framework'-->
55+
<RelatedBundle Action="Upgrade" Id="{BE2349EF-BC78-3E42-B29C-E61D12E02FE4}"/>
56+
<!--'Microsoft ASP.NET Core 3.1.8 - Shared Framework'-->
57+
<RelatedBundle Action="Upgrade" Id="{F9E1048A-39B9-3AE1-8AA1-6B054A204A84}"/>
58+
<!--'Microsoft ASP.NET Core 3.1.7 - Shared Framework'-->
59+
<RelatedBundle Action="Upgrade" Id="{48272B78-3954-3D58-AB75-27B31E0D0DBD}"/>
60+
<!--'Microsoft ASP.NET Core 3.1.6 - Shared Framework'-->
61+
<RelatedBundle Action="Upgrade" Id="{52FF933A-F022-3A0A-8200-4C0E8E3934C3}"/>
62+
<!--'Microsoft ASP.NET Core 3.1.5 - Shared Framework'-->
63+
<RelatedBundle Action="Upgrade" Id="{F8C888A3-46C2-3306-8C90-5622C65BEBE3}"/>
64+
<!--'Microsoft ASP.NET Core 3.1.4 - Shared Framework'-->
65+
<RelatedBundle Action="Upgrade" Id="{EC496CB3-526B-366D-B667-3A20354DB136}"/>
66+
<!--'Microsoft ASP.NET Core 3.1.3 - Shared Framework'-->
67+
<RelatedBundle Action="Upgrade" Id="{05780385-0142-3FAA-9B97-F785C4798EC1}"/>
68+
<!--'Microsoft ASP.NET Core 3.1.2 - Shared Framework'-->
69+
<RelatedBundle Action="Upgrade" Id="{4EBEC6A2-DB4C-396B-BAE7-890D1D7EB9B3}"/>
70+
<!--'Microsoft ASP.NET Core 3.1.1 - Shared Framework'-->
71+
<RelatedBundle Action="Upgrade" Id="{5F160755-5B95-32A7-8D4F-ED1BA9F959D1}"/>
72+
<!--'Microsoft ASP.NET Core 3.1.0 - Shared Framework'-->
73+
<RelatedBundle Action="Upgrade" Id="{AC05AAAB-C217-3B65-95FE-11D2CB07A485}"/>
74+
<?endif?>
75+
<?endif?>
76+
2777
<PayloadGroup Id="PG_Resources">
2878
<?foreach lcid in 2052;1028;1029;1031;3082;1036;1040;1041;1042;1045;1046;1049;1055?>
2979
<Payload Id="PL_thm_$(var.lcid)" SourceFile="$(var.lcid)\thm.wxl" Name="$(var.lcid)\thm.wxl" Compressed="yes"/>

‎src/Installers/Windows/WindowsHostingBundle/Bundle.wxs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,30 @@
1919
<RelatedBundle Action="Upgrade" Id="{EA47395A-BC9B-3ECC-8229-229BC9528DF6}"/>
2020
<?endif?>
2121

22+
<!-- Ensure upgrades from 3.1.0 thru 3.1.9 for x64. -->
23+
<?if $(var.MajorVersion)=3 and $(var.MinorVersion)=1?>
24+
<!--'Microsoft .NET Core 3.1.9 - Windows Server Hosting'-->
25+
<RelatedBundle Action="Upgrade" Id="{E4913286-9840-380A-8743-3DF839147FF0}"/>
26+
<!--'Microsoft .NET Core 3.1.8 - Windows Server Hosting'-->
27+
<RelatedBundle Action="Upgrade" Id="{81D96996-6F29-3BAC-82C6-9156FE1BD5FB}"/>
28+
<!--'Microsoft .NET Core 3.1.7 - Windows Server Hosting'-->
29+
<RelatedBundle Action="Upgrade" Id="{44D6EE78-0248-36AD-9B2C-26FA728E477D}"/>
30+
<!--'Microsoft .NET Core 3.1.6 - Windows Server Hosting'-->
31+
<RelatedBundle Action="Upgrade" Id="{C0453F97-42DD-3CD5-9FCE-018DD1F1A020}"/>
32+
<!--'Microsoft .NET Core 3.1.5 - Windows Server Hosting'-->
33+
<RelatedBundle Action="Upgrade" Id="{8BF71BDA-9BF7-3AD5-9E6B-3656FEEC95AA}"/>
34+
<!--'Microsoft .NET Core 3.1.4 - Windows Server Hosting'-->
35+
<RelatedBundle Action="Upgrade" Id="{6CF8B606-EE26-3536-BEFE-410EA70DBB94}"/>
36+
<!--'Microsoft .NET Core 3.1.3 - Windows Server Hosting'-->
37+
<RelatedBundle Action="Upgrade" Id="{71F4232E-75BF-32AF-9A8F-1E87CC17CC6C}"/>
38+
<!--'Microsoft .NET Core 3.1.2 - Windows Server Hosting'-->
39+
<RelatedBundle Action="Upgrade" Id="{3CDBE509-D166-335B-BD17-EA6FDAC4E03A}"/>
40+
<!--'Microsoft .NET Core 3.1.1 - Windows Server Hosting'-->
41+
<RelatedBundle Action="Upgrade" Id="{62155173-E27B-3936-997F-56DA96ED19B5}"/>
42+
<!--'Microsoft .NET Core 3.1.0 - Windows Server Hosting'-->
43+
<RelatedBundle Action="Upgrade" Id="{6F741175-2F75-3845-B30B-6C364101EAA2}"/>
44+
<?endif?>
45+
2246
<PayloadGroup Id="PG_Resources">
2347
<?foreach lcid in 2052;1028;1029;1031;3082;1036;1040;1041;1042;1045;1046;1049;1055?>
2448
<Payload Id="PL_thm_$(var.lcid)" SourceFile="$(var.lcid)\thm.wxl" Name="$(var.lcid)\thm.wxl" Compressed="yes"/>

‎src/Installers/Windows/Wix.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<!-- Set versioning properties after Arcade SDK targets have been imported. -->
33
<PropertyGroup>
4-
<!-- Used for generating stable upgrade codes for bundles -->
5-
<Version>$(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion).0</Version>
64
<!-- Actual upgrade code used in bundles to ensure upgrades withing a version band, e.g. 3.0.0.xxx -->
75
<_FileRevisionVersion>$(VersionSuffixDateStamp)</_FileRevisionVersion>
86
<_FileRevisionVersion Condition=" '$(_FileRevisionVersion)' == '' ">42424</_FileRevisionVersion>
97
<BundleVersion>$(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion).$(_FileRevisionVersion)</BundleVersion>
8+
<!-- Used for generating stable upgrade codes for bundles -->
9+
<Version>$(BundleVersion)</Version>
1010

1111
<!-- ARM64 MSIs require the installer version to be at least 500. -->
1212
<!-- See: https://docs.microsoft.com/en-us/windows/win32/msi/64-bit-windows-installer-packages -->
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<PropertyGroup>
29-
<GuidInputs>$(Version);$(Platform);$(VersionSuffix);$(_BuildNumberLabels)</GuidInputs>
29+
<GuidInputs>$(Version);$(Platform);$(VersionSuffix)</GuidInputs>
3030
</PropertyGroup>
3131

3232
<ItemGroup>
@@ -61,7 +61,7 @@
6161
the upgrade code. Bundle upgrades pivot on Major.Minor.Patch changes. For example, 3.0.1-preview 1 can upgrade to 3.0.1-preview 8, but 3.0.1
6262
cannot upgrade to 3.0.2 or 3.1. -->
6363
<PropertyGroup>
64-
<BundleGuidInputs>$(AspNetCoreMajorMinorVersion).$(AspNetCorePatchVersion);$(Platform)</BundleGuidInputs>
64+
<BundleGuidInputs>$(AspNetCoreMajorMinorVersion);$(Platform)</BundleGuidInputs>
6565
</PropertyGroup>
6666
<GenerateGuid NamespaceGuid="$(NamespaceGuid)" Values="$(BundleGuidInputs)">
6767
<Output TaskParameter="Guid" PropertyName="BundleProviderKey" />

‎src/Middleware/WebSockets/src/ExtendedWebSocketAcceptContext.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,23 @@
66

77
namespace Microsoft.AspNetCore.WebSockets
88
{
9+
/// <summary>
10+
/// Extends the <see cref="WebSocketAcceptContext"/> class with additional properties.
11+
/// </summary>
912
public class ExtendedWebSocketAcceptContext : WebSocketAcceptContext
1013
{
14+
/// <inheritdoc />
1115
public override string SubProtocol { get; set; }
1216

17+
/// <summary>
18+
/// This property is obsolete and has no effect.
19+
/// </summary>
1320
[Obsolete("Setting this property has no effect. It will be removed in a future version.")]
1421
public int? ReceiveBufferSize { get; set; }
1522

23+
/// <summary>
24+
/// The interval to send pong frames. This is a heart-beat that keeps the connection alive.
25+
/// </summary>
1626
public TimeSpan? KeepAliveInterval { get; set; }
1727
}
1828
}

‎src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>ASP.NET Core web socket middleware for use on top of opaque servers.</Description>
@@ -9,6 +9,7 @@
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>aspnetcore</PackageTags>
1111
<IsPackable>false</IsPackable>
12+
<NoWarn>$(NoWarn.Replace('1591', ''))</NoWarn>
1213
</PropertyGroup>
1314

1415
<ItemGroup>

‎src/Middleware/WebSockets/src/WebSocketMiddleware.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717

1818
namespace Microsoft.AspNetCore.WebSockets
1919
{
20+
/// <summary>
21+
/// Enables accepting WebSocket requests by adding a <see cref="IHttpWebSocketFeature"/>
22+
/// to the <see cref="HttpContext"/> if the request is a valid WebSocket request.
23+
/// </summary>
2024
public class WebSocketMiddleware
2125
{
2226
private readonly RequestDelegate _next;
@@ -25,6 +29,12 @@ public class WebSocketMiddleware
2529
private readonly bool _anyOriginAllowed;
2630
private readonly List<string> _allowedOrigins;
2731

32+
/// <summary>
33+
/// Creates a new instance of the <see cref="WebSocketMiddleware"/>.
34+
/// </summary>
35+
/// <param name="next">The next middleware in the pipeline.</param>
36+
/// <param name="options">The configuration options.</param>
37+
/// <param name="loggerFactory">An <see cref="ILoggerFactory"/> instance used to create loggers.</param>
2838
public WebSocketMiddleware(RequestDelegate next, IOptions<WebSocketOptions> options, ILoggerFactory loggerFactory)
2939
{
3040
if (next == null)
@@ -46,6 +56,12 @@ public WebSocketMiddleware(RequestDelegate next, IOptions<WebSocketOptions> opti
4656
// TODO: validate options.
4757
}
4858

59+
/// <summary>
60+
/// Processes a request to determine if it is a WebSocket request, and if so,
61+
/// sets the <see cref="IHttpWebSocketFeature"/> on the <see cref="HttpContext.Features"/>.
62+
/// </summary>
63+
/// <param name="context">The <see cref="HttpContext"/> representing the request.</param>
64+
/// <returns>The <see cref="Task"/> that represents the completion of the middleware pipeline.</returns>
4965
public Task Invoke(HttpContext context)
5066
{
5167
// Detect if an opaque upgrade is available. If so, add a websocket upgrade.

‎src/Middleware/WebSockets/src/WebSocketOptions.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
namespace Microsoft.AspNetCore.Builder
88
{
99
/// <summary>
10-
/// Configuration options for the WebSocketMiddleware
10+
/// Configuration options for the WebSocketMiddleware.
1111
/// </summary>
1212
public class WebSocketOptions
1313
{
14+
/// <summary>
15+
/// Constructs the <see cref="WebSocketOptions"/> class with default values.
16+
/// </summary>
1417
public WebSocketOptions()
1518
{
1619
KeepAliveInterval = TimeSpan.FromMinutes(2);

‎src/Middleware/WebSockets/src/WebSocketsDependencyInjectionExtensions.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -7,8 +7,17 @@
77

88
namespace Microsoft.AspNetCore.WebSockets
99
{
10+
/// <summary>
11+
/// Extension method for <see cref="IServiceCollection"/> to add WebSockets configuration.
12+
/// </summary>
1013
public static class WebSocketsDependencyInjectionExtensions
1114
{
15+
/// <summary>
16+
/// Extension method for <see cref="IServiceCollection"/> to add WebSockets configuration.
17+
/// </summary>
18+
/// <param name="services">The service collection to add WebSockets specific configuration to.</param>
19+
/// <param name="configure">The configuration callback to setup <see cref="WebSocketOptions"/>.</param>
20+
/// <returns></returns>
1221
public static IServiceCollection AddWebSockets(this IServiceCollection services, Action<WebSocketOptions> configure)
1322
{
1423
return services.Configure(configure);

0 commit comments

Comments
 (0)