Skip to content

Commit 2d86721

Browse files
vicancyvicancy
authored
Merge pull request #1887 from Azure/release/1.23
Release/1.23
2 parents b4ffcaa + e5b244a commit 2d86721

File tree

80 files changed

+434
-27302
lines changed

Some content is hidden

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

80 files changed

+434
-27302
lines changed

‎.github/workflows/osx.yml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ on:
1111
jobs:
1212
build_osx:
1313
runs-on: macOS-latest
14+
strategy:
15+
matrix:
16+
dotnet-version: [ '7.0.x', '6.0.x' ]
1417
steps:
15-
- uses: actions/checkout@v2
16-
- uses: dorny/paths-filter@v2.2.0
18+
- uses: actions/checkout@v4
19+
- uses: dorny/paths-filter@v2
1720
id: filter
1821
with:
1922
filters: |
@@ -29,21 +32,24 @@ jobs:
2932
- '**.targets'
3033
- '*.sh'
3134
- '*.sln'
32-
3335
- name: Update SubModules
3436
if: steps.filter.outputs.src == 'true'
3537
run: git submodule update --init --recursive
36-
- name: Setup .NET
37-
uses: actions/setup-dotnet@v2
38+
- name: Setup dotnet ${{ matrix.dotnet-version }}
39+
uses: actions/setup-dotnet@v3
3840
with:
39-
dotnet-version: |
40-
7.0.x
41-
6.0.x
42-
5.0.x
43-
include-prerelease: true
41+
dotnet-version: ${{ matrix.dotnet-version }}
42+
- name: Display dotnet version
43+
run: dotnet --version
4444
- name: Build with dotnet
4545
run: "dotnet build AzureSignalR.sln /p:DisableNet461Tests=true"
4646
if: steps.filter.outputs.src == 'true'
4747
- name: Test
48-
run: "dotnet test --no-build"
49-
if: steps.filter.outputs.src == 'true'
48+
run: dotnet test --no-build --logger trx --results-directory "TestResults-ubuntu-${{ matrix.dotnet-version }}"
49+
- name: Upload dotnet test results
50+
uses: actions/upload-artifact@v3
51+
with:
52+
name: dotnet-results-${{ matrix.dotnet-version }}
53+
path: TestResults-ubuntu-${{ matrix.dotnet-version }}
54+
# Use always() to always run this step to publish test results when there are test failures
55+
if: ${{ always() }}

‎.github/workflows/ubuntu.yml‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ on:
1111
jobs:
1212
build_ubuntu:
1313
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
dotnet-version: [ '7.0.x', '6.0.x' ]
1417
steps:
15-
- uses: actions/checkout@v2
16-
- uses: dorny/paths-filter@v2.2.0
18+
- uses: actions/checkout@v4
19+
- uses: dorny/paths-filter@v2
1720
id: filter
1821
with:
1922
filters: |
@@ -32,17 +35,21 @@ jobs:
3235
- name: Update SubModules
3336
run: git submodule update --init --recursive
3437
if: steps.filter.outputs.src == 'true'
35-
- name: Setup .NET
36-
uses: actions/setup-dotnet@v2
38+
- name: Setup dotnet ${{ matrix.dotnet-version }}
39+
uses: actions/setup-dotnet@v3
3740
with:
38-
dotnet-version: |
39-
7.0.x
40-
6.0.x
41-
5.0.x
42-
include-prerelease: true
41+
dotnet-version: ${{ matrix.dotnet-version }}
42+
- name: Display dotnet version
43+
run: dotnet --version
4344
- name: Build with dotnet
4445
run: "dotnet build AzureSignalR.sln /p:DisableNet461Tests=true"
4546
if: steps.filter.outputs.src == 'true'
4647
- name: Test
47-
run: "dotnet test --no-build"
48-
if: steps.filter.outputs.src == 'true'
48+
run: dotnet test --no-build --logger trx --results-directory "TestResults-ubuntu-${{ matrix.dotnet-version }}"
49+
- name: Upload dotnet test results
50+
uses: actions/upload-artifact@v3
51+
with:
52+
name: dotnet-results-${{ matrix.dotnet-version }}
53+
path: TestResults-ubuntu-${{ matrix.dotnet-version }}
54+
# Use always() to always run this step to publish test results when there are test failures
55+
if: ${{ always() }}

