Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions aspnet-samples/AdvancedChatRoom/ChatSample.AspNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
<Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.AspNetCore.Http.Features.2.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.SignalR.AspNet, Version=1.4.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.0\lib\net461\Microsoft.Azure.SignalR.AspNet.dll</HintPath>
<Reference Include="Microsoft.Azure.SignalR.AspNet, Version=1.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.1\lib\net461\Microsoft.Azure.SignalR.AspNet.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.SignalR.Common, Version=1.4.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.0\lib\net461\Microsoft.Azure.SignalR.Common.dll</HintPath>
<Reference Include="Microsoft.Azure.SignalR.Common, Version=1.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.1\lib\net461\Microsoft.Azure.SignalR.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.SignalR.Protocols, Version=1.4.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.Protocols.1.4.0\lib\netstandard2.0\Microsoft.Azure.SignalR.Protocols.dll</HintPath>
<Reference Include="Microsoft.Azure.SignalR.Protocols, Version=1.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.Protocols.1.4.1\lib\netstandard2.0\Microsoft.Azure.SignalR.Protocols.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Extensions.Configuration, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions aspnet-samples/AdvancedChatRoom/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<package id="Microsoft.AspNetCore.Http.Connections.Client" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.AspNetCore.Http.Connections.Common" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.AspNetCore.Http.Features" version="2.1.0" targetFramework="net461" />
<package id="Microsoft.Azure.SignalR.AspNet" version="1.4.0" targetFramework="net461" />
<package id="Microsoft.Azure.SignalR.Protocols" version="1.4.0" targetFramework="net461" />
<package id="Microsoft.Azure.SignalR.AspNet" version="1.4.1" targetFramework="net461" />
<package id="Microsoft.Azure.SignalR.Protocols" version="1.4.1" targetFramework="net461" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net461" />
<package id="Microsoft.Extensions.Configuration" version="2.1.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.0" targetFramework="net461" />
Expand Down
12 changes: 6 additions & 6 deletions aspnet-samples/ChatRoom/ChatRoom.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@
<Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.AspNetCore.Http.Features.2.1.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.SignalR.AspNet, Version=1.4.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.0\lib\net461\Microsoft.Azure.SignalR.AspNet.dll</HintPath>
<Reference Include="Microsoft.Azure.SignalR.AspNet, Version=1.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.1\lib\net461\Microsoft.Azure.SignalR.AspNet.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.SignalR.Common, Version=1.4.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.0\lib\net461\Microsoft.Azure.SignalR.Common.dll</HintPath>
<Reference Include="Microsoft.Azure.SignalR.Common, Version=1.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.AspNet.1.4.1\lib\net461\Microsoft.Azure.SignalR.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.SignalR.Protocols, Version=1.4.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.Protocols.1.4.0\lib\netstandard2.0\Microsoft.Azure.SignalR.Protocols.dll</HintPath>
<Reference Include="Microsoft.Azure.SignalR.Protocols, Version=1.4.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Azure.SignalR.Protocols.1.4.1\lib\netstandard2.0\Microsoft.Azure.SignalR.Protocols.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Extensions.Configuration, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions aspnet-samples/ChatRoom/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<package id="Microsoft.AspNetCore.Http.Connections.Client" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.AspNetCore.Http.Connections.Common" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.AspNetCore.Http.Features" version="2.1.0" targetFramework="net461" />
<package id="Microsoft.Azure.SignalR.AspNet" version="1.4.0" targetFramework="net461" />
<package id="Microsoft.Azure.SignalR.Protocols" version="1.4.0" targetFramework="net461" />
<package id="Microsoft.Azure.SignalR.AspNet" version="1.4.1" targetFramework="net461" />
<package id="Microsoft.Azure.SignalR.Protocols" version="1.4.1" targetFramework="net461" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net461" />
<package id="Microsoft.Extensions.Configuration" version="2.1.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.0" targetFramework="net461" />
Expand Down
2 changes: 1 addition & 1 deletion samples/AdvancedChatRoom/AdvancedChatRoom.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.0.*" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.*" />
</ItemGroup>
</Project>
24 changes: 0 additions & 24 deletions samples/AdvancedChatRoom/Dockerfile

This file was deleted.

21 changes: 6 additions & 15 deletions samples/AdvancedChatRoom/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Azure SignalR Service Advanced Chat Room
=================================

Just like [ChatRoom sample](../ChatRoom), you can leverage Azure SignalR Service to handle more clients and offload the connection management part. This sample demonstrates more operations available in Azure SignalR Service. Also provided docker image to simplify build environment problems.
Just like [ChatRoom sample](../ChatRoom), you can leverage Azure SignalR Service to handle more clients and offload the connection management part. This sample demonstrates more operations available in Azure SignalR Service.

Now the sample supports:

Expand All @@ -13,22 +13,13 @@ Now the sample supports:
* Cookie / JWT based Authentication
* Role / Claim / Policy based Authrization

## Build Docker Images
## Run the sample locally

First check the SDK version needed. Each SDKVerison will build a separate docker image and the tag is the sdk version.
```bash
# build-image.sh
declare -a SDKVersion=("1.0.0-preview1-10009" "1.0.0-preview1-10011" "1.0.0-preview1-10015" "1.0.0-preview1-10200")
Type the following commands to run this app.
```

Then run the script to build docker images.
```bash
./build-image.sh
```

You can run the image with Azure Signalr Service.
```bash
docker run -e Azure__SignalR__ConnectionString="<your connection string>" -p 5000:80 signalr-advancedchatroom:<sdk version>
dotnet restore
dotnet user-secrets set Azure:SignalR:ConnectionString "<your connection string>"
dotnet run
```

Open the broswer with url `localhost:5000`, you can see the sample just like Chat Sample but has more operations.
14 changes: 0 additions & 14 deletions samples/AdvancedChatRoom/build-image.sh

This file was deleted.

2 changes: 1 addition & 1 deletion samples/FlightMap/FlightMap.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.0.*" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.*" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion samples/GitHubChat/GitHubChat.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<ItemGroup>
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="2.0.0-rc2-final" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.0.*" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.*" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.0.*" />
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.*" />
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.0.*" />
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.*" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/Management/SignalRClient/SignalRClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.0.*" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.*" />
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/ReliableChatRoom/ReliableChatRoom.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.*" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.0.*" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.*" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion samples/ServerSideBlazor/ServerSideBlazor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.*" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/Serverless/Serverless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="1.0.*" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.0.*" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.*" />
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />
</ItemGroup>
Expand Down