update samples to netcore3.1

Author: chenkennt

samples/AdvancedChatRoom/AdvancedChatRoom.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>advancedchatroom</UserSecretsId>
     <RootNamespace>Microsoft.Azure.SignalR.Samples.AdvancedChatRoom</RootNamespace>
     <PackageVersion Condition=" '$(SDKVersion)' != '' ">$(SDKVersion)</PackageVersion>
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.11" />
     <PackageReference Include="Microsoft.Azure.SignalR" Version="1.*" />
   </ItemGroup>
 </Project>

samples/AdvancedChatRoom/Startup.cs

@@ -55,7 +55,7 @@ public void ConfigureServices(IServiceCollection services)
                     };
                 });
 
-            services.AddMvc();
+            services.AddControllers();
             services.AddSignalR()
                 .AddAzureSignalR(options =>
             {
@@ -69,12 +69,14 @@ public void ConfigureServices(IServiceCollection services)
         public void Configure(IApplicationBuilder app)
         {
             app.UseAuthentication();
-            app.UseMvc();
+            app.UseRouting();
             app.UseFileServer();
-            app.UseAzureSignalR(routes =>
+            app.UseAuthorization();
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapHub<ChatJwtSampleHub>("/chatjwt");
-                routes.MapHub<ChatCookieSampleHub>("/chatcookie");
+                endpoints.MapControllers();
+                endpoints.MapHub<ChatJwtSampleHub>("/chatjwt");
+                endpoints.MapHub<ChatCookieSampleHub>("/chatcookie");
             });
         }
     }

samples/FlightMap/FlightMap.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>flightmap</UserSecretsId>
     <RootNamespace>Microsoft.Azure.SignalR.Samples.FlightMap</RootNamespace>
     <UserSecretsId>flightMap</UserSecretsId>
@@ -11,7 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
     <PackageReference Include="Microsoft.Azure.SignalR" Version="1.*" />
   </ItemGroup>
 </Project>

samples/FlightMap/README.md

@@ -29,27 +29,32 @@ In real world scenarios you can replace the web server and the blob storage with
     az signalr create --resource-group <resource_group_name> --name <signalr_name> --sku Standard_S1
     ```
 
-1.  Create a web app using [Azure CLI].
+1.  Create a web app using Azure CLI:
 
     ```
     az appservice plan create --name <plan_name> --resource-group <resource_group_name> --sku S1 --is-linux
     az webapp create \
         --resource-group <resource_group_name> --plan <plan_name> --name <app_name> \
-        --runtime "dotnetcore|2.1"
+        --runtime "dotnetcore|3.1"
     ```
 
 1.  Deploy flight map to web app:
 
-    ```
-    az webapp deployment source config-local-git --resource-group <resource_group_name> --name <app_name>
-    az webapp deployment user set --user-name <user_name> --password <password>
-
-    git init
-    git remote add origin <deploy_git_url>
-    git add -A
-    git commit -m "init commit"
-    git push origin master
-    ```
+    a. Publish the app
+       ```
+       dotnet publish -c Release
+       ```
+
+    b. Package the published app into a zip file (or use whatever zip tool you like to do it)
+       ```
+       cd bin/Release/netcoreapp3.1/publish
+       zip app.zip * -r
+       ```
+
+    c. Publish using Azure CLI
+       ```
+       az webapp deployment source config-zip -n <app_name> -g <resource_group_name> --src app.zip
+       ```
 
 1.  Prepare flight data
 
@@ -80,7 +85,6 @@ In real world scenarios you can replace the web server and the blob storage with
 1.  Update settings of web app:
 
     ```
-    az webapp config appsettings set --resource-group <resource_group_name> --name <app_name> --setting PORT=5000
     az webapp config appsettings set --resource-group <resource_group_name> --name <app_name> \
         --setting Azure__SignalR__ConnectionString=<connection_string>
     az webapp config appsettings set --resource-group <resource_group_name> --name <app_name> \

samples/FlightMap/Startup.cs

@@ -19,17 +19,17 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddSingleton<IFlightControl, FlightControl>();
-            services.AddMvc();
+            services.AddControllers();
             services.AddSignalR().AddAzureSignalR();
         }
 
         public void Configure(IApplicationBuilder app)
         {
-            app.UseMvc();
+            app.UseRouting();
             app.UseFileServer();
-            app.UseAzureSignalR(routes =>
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapHub<FlightMapSampleHub>("/flightData");
+                endpoints.MapHub<FlightMapSampleHub>("/flightData");
             });
         }
     }

samples/FlightMap/wwwroot/index.html

@@ -67,8 +67,8 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/2.2.3/fabric.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@microsoft/[email protected]/dist/browser/signalr.min.js"></script>
     <script src="scripts/util.js"></script>
-    <script src="scripts/signalr.js"></script>
     <script src='scripts/map-canvas.js'></script>
     <script type='text/javascript'>
         // global var