‎.github/workflows/windows.yml‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ on:
1111
jobs:
1212
build_windows:
1313
runs-on: [windows-latest]
14+
strategy:
15+
matrix:
16+
dotnet-version: [ '7.0.x', '6.0.x' ]
1417
steps:
15-
- uses: actions/checkout@v2
16-
- uses: dorny/paths-filter@v2.2.0
18+
- uses: actions/checkout@v4
19+
- uses: dorny/paths-filter@v2
1720
id: filter
1821
with:
1922
filters: |
@@ -32,16 +35,21 @@ jobs:
3235
- name: Update SubModules
3336
run: git submodule update --init --recursive
3437
if: steps.filter.outputs.src == 'true'
35-
36-
- name: Setup .NET
37-
uses: actions/setup-dotnet@v2
38+
- name: Setup dotnet ${{ matrix.dotnet-version }}
39+
uses: actions/setup-dotnet@v3
3840
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
41+
dotnet-version: ${{ matrix.dotnet-version }}
42+
- name: Display dotnet version
43+
run: dotnet --version
44+
- name: Build with dotnet
45+
run: "dotnet build AzureSignalR.sln"
4746
if: steps.filter.outputs.src == 'true'
47+
- name: Test
48+
run: dotnet test --no-build --logger trx --results-directory "TestResults-ubuntu-${{ matrix.dotnet-version }}"
49+
- name: Upload dotnet test results
50+
uses: actions/upload-artifact@v3
51+
with:
52+
name: dotnet-results-${{ matrix.dotnet-version }}
53+
path: TestResults-ubuntu-${{ matrix.dotnet-version }}
54+
# Use always() to always run this step to publish test results when there are test failures
55+
if: ${{ always() }}

‎AzureSignalR.sln‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "emulator", "emulator", "{AD
7070
EndProject
7171
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Emulator", "src\Microsoft.Azure.SignalR.Emulator\Microsoft.Azure.SignalR.Emulator.csproj", "{ABAAAEA8-40B3-4178-A7FD-09779A5DC757}"
7272
EndProject
73-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net50", "samples\ChatSample\ChatSample.Net50\ChatSample.Net50.csproj", "{29EF376E-DF94-419F-9DF2-50756B60DF38}"
74-
EndProject
7573
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Emulator.Tests", "test\Microsoft.Azure.SignalR.Emulator.Tests\Microsoft.Azure.SignalR.Emulator.Tests.csproj", "{870A10E3-D17A-4239-9715-5610FFE1FC76}"
7674
EndProject
7775
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Serverless.Protocols", "src\Microsoft.Azure.SignalR.Serverless.Protocols\Microsoft.Azure.SignalR.Serverless.Protocols.csproj", "{52944A80-44A9-48D4-919D-11AAAD55193E}"
@@ -82,7 +80,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net60", "samples
8280
EndProject
8381
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net70", "samples\ChatSample\ChatSample.Net70\ChatSample.Net70.csproj", "{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}"
8482
EndProject
85-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagementPublisher", "samples\ChatSample\ChatSample.ManagementPublisher\ManagementPublisher.csproj", "{0F32E624-7AC8-4CA7-8ED9-E1A877442020}"
83+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagementPublisher", "samples\ChatSample\ChatSample.ManagementPublisher\ManagementPublisher.csproj", "{0F32E624-7AC8-4CA7-8ED9-E1A877442020}"
8684
EndProject
8785
Global
8886
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -174,10 +172,6 @@ Global
174172
{ABAAAEA8-40B3-4178-A7FD-09779A5DC757}.Debug|Any CPU.Build.0 = Debug|Any CPU
175173
{ABAAAEA8-40B3-4178-A7FD-09779A5DC757}.Release|Any CPU.ActiveCfg = Release|Any CPU
176174
{ABAAAEA8-40B3-4178-A7FD-09779A5DC757}.Release|Any CPU.Build.0 = Release|Any CPU
177-
{29EF376E-DF94-419F-9DF2-50756B60DF38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
178-
{29EF376E-DF94-419F-9DF2-50756B60DF38}.Debug|Any CPU.Build.0 = Debug|Any CPU
179-
{29EF376E-DF94-419F-9DF2-50756B60DF38}.Release|Any CPU.ActiveCfg = Release|Any CPU
180-
{29EF376E-DF94-419F-9DF2-50756B60DF38}.Release|Any CPU.Build.0 = Release|Any CPU
181175
{870A10E3-D17A-4239-9715-5610FFE1FC76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
182176
{870A10E3-D17A-4239-9715-5610FFE1FC76}.Debug|Any CPU.Build.0 = Debug|Any CPU
183177
{870A10E3-D17A-4239-9715-5610FFE1FC76}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -230,7 +224,6 @@ Global
230224
{63BB9836-126B-4E65-92B9-019438185E41} = {C965ED06-6A17-4329-B3C6-811830F4F4ED}
231225
{3E11208B-B038-4840-8180-69DC6B5EAD22} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}
232226
{ABAAAEA8-40B3-4178-A7FD-09779A5DC757} = {ADD61A03-340D-426C-BA51-DBBC096434ED}
233-
{29EF376E-DF94-419F-9DF2-50756B60DF38} = {C965ED06-6A17-4329-B3C6-811830F4F4ED}
234227
{870A10E3-D17A-4239-9715-5610FFE1FC76} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}
235228
{52944A80-44A9-48D4-919D-11AAAD55193E} = {DA69F624-5398-4884-87E4-B816698CDE65}
236229
{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}

