Skip to content

Commit b7be540

Browse files
JialinXinJialinXin
committed
Merge remote-tracking branch 'upstream/master' into blazor-chat
2 parents 4d41a68 + 716888f commit b7be540

Some content is hidden

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

65 files changed

+1726
-219
lines changed

‎CODE-OF-CONDUCT.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Code of Conduct
2+
3+
This project has adopted the code of conduct defined by the Contributor Covenant
4+
to clarify expected behavior in our community.
5+
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

‎README.md‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,10 @@ More advanced samples are listed as below:
2727
* [Realtime Sign-in Example using Azure SignalR Service](samples/RealtimeSignIn)
2828
* [Flight Map: Realtime Monitoring Dashboard using Azure SignalR Service](samples/FlightMap)
2929

30+
***Archived*** Chat Room Example under AspNetCore 2.1 version:
31+
* [Chat Room Example under AspNetCore 2.1.0](samples/ChatRoom.NetCore21/ChatRoom/README.md)
32+
3033
## ASP.NET SignalR samples
3134

3235
* [Get Started with ASP.NET SignalR: a Chat Room Example](aspnet-samples/ChatRoomLocal)
3336
* [Build Your First Azure SignalR Service Application for ASP.NET SignalR](aspnet-samples/ChatRoom)
34-
35-
## Updates of Azure SignalR Service Runtime and SDK
36-
37-
We have made some changes to Azure SignalR Service Runtime, as well as Service SDK. You have to upgrade to the latest Service SDK to connect to the latest Service Runtime.
38-
39-
### SDK for ASP.NET Core SignalR
40-
In the latest Service SDK for **ASP.NET Core SignalR**, we have made the following changes:
41-
42-
- Dependency injection is built on top of ASP.NET Core SignalR.
43-
- Expose a built-in authentication endpoint to issue access token. User authentication endpoint is not required any more.
44-
- Re-design interfaces for REST API.
45-
- Remove .NET Framework support. We plan to support .NET Framework in later releases.
46-
47-
### SDK for ASP.NET SignalR
48-
The first preview version of Service SDK for **ASP.NET SignalR** is released.

