Skip to content

Commit 3470d1f

Browse files
JialinXinvicancykevinguo-edY-Sindoxingsy97
authored
Release v1.19.0 (#1712)
* Update Actions to use dotnet build (#1663) * Update windows.yml * Add configurable options (#1654) * Update CI to enable net7.0 preview builds (#1677) * Support net7.0 * update osx/ubuntu. * revert common package upgrade. * update build-source guide and revert net7.0 in src. * Add OrTimeout() * Fix build warnings and add net6 samples (#1676) * Fix build warning * Update docs * Fix build failure * Fix test failure * Fix vlunerability issue (#1678) * Fix vlunerability issue * fix filters * fix filters * Update use-signalr-service.md (#1683) * Change emulator to net6.0 (#1682) * Change emulator to net6.0 * Fix test * Add filter property...... (#1686) * Add filter * Add multiPayload case * Adding comments * Update management-sdk-guide.md (#1689) Improve a confusing statement. The original statement can also be interpreted as this SDK only supports SignalR clients based on ASP.NET Core C#, which confuses users. #1688 * Expose InstanceId in ClientConnectionContext (#1692) * Fix `HubConnectionContext.UserIdentifier` is null when negotiation with Management SDK (#1691) When clients negotiatie with Management SDK and connect to SignalR server, IUserIdProvider might not work as the user ID is set directly in the Management SDK. To make HubConnectionContext.UserIdentifier have the valid value in this case, we should set it before the server accesses it. HubLifetimeManager{THub}.OnConnectedAsync(HubConnectionContext) is the only chance we can set the value. However, we cannot access the Constants.ClaimType.UserId as ASRS system claims are trimmed there. HubConnectionContext.Features is the place where we can store the user Id. The following code is the injection point. https://github.com/dotnet/aspnetcore/blob/v6.0.9/src/SignalR/server/Core/src/HubConnectionHandler.cs#L132-L141 Fixes #1679 * Add ClientInvocationManager (#1684) * add ClientInvocationManager * update CallerClientResultsManager (#1697) add `TryCompleteResult` for `ErrorCompletionMessage` * Implement close on client authentication expiration (#1699) * Add spec for client-invocation. (#1701) * Add spec for client-invocation. * minor update direction for ErrorCompletionMessage * Add client Invocation implementation and UTs (#1687) * Add client Invocation implementation and UTs * [ClientInvocation] Fix cleanup in caller case. (#1702) * Fix cleanup in caller case. * fix UT. * Update src/Microsoft.Azure.SignalR.Common/ClientInvocation/IClientInvocationManager.cs Co-authored-by: Liangying.Wei <[email protected]> Co-authored-by: Liangying.Wei <[email protected]> * Add ClientResultSample (#1703) * Add ClientResultSample * Move file * minor update. * minor update README. * show server/service ex.message * Add Broadcast method and update README * Fix proxy not applied to serverless transient mode (#1708) Fix #1700 * silent IDE0090 check (#1709) * reduce retry interval when auth failed (#1451) * Clean up dependencies. (#1711) * Update dep to GA version. * clean up dependencies * clean management. * fix test dep. Co-authored-by: Liangying.Wei <[email protected]> Co-authored-by: Kevin Guo <[email protected]> Co-authored-by: yzt <[email protected]> Co-authored-by: Eric Xing <[email protected]> Co-authored-by: Terence Fan <[email protected]>
1 parent 8442f47 commit 3470d1f

File tree

250 files changed

+123887
-1974
lines changed

Some content is hidden

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

250 files changed

+123887
-1974
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,3 +247,6 @@ dotnet_diagnostic.IDE0058.severity = none
247247

248248
# IDE0022: Use block body for methods
249249
dotnet_diagnostic.IDE0022.severity = none
250+
251+
# IDE0090: Use 'new(...)'
252+
dotnet_diagnostic.IDE0090.severity = silent

.github/workflows/osx.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
name: Gated-OSX
2-
on:
2+
on:
33
push:
44
branches:
5-
- disable
5+
- master
6+
- dev
7+
pull_request:
8+
branches:
9+
- master
10+
- dev
611
jobs:
712
build_osx:
813
runs-on: macOS-latest
@@ -15,17 +20,30 @@ jobs:
1520
src:
1621
- 'src/**'
1722
- 'test/**'
23+
- 'build/**'
24+
- 'samples/**'
1825
- '*.cmd'
1926
- '*.ps1'
20-
- '*.props'
21-
- '*.targets'
27+
- '**.props'
28+
- '**.csproj'
29+
- '**.targets'
2230
- '*.sh'
2331
- '*.sln'
2432
2533
- name: Update SubModules
2634
if: steps.filter.outputs.src == 'true'
2735
run: git submodule update --init --recursive
28-
36+
- name: Setup .NET
37+
uses: actions/setup-dotnet@v2
38+
with:
39+
dotnet-version: |
40+
7.0.x
41+
6.0.x
42+
5.0.x
43+
include-prerelease: true
2944
- name: Build with dotnet
45+
run: "dotnet build AzureSignalR.sln /p:DisableNet461Tests=true"
46+
if: steps.filter.outputs.src == 'true'
47+
- name: Test
48+
run: "dotnet test --no-build"
3049
if: steps.filter.outputs.src == 'true'
31-
run: "./build.sh --ci /p:DisableNet461Tests=true"

.github/workflows/ubuntu.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,29 @@ jobs:
2020
src:
2121
- 'src/**'
2222
- 'test/**'
23+
- 'build/**'
24+
- 'samples/**'
2325
- '*.cmd'
2426
- '*.ps1'
25-
- '*.props'
26-
- '*.targets'
27+
- '**.props'
28+
- '**.csproj'
29+
- '**.targets'
2730
- '*.sh'
2831
- '*.sln'
2932
- name: Update SubModules
3033
run: git submodule update --init --recursive
3134
if: steps.filter.outputs.src == 'true'
35+
- name: Setup .NET
36+
uses: actions/setup-dotnet@v2
37+
with:
38+
dotnet-version: |
39+
7.0.x
40+
6.0.x
41+
5.0.x
42+
include-prerelease: true
3243
- name: Build with dotnet
33-
run: "./build.sh --ci /p:DisableNet461Tests=true"
44+
run: "dotnet build AzureSignalR.sln /p:DisableNet461Tests=true"
45+
if: steps.filter.outputs.src == 'true'
46+
- name: Test
47+
run: "dotnet test --no-build"
3448
if: steps.filter.outputs.src == 'true'

.github/workflows/windows.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,28 @@ jobs:
2020
src:
2121
- 'src/**'
2222
- 'test/**'
23+
- 'build/**'
24+
- 'samples/**'
2325
- '*.cmd'
2426
- '*.ps1'
25-
- '*.props'
26-
- '*.targets'
27+
- '**.props'
28+
- '**.csproj'
29+
- '**.targets'
2730
- '*.sh'
2831
- '*.sln'
2932
- name: Update SubModules
3033
run: git submodule update --init --recursive
3134
if: steps.filter.outputs.src == 'true'
3235

33-
- name: Build with dotnet
34-
shell: powershell
35-
run: .\run.ps1 default-build
36+
- name: Setup .NET
37+
uses: actions/setup-dotnet@v2
38+
with:
39+
dotnet-version: |
40+
7.0.x
41+
6.0.x
42+
5.0.x
43+
include-prerelease: true
44+
45+
- name: Test
46+
run: dotnet test
3647
if: steps.filter.outputs.src == 'true'

AzureSignalR.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Ser
7878
EndProject
7979
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Serverless.Protocols.Tests", "test\Microsoft.Azure.SignalR.Serverless.Protocols.Tests\Microsoft.Azure.SignalR.Serverless.Protocols.Tests.csproj", "{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0}"
8080
EndProject
81+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net60", "samples\ChatSample\ChatSample.Net60\ChatSample.Net60.csproj", "{594EC59A-7305-4A36-8BE6-4A928FBFD71B}"
82+
EndProject
83+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net70", "samples\ChatSample\ChatSample.Net70\ChatSample.Net70.csproj", "{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}"
84+
EndProject
8185
Global
8286
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8387
Debug|Any CPU = Debug|Any CPU
@@ -184,6 +188,14 @@ Global
184188
{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
185189
{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
186190
{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0}.Release|Any CPU.Build.0 = Release|Any CPU
191+
{594EC59A-7305-4A36-8BE6-4A928FBFD71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
192+
{594EC59A-7305-4A36-8BE6-4A928FBFD71B}.Debug|Any CPU.Build.0 = Debug|Any CPU
193+
{594EC59A-7305-4A36-8BE6-4A928FBFD71B}.Release|Any CPU.ActiveCfg = Release|Any CPU
194+
{594EC59A-7305-4A36-8BE6-4A928FBFD71B}.Release|Any CPU.Build.0 = Release|Any CPU
195+
{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
196+
{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
197+
{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
198+
{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}.Release|Any CPU.Build.0 = Release|Any CPU
187199
EndGlobalSection
188200
GlobalSection(SolutionProperties) = preSolution
189201
HideSolutionNode = FALSE
@@ -216,6 +228,8 @@ Global
216228
{870A10E3-D17A-4239-9715-5610FFE1FC76} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}
217229
{52944A80-44A9-48D4-919D-11AAAD55193E} = {DA69F624-5398-4884-87E4-B816698CDE65}
218230
{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}
231+
{594EC59A-7305-4A36-8BE6-4A928FBFD71B} = {C965ED06-6A17-4329-B3C6-811830F4F4ED}
232+
{49634EE4-A0F4-4672-A8B3-B994CF81C9AB} = {C965ED06-6A17-4329-B3C6-811830F4F4ED}
219233
EndGlobalSection
220234
GlobalSection(ExtensibilityGlobals) = postSolution
221235
SolutionGuid = {7945A4E4-ACDB-4F6E-95CA-6AC6E7C2CD59}

build.cmd

Lines changed: 0 additions & 2 deletions
This file was deleted.

build.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

build/dependencies.props

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
66
<!-- Azure ASP.NET Core SignalR -->
7-
<MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>1.0.0</MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>
8-
<MicrosoftAspNetCoreHttpConnectionsClientPackage3_0Version>3.0.0</MicrosoftAspNetCoreHttpConnectionsClientPackage3_0Version>
9-
<MicrosoftAspNetCoreHttpConnectionsClientPackage3_1Version>3.1.9</MicrosoftAspNetCoreHttpConnectionsClientPackage3_1Version>
10-
<MicrosoftAspNetCoreHttpConnectionsClientPackage5_0Version>5.0.1</MicrosoftAspNetCoreHttpConnectionsClientPackage5_0Version>
117
<MicrosoftAspNetCoreHttpConnectionsCommonPackageVersion>1.0.4</MicrosoftAspNetCoreHttpConnectionsCommonPackageVersion>
128
<MicrosoftAspNetCoreHttpConnectionsCommonPackage3_0Version>3.0.0</MicrosoftAspNetCoreHttpConnectionsCommonPackage3_0Version>
139
<MicrosoftAspNetCoreHttpConnectionsCommonPackage3_1Version>3.1.9</MicrosoftAspNetCoreHttpConnectionsCommonPackage3_1Version>
@@ -61,7 +57,7 @@
6157
<MicrosoftExtensionsHostingVersion>2.1.0</MicrosoftExtensionsHostingVersion>
6258

6359
<!-- SignalR Serverless Protocols-->
64-
<NewtonsoftJsonPackageVersion>12.0.2</NewtonsoftJsonPackageVersion>
60+
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
6561

6662
<!-- Signing -->
6763
<MicrosoftVisualStudioEngMicroBuildCoreVersion>1.0.0</MicrosoftVisualStudioEngMicroBuildCoreVersion>
@@ -77,9 +73,10 @@
7773
<!--Emulator -->
7874
<MicrosoftExtensionsCommandLineUtilsPackageVersion>1.1.1</MicrosoftExtensionsCommandLineUtilsPackageVersion>
7975
<SystemIOPipelinesPackageForEmulatorVersion>4.7.5</SystemIOPipelinesPackageForEmulatorVersion>
80-
<EmulatorMicrosoftPackageVersion>3.1.24</EmulatorMicrosoftPackageVersion>
76+
<EmulatorMicrosoftPackageVersion>6.0.9</EmulatorMicrosoftPackageVersion>
8177

8278
<!--Testing -->
79+
<MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>1.0.0</MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>
8380
<MessagePackPackage3_1Version>1.9.11</MessagePackPackage3_1Version>
8481
<MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion>3.1.24</MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion>
8582
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>

docs/build-source.md

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Building Azure SignalR Service SDK from source allows you tweak and customize th
77

88
Building Azure SignalR Service SDK requires:
99

10-
* Latest Visual Studio. <https://visualstudio.com>
10+
* Latest Visual Studio (include pre-release). <https://visualstudio.com>
1111
* Git. <https://git-scm.org>
12-
* AspNetCore 3.0 SDK (Version >= 3.0.0). <https://dotnet.microsoft.com/download/dotnet-core/3.0>
12+
* .NET SDK (Version >= 7.0.0-preview.7). <https://dotnet.microsoft.com/download/dotnet>
1313

1414
## Clone the source code
1515

@@ -25,34 +25,14 @@ git submodule update --init --recursive
2525

2626
## Building on command-line
2727

28-
You can build the entire project on command line with the `build.cmd`/`.sh` scripts.
28+
You can build the entire project on command line with the [`dotnet` command](https://docs.microsoft.com/dotnet/core/tools/dotnet). Run command below in the repo's root folder.
2929

30-
On Windows:
3130
```
32-
.\build.cmd
33-
```
34-
35-
On macOS/Linux:
36-
```
37-
./build.sh
31+
dotnet build
3832
```
3933

4034
## Building in Visual Studio
4135

42-
Before opening our .sln files in Visual Studio or VS Code, it is suggested to run `.\build.cmd` to make sure all the dependencies are restored correctly.
43-
44-
The solution file is **AzureSignalR.sln** in the root.
45-
46-
## Build properties
47-
48-
Additional properties can be added as an argument in the form `/property:$name=$value`, or `/p:$name=$value` for short. For example:
49-
```
50-
.\build.cmd /p:Configuration=Release
51-
```
52-
53-
Common properties include:
36+
Before opening our .sln files in Visual Studio or VS Code, it is suggested to run `dotnet restore` to make sure all the dependencies are restored correctly.
5437

55-
Property | Description
56-
-------------------------|-------------------------------------------------------------------------------------------------------------
57-
BuildNumber | (string). A specific build number, typically from a CI counter, which is appended to the preview1 label.
58-
Configuration | `Debug` or `Release`. Default = `Debug`.
38+
The solution file is **AzureSignalR.sln** in the root.

docs/management-sdk-guide.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Azure SignalR Service Management SDK
22

3-
> **NOTE**
4-
>
5-
> Azure SignalR Service only supports this SDK for ASP.NET CORE SignalR clients.
3+
This SDK is for ASP.NET **Core** SignalR. For differences between ASP.NET SignalR and ASP.NET Core SignalR, see [here](https://learn.microsoft.com/aspnet/core/signalr/version-differences?view=aspnetcore-6.0).
64

75
## Build Status
86

@@ -190,4 +188,4 @@ This SDK can communicates to Azure SignalR Service with two transport types:
190188

191189

192190
### Next steps
193-
* [Customizing Json Serialization in Management SDK](./advanced-topics/json-object-serializer.md)
191+
* [Customizing Json Serialization in Management SDK](./advanced-topics/json-object-serializer.md)

0 commit comments

Comments
 (0)