Merge pull request #21 from dbarkol/main

Upgrade to .NET Core 6.0

README.md

@@ -11,7 +11,7 @@ description: "Source code for a site that displays events from Azure Event Grid
 
 # Azure Event Grid Viewer
 
-This repository contains the source code for a site that displays events from Azure Event Grid in near-real time. It is built on ASP.NET Core 3.1 and leverages SignalR to display incoming messages.
+This repository contains the source code for a site that displays events from Azure Event Grid in near-real time. It is built on [ASP.NET Core](https://docs.microsoft.com/aspnet/core) and leverages [SignalR](https://dotnet.microsoft.com/apps/aspnet/signalr) to display incoming messages.
 
 For details about how it was put together, please refer to the [accompanying blog post](https://madeofstrings.com/2018/03/14/azure-event-grid-viewer-with-asp-net-core-and-signalr/).
 
@@ -42,4 +42,4 @@ For example: `https://{{site-name}}.azurewebsites.net/api/updates`
 ### 5. References
 
 - [Routing events to a custom endpoint](https://docs.microsoft.com/azure/storage/blobs/storage-blob-event-quickstart?toc=%2fazure%2fevent-grid%2ftoc.json)
-- [Receive events to an HTTP endpoint](https://docs.microsoft.com/en-us/azure/event-grid/receive-events)
+- [Receive events to an HTTP endpoint](https://docs.microsoft.com/azure/event-grid/receive-events)

azuredeploy.json

@@ -53,7 +53,7 @@
     },
     "resources": [
       {
-        "apiVersion": "2015-08-01",
+        "apiVersion": "2020-12-01",
         "name": "[parameters('hostingPlanName')]",
         "type": "Microsoft.Web/serverfarms",
         "location": "[parameters('location')]",
@@ -66,7 +66,7 @@
         }
       },
       {
-        "apiVersion": "2015-08-01",
+        "apiVersion": "2020-12-01",
         "name": "[parameters('siteName')]",
         "type": "Microsoft.Web/sites",
         "location": "[parameters('location')]",
@@ -76,13 +76,20 @@
         "properties": {
           "serverFarmId": "[parameters('hostingPlanName')]",
           "siteConfig": {
-            "webSocketsEnabled": true         
+            "webSocketsEnabled": true,
+            "netFrameworkVersion":  "v6.0",
+            "metadata": [
+              {
+                "name": "CURRENT_STACK",
+                "value": "dotnet"
+              }              
+            ]         
           },
-          "httpsOnly":true
+          "httpsOnly": true          
         },
         "resources": [
           {
-            "apiVersion": "2018-11-01",
+            "apiVersion": "2020-12-01",
             "name": "web",
             "type": "sourcecontrols",
             "dependsOn": [

viewer/Program.cs

@@ -1,17 +1,26 @@
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Builder;
+using viewer.Hubs;
+using Microsoft.Extensions.DependencyInjection;
 
-namespace viewer
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddRazorPages();
+builder.Services.AddControllers();
+builder.Services.AddSignalR();
+
+var app = builder.Build();
+app.UseHttpsRedirection();
+app.UseStaticFiles();
+app.UseRouting();
+app.UseCookiePolicy();
+
+app.UseEndpoints(endpoints =>
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateWebHostBuilder(args).Build().Run();
-        }
+    endpoints.MapHub<GridEventsHub>("/hubs/gridevents");
+    endpoints.MapControllerRoute(
+            name: "default",
+            pattern: "{controller=Home}/{action=Index}/{id?}");
+});
+
+app.Run();
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>();
-    }
-}

viewer/viewer.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
 </Project>