‎aspnet-samples/AdvancedChatRoom/ChatSample.AspNet.csproj‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
<WarningLevel>4</WarningLevel>
4545
</PropertyGroup>
4646
<ItemGroup>
47-
<Reference Include="MessagePack, Version=1.7.3.4, Culture=neutral, PublicKeyToken=b4a0369545f0a1be, processorArchitecture=MSIL">
48-
<HintPath>packages\MessagePack.1.7.3.4\lib\net45\MessagePack.dll</HintPath>
49-
</Reference>
5047
<Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5148
<HintPath>packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
5249
</Reference>
@@ -71,14 +68,14 @@
7168
<Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
7269
<HintPath>packages\Microsoft.AspNetCore.Http.Features.2.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
7370
</Reference>
74-
<Reference Include="Microsoft.Azure.SignalR.AspNet, Version=1.0.11.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75-
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.0.11\lib\net461\Microsoft.Azure.SignalR.AspNet.dll</HintPath>
71+
<Reference Include="Microsoft.Azure.SignalR.AspNet, Version=1.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
72+
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.1\lib\net461\Microsoft.Azure.SignalR.AspNet.dll</HintPath>
7673
</Reference>
77-
<Reference Include="Microsoft.Azure.SignalR.Common, Version=1.0.11.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78-
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.0.11\lib\net461\Microsoft.Azure.SignalR.Common.dll</HintPath>
74+
<Reference Include="Microsoft.Azure.SignalR.Common, Version=1.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
75+
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.1\lib\net461\Microsoft.Azure.SignalR.Common.dll</HintPath>
7976
</Reference>
80-
<Reference Include="Microsoft.Azure.SignalR.Protocols, Version=1.0.11.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
81-
<HintPath>packages\Microsoft.Azure.SignalR.Protocols.1.0.11\lib\netstandard2.0\Microsoft.Azure.SignalR.Protocols.dll</HintPath>
77+
<Reference Include="Microsoft.Azure.SignalR.Protocols, Version=1.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
78+
<HintPath>packages\Microsoft.Azure.SignalR.Protocols.1.4.1\lib\netstandard2.0\Microsoft.Azure.SignalR.Protocols.dll</HintPath>
8279
</Reference>
8380
<Reference Include="Microsoft.CSharp" />
8481
<Reference Include="Microsoft.Extensions.Configuration, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
@@ -90,6 +87,9 @@
9087
<Reference Include="Microsoft.Extensions.Configuration.Binder, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
9188
<HintPath>packages\Microsoft.Extensions.Configuration.Binder.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
9289
</Reference>
90+
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
91+
<HintPath>packages\Microsoft.Extensions.DependencyInjection.2.1.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
92+
</Reference>
9393
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
9494
<HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
9595
</Reference>
@@ -99,6 +99,9 @@
9999
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
100100
<HintPath>packages\Microsoft.Extensions.Logging.Abstractions.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
101101
</Reference>
102+
<Reference Include="Microsoft.Extensions.Logging.EventSource, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
103+
<HintPath>packages\Microsoft.Extensions.Logging.EventSource.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.EventSource.dll</HintPath>
104+
</Reference>
102105
<Reference Include="Microsoft.Extensions.Logging.TraceSource, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
103106
<HintPath>packages\Microsoft.Extensions.Logging.TraceSource.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Logging.TraceSource.dll</HintPath>
104107
</Reference>
@@ -108,11 +111,14 @@
108111
<Reference Include="Microsoft.Extensions.Primitives, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
109112
<HintPath>packages\Microsoft.Extensions.Primitives.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
110113
</Reference>
111-
<Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112-
<HintPath>packages\Microsoft.IdentityModel.Logging.5.2.1\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
114+
<Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115+
<HintPath>packages\Microsoft.IdentityModel.JsonWebTokens.5.5.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
116+
</Reference>
117+
<Reference Include="Microsoft.IdentityModel.Logging, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118+
<HintPath>packages\Microsoft.IdentityModel.Logging.5.5.0\lib\net461\Microsoft.IdentityModel.Logging.dll</HintPath>
113119
</Reference>
114-
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115-
<HintPath>packages\Microsoft.IdentityModel.Tokens.5.2.1\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
120+
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121+
<HintPath>packages\Microsoft.IdentityModel.Tokens.5.5.0\lib\net461\Microsoft.IdentityModel.Tokens.dll</HintPath>
116122
</Reference>
117123
<Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118124
<HintPath>packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
@@ -141,14 +147,14 @@
141147
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
142148
<HintPath>packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
143149
</Reference>
144-
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
145-
<HintPath>packages\System.IdentityModel.Tokens.Jwt.5.2.1\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
150+
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
151+
<HintPath>packages\System.IdentityModel.Tokens.Jwt.5.5.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll</HintPath>
146152
</Reference>
147-
<Reference Include="System.IO.Pipelines, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
148-
<HintPath>packages\System.IO.Pipelines.4.5.1\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
153+
<Reference Include="System.IO.Pipelines, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
154+
<HintPath>packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
149155
</Reference>
150-
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
151-
<HintPath>packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
156+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
157+
<HintPath>packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
152158
</Reference>
153159
<Reference Include="System.Net.Http" />
154160
<Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -158,16 +164,16 @@
158164
<Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
159165
<HintPath>packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
160166
</Reference>
161-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
162-
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
167+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
168+
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
163169
</Reference>
164170
<Reference Include="System.Runtime.Serialization" />
165171
<Reference Include="System.Security" />
166-
<Reference Include="System.Threading.Channels, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
167-
<HintPath>packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
172+
<Reference Include="System.Threading.Channels, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
173+
<HintPath>packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
168174
</Reference>
169175
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
170-
<HintPath>packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
176+
<HintPath>packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
171177
</Reference>
172178
<Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
173179
<HintPath>packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

‎aspnet-samples/AdvancedChatRoom/Web.config‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,38 @@
105105

106106
</dependentAssembly>
107107

108+
<dependentAssembly>
109+
110+
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
111+
112+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
113+
114+
</dependentAssembly>
115+
116+
<dependentAssembly>
117+
118+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
119+
120+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
121+
122+
</dependentAssembly>
123+
124+
<dependentAssembly>
125+
126+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
127+
128+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
129+
130+
</dependentAssembly>
131+
132+
<dependentAssembly>
133+
134+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
135+
136+
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
137+
138+
</dependentAssembly>
139+
108140
</assemblyBinding>
109141