‎Directory.Build.targets‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
4-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
5-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
63
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">$(MicrosoftNETCoreApp31PackageVersion)</RuntimeFrameworkVersion>
74
</PropertyGroup>
85
</Project>

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Azure SignalR Service SDK is supporting ASP.NET Core 3.0 from version `1.1.0-*`.
1919
Package Name | Description | Target Frameworks | <img width=500/> Packages <img width=500/>
2020
---|---|---|---
2121
Microsoft.Azure.SignalR.AspNet | The package to use when you are using **ASP.NET SignalR** | **.NETFramework 4.6.1** | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Azure.SignalR.AspNet.svg?label=NuGet)](https://www.nuget.org/packages/Microsoft.Azure.SignalR.AspNet) <br/> [![MyGet](https://img.shields.io/myget/azure-signalr-dev/vpre/Microsoft.Azure.SignalR.AspNet.svg?label=MyGet)](https://www.myget.org/feed/azure-signalr-dev/package/nuget/Microsoft.Azure.SignalR.AspNet)
22-
Microsoft.Azure.SignalR | The package to use when you are using **ASP.NET Core SignalR** | **.NET Standard 2.0**<br/> **.NET Core App 3.0**<br/> **.NET 5.0** | [![Nuget](https://img.shields.io/nuget/v/Microsoft.Azure.SignalR.svg?label=NuGet)](https://www.nuget.org/packages/Microsoft.Azure.SignalR/) <br/> [![MyGet](https://img.shields.io/myget/azure-signalr-dev/vpre/Microsoft.Azure.SignalR.svg?label=MyGet)](https://www.myget.org/feed/azure-signalr-dev/package/nuget/Microsoft.Azure.SignalR)
23-
Microsoft.Azure.SignalR.Management | You can use the package to manage **ASP.NET Core SignalR** clients through Azure SignalR Service directly | **.NET Standard 2.0**<br/> **.NET Core App 3.0**<br/> **.NET 5.0** | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Azure.SignalR.Management.svg?label=NuGet)](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Management) <br/> [![MyGet](https://img.shields.io/myget/azure-signalr-dev/vpre/Microsoft.Azure.SignalR.Management.svg?label=MyGet)](https://www.myget.org/feed/azure-signalr-dev/package/nuget/Microsoft.Azure.SignalR.Management)
22+
Microsoft.Azure.SignalR | The package to use when you are using **ASP.NET Core SignalR** | **.NET Standard 2.0**<br/> **.NET Core App 3.1**<br/> **.NET 5.0**<br/> **.NET 6.0**<br/> **.NET 7.0** | [![Nuget](https://img.shields.io/nuget/v/Microsoft.Azure.SignalR.svg?label=NuGet)](https://www.nuget.org/packages/Microsoft.Azure.SignalR/) <br/> [![MyGet](https://img.shields.io/myget/azure-signalr-dev/vpre/Microsoft.Azure.SignalR.svg?label=MyGet)](https://www.myget.org/feed/azure-signalr-dev/package/nuget/Microsoft.Azure.SignalR)
23+
Microsoft.Azure.SignalR.Management | You can use the package to manage **ASP.NET Core SignalR** clients through Azure SignalR Service directly | **.NET Standard 2.0**<br/> **.NET Core App 3.1**<br/> **.NET 5.0**<br/> **.NET 6.0**<br/> **.NET 7.0** | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Azure.SignalR.Management.svg?label=NuGet)](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Management) <br/> [![MyGet](https://img.shields.io/myget/azure-signalr-dev/vpre/Microsoft.Azure.SignalR.Management.svg?label=MyGet)](https://www.myget.org/feed/azure-signalr-dev/package/nuget/Microsoft.Azure.SignalR.Management)
2424
| Microsoft.Azure.SignalR.Protocols | The package contains the data protocol between the SDK and the Azure SignalR Service | **.NET Standard 2.0** | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Azure.SignalR.Protocols.svg?label=NuGet)](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Protocols) <br/> [![MyGet](https://img.shields.io/myget/azure-signalr-dev/vpre/Microsoft.Azure.SignalR.Protocols.svg?label=MyGet)](https://www.myget.org/feed/azure-signalr-dev/package/nuget/Microsoft.Azure.SignalR.Protocols)
25-
| Microsoft.Azure.SignalR.Emulator | The emulator tool for serverless scenarios | **.NET Standard 2.0** | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Azure.SignalR.Emulator.svg?label=NuGet)](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Emulator) <br/> [![MyGet](https://img.shields.io/myget/azure-signalr-dev/vpre/Microsoft.Azure.SignalR.Emulator.svg?label=MyGet)](https://www.myget.org/feed/azure-signalr-dev/package/nuget/Microsoft.Azure.SignalR.Emulator)
25+
| Microsoft.Azure.SignalR.Emulator | The emulator tool for serverless scenarios | **.NET 6.0** | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Azure.SignalR.Emulator.svg?label=NuGet)](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Emulator) <br/> [![MyGet](https://img.shields.io/myget/azure-signalr-dev/vpre/Microsoft.Azure.SignalR.Emulator.svg?label=MyGet)](https://www.myget.org/feed/azure-signalr-dev/package/nuget/Microsoft.Azure.SignalR.Emulator)
2626
</div>
2727

2828
## Getting Started
@@ -59,20 +59,20 @@ Samples on how to use Azure SignalR Service can be found [here](https://github.c
5959
6060
Package [Microsoft.Azure.SignalR.Management](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Management) is the one to use when you want to manage SignalR clients through Azure SignalR Service directly such as broadcast messages. This SDK can be but not limited to be used in [serverless](https://azure.microsoft.com/solutions/serverless/) environments. You can use this SDK to manage SignalR clients connected to your Azure SignalR Service in any environment, such as in a console app, in an Azure function or in an App Server.
6161

62-
More details can be found [here](./docs/management-sdk-guide.md).
62+
More details can be found [here](https://learn.microsoft.com/azure/azure-signalr/signalr-howto-use-management-sdk).
6363

6464
The sample on how to use Management SDK to redirect SignalR clients to Azure SignalR Service can be found [here](https://github.com/aspnet/AzureSignalR-samples/tree/master/samples/Management).
6565

6666
## Next Steps
6767

6868
The following documents describe more details about Azure SignalR Service.
6969

70-
- [Use Azure SignalR Service](./docs/use-signalr-service.md)
71-
- [REST API in Azure SignalR Service](./docs/rest-api.md)
72-
- [Internals of the Azure SignalR Service](./docs/internal.md)
73-
- [FAQ](./docs/faq.md)
74-
- [Troubleshooting Guide](./docs/tsg.md)
75-
- [Azure SignalR Local Emulator](./docs/emulator.md)
70+
- [Use Azure SignalR Service](https://docs.microsoft.com/azure/azure-signalr/signalr-howto-use)
71+
- [REST API in Azure SignalR Service](https://docs.microsoft.com/azure/azure-signalr/signalr-reference-data-plane-rest-api)
72+
- [Internals of the Azure SignalR Service](https://docs.microsoft.com/azure/azure-signalr/signalr-concept-internals)
73+
- [FAQ](https://docs.microsoft.com/azure/azure-signalr/signalr-resource-faq)
74+
- [Troubleshooting Guide](https://docs.microsoft.com/azure/azure-signalr/signalr-howto-troubleshoot-guide)
75+
- [Azure SignalR Local Emulator](https://learn.microsoft.com/azure/azure-signalr/signalr-howto-emulator)
7676

7777
Contributions are highly welcome. Keep reading if you want to contribute to our repository.
7878

@@ -96,4 +96,4 @@ contact [[email protected]](mailto:[email protected]) with any additio
9696

9797
## Performance
9898

99-
See [Performance](./docs/performance-guide.md) for details.
99+
See [Performance](https://docs.microsoft.com/azure/azure-signalr/signalr-concept-performance) for details.

0 commit comments

Comments
 (0)