110142
</runtime>

‎aspnet-samples/AdvancedChatRoom/packages.config‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="jQuery" version="3.3.1" targetFramework="net461" />
4-
<package id="MessagePack" version="1.7.3.4" targetFramework="net461" />
54
<package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
65
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net461" />
76
<package id="Microsoft.AspNet.SignalR" version="2.4.1" targetFramework="net461" />
@@ -15,20 +14,23 @@
1514
<package id="Microsoft.AspNetCore.Http.Connections.Client" version="1.0.0" targetFramework="net461" />
1615
<package id="Microsoft.AspNetCore.Http.Connections.Common" version="1.0.0" targetFramework="net461" />
1716
<package id="Microsoft.AspNetCore.Http.Features" version="2.1.0" targetFramework="net461" />
18-
<package id="Microsoft.Azure.SignalR.AspNet" version="1.0.11" targetFramework="net461" />
19-
<package id="Microsoft.Azure.SignalR.Protocols" version="1.0.11" targetFramework="net461" />
17+
<package id="Microsoft.Azure.SignalR.AspNet" version="1.4.1" targetFramework="net461" />
18+
<package id="Microsoft.Azure.SignalR.Protocols" version="1.4.1" targetFramework="net461" />
2019
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net461" />
2120
<package id="Microsoft.Extensions.Configuration" version="2.1.0" targetFramework="net461" />
2221
<package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.0" targetFramework="net461" />
2322
<package id="Microsoft.Extensions.Configuration.Binder" version="2.1.0" targetFramework="net461" />
23+
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.0" targetFramework="net461" />
2424
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.0" targetFramework="net461" />
2525
<package id="Microsoft.Extensions.Logging" version="2.1.0" targetFramework="net461" />
2626
<package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.0" targetFramework="net461" />
27+
<package id="Microsoft.Extensions.Logging.EventSource" version="2.1.0" targetFramework="net461" />
2728
<package id="Microsoft.Extensions.Logging.TraceSource" version="2.1.0" targetFramework="net461" />
2829
<package id="Microsoft.Extensions.Options" version="2.1.0" targetFramework="net461" />
2930
<package id="Microsoft.Extensions.Primitives" version="2.1.0" targetFramework="net461" />
30-
<package id="Microsoft.IdentityModel.Logging" version="5.2.1" targetFramework="net461" />
31-
<package id="Microsoft.IdentityModel.Tokens" version="5.2.1" targetFramework="net461" />
31+
<package id="Microsoft.IdentityModel.JsonWebTokens" version="5.5.0" targetFramework="net461" />
32+
<package id="Microsoft.IdentityModel.Logging" version="5.5.0" targetFramework="net461" />
33+
<package id="Microsoft.IdentityModel.Tokens" version="5.5.0" targetFramework="net461" />
3234
<package id="Microsoft.Net.Compilers" version="2.6.1" targetFramework="net461" developmentDependency="true" />
3335
<package id="Microsoft.Owin" version="4.0.0" targetFramework="net461" />
3436
<package id="Microsoft.Owin.Host.SystemWeb" version="4.0.0" targetFramework="net461" />
@@ -39,12 +41,12 @@
3941
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
4042
<package id="Owin" version="1.0" targetFramework="net461" />
4143
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
42-
<package id="System.IdentityModel.Tokens.Jwt" version="5.2.1" targetFramework="net461" />
43-
<package id="System.IO.Pipelines" version="4.5.1" targetFramework="net461" />
44-
<package id="System.Memory" version="4.5.1" targetFramework="net461" />
44+
<package id="System.IdentityModel.Tokens.Jwt" version="5.5.0" targetFramework="net461" />
45+
<package id="System.IO.Pipelines" version="4.6.0" targetFramework="net461" />
46+
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
4547
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
46-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net461" />
47-
<package id="System.Threading.Channels" version="4.5.0" targetFramework="net461" />
48-
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
48+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
49+
<package id="System.Threading.Channels" version="4.6.0" targetFramework="net461" />
50+
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net461" />
4951
<package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
5052
</packages>

0 commit comments

Comments
 (0)