Migrate sample to .NET 8 (#48)

staticwebdev · Dec 5, 2023 · 83d3458 · 83d3458
1 parent c036097
commit 83d3458
Show file tree

Hide file tree

Showing 29 changed files with 308 additions and 184 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -3,4 +3,4 @@
     "ms-azuretools.vscode-azurefunctions",
     "ms-dotnettools.csharp"
   ]
-}
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,26 +1,26 @@
 {
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Launch and Debug Standalone Blazor WebAssembly App",
-      "type": "blazorwasm",
-      "request": "launch",
-      "cwd": "${workspaceFolder}/Client"
-    },
-    {
-      "name": "Attach to .NET Functions",
-      "type": "coreclr",
-      "request": "attach",
-      "processId": "${command:azureFunctions.pickProcess}"
-    }
-  ],
-  "compounds": [
-    {
-      "name": "Client/Server",
-      "configurations": [
-        "Attach to .NET Functions",
-        "Launch and Debug Standalone Blazor WebAssembly App"
-      ]
-    }
-  ]
-}
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch and Debug Standalone Blazor WebAssembly App",
+            "type": "blazorwasm",
+            "request": "launch",
+            "cwd": "${workspaceFolder}/Client"
+        },
+        {
+            "name": "Attach to .NET Functions",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:azureFunctions.pickProcess}"
+        }
+    ],
+    "compounds": [
+      {
+        "name": "Client/Server",
+        "configurations": [
+          "Attach to .NET Functions",
+          "Launch and Debug Standalone Blazor WebAssembly App"
+        ]
+      }
+    ]
+  }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
-  "azureFunctions.deploySubpath": "Api/bin/Release/net6.0/publish",
-  "azureFunctions.projectLanguage": "C#",
-  "azureFunctions.projectRuntime": "~4",
-  "debug.internalConsoleOptions": "neverOpen",
-  "azureFunctions.preDeployTask": "publish"
+    "azureFunctions.deploySubpath": "Api/bin/Release/net8.0/publish",
+    "azureFunctions.projectLanguage": "C#",
+    "azureFunctions.projectRuntime": "~4",
+    "debug.internalConsoleOptions": "neverOpen",
+    "azureFunctions.preDeployTask": "publish (functions)"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -2,7 +2,7 @@
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"label": "clean",
+			"label": "clean (functions)",
 			"command": "dotnet",
 			"args": [
 				"clean",
@@ -16,15 +16,15 @@
 			}
 		},
 		{
-			"label": "build",
+			"label": "build (functions)",
 			"command": "dotnet",
 			"args": [
 				"build",
 				"/property:GenerateFullPaths=true",
 				"/consoleloggerparameters:NoSummary"
 			],
 			"type": "process",
-			"dependsOn": "clean",
+			"dependsOn": "clean (functions)",
 			"group": {
 				"kind": "build",
 				"isDefault": true
@@ -35,7 +35,7 @@
 			}
 		},
 		{
-			"label": "clean release",
+			"label": "clean release (functions)",
 			"command": "dotnet",
 			"args": [
 				"clean",
@@ -51,7 +51,7 @@
 			}
 		},
 		{
-			"label": "publish",
+			"label": "publish (functions)",
 			"command": "dotnet",
 			"args": [
 				"publish",
@@ -61,21 +61,21 @@
 				"/consoleloggerparameters:NoSummary"
 			],
 			"type": "process",
-			"dependsOn": "clean release",
+			"dependsOn": "clean release (functions)",
 			"problemMatcher": "$msCompile",
 			"options": {
 				"cwd": "${workspaceFolder}/Api"
 			}
 		},
 		{
 			"type": "func",
-			"dependsOn": "build",
+			"dependsOn": "build (functions)",
 			"options": {
-				"cwd": "${workspaceFolder}/Api/bin/Debug/net6.0"
+				"cwd": "${workspaceFolder}/Api/bin/Debug/net8.0"
 			},
 			"command": "host start",
 			"isBackground": true,
-			"problemMatcher": "$func-watch"
+			"problemMatcher": "$func-dotnet-watch"
 		}
 	]
 }
diff --git a/Api/Api.csproj b/Api/Api.csproj
@@ -1,13 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.7.0" OutputItemType="Analyzer" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.10.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.20.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.21.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">
@@ -19,6 +23,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Shared\Shared.csproj" />
+    <Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
+	  <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Api/Program.cs b/Api/Program.cs
@@ -1,19 +1,14 @@
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Azure.Functions.Worker;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Azure.Functions.Worker.Configuration;
 
-namespace ApiIsolated
-{
-    public class Program
+var host = new HostBuilder()
+    .ConfigureFunctionsWorkerDefaults()
+    .ConfigureServices(services =>
     {
-        public static void Main()
-        {
-            var host = new HostBuilder()
-                .ConfigureFunctionsWorkerDefaults()
-                .Build();
+        services.AddApplicationInsightsTelemetryWorkerService();
+        services.ConfigureFunctionsApplicationInsights();
+    })
+    .Build();
 
-            host.Run();
-        }
-    }
-}
+host.Run();
diff --git a/Api/Properties/launchSettings.json b/Api/Properties/launchSettings.json
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "Api": {
+      "commandName": "Project",
+      "commandLineArgs": "--port 7071",
+      "launchBrowser": false
+    }
+  }
+}
diff --git a/Api/Properties/serviceDependencies.json b/Api/Properties/serviceDependencies.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights"
+    },
+    "storage1": {
+      "type": "storage",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}
diff --git a/Api/Properties/serviceDependencies.local.json b/Api/Properties/serviceDependencies.local.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights.sdk"
+    },
+    "storage1": {
+      "type": "storage.emulator",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}
diff --git a/Api/WeatherForecastFunction.cs b/Api/WeatherForecastFunction.cs
@@ -1,12 +1,10 @@
-using System;
-using System.Linq;
 using System.Net;
 using BlazorApp.Shared;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Logging;
 
-namespace ApiIsolated
+namespace Api
 {
     public class HttpTrigger
     {

diff --git a/Api/host.json b/Api/host.json
@@ -5,7 +5,8 @@
             "samplingSettings": {
                 "isEnabled": true,
                 "excludedTypes": "Request"
-            }
+            },
+            "enableLiveMetricsFilters": true
         }
     }
 }
diff --git a/Client/Client.csproj b/Client/Client.csproj
@@ -1,19 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <RootNamespace>BlazorApp.Client</RootNamespace>
+	<RootNamespace>BlazorApp.Client</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
   </ItemGroup>
 
+
   <ItemGroup>
-    <ProjectReference Include="..\Shared\Shared.csproj" />
+	<ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Client/Shared/MainLayout.razor → Client/Layout/MainLayout.razor b/Client/Shared/MainLayout.razor → Client/Layout/MainLayout.razor
@@ -1,13 +1,12 @@
 @inherits LayoutComponentBase
-
 <div class="page">
     <div class="sidebar">
         <NavMenu />
     </div>
 
     <main>
         <div class="top-row px-4">
-            <a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
+            <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
         </div>
 
         <article class="content px-4">

diff --git a/Client/Shared/MainLayout.razor.css → Client/Layout/MainLayout.razor.css b/Client/Shared/MainLayout.razor.css → Client/Layout/MainLayout.razor.css
@@ -37,11 +37,7 @@ main {
     }
 
 @media (max-width: 640.98px) {
-    .top-row:not(.auth) {
-        display: none;
-    }
-
-    .top-row.auth {
+    .top-row {
         justify-content: space-between;
     }
 

diff --git a/Client/Shared/NavMenu.razor → Client/Layout/NavMenu.razor b/Client/Shared/NavMenu.razor → Client/Layout/NavMenu.razor
@@ -7,21 +7,21 @@
     </div>
 </div>
 
-<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
+<div class="@NavMenuCssClass nav-scrollable" @onclick="ToggleNavMenu">
     <nav class="flex-column">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="oi oi-home" aria-hidden="true"></span> Home
+                <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
             </NavLink>
         </div>
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="counter">
-                <span class="oi oi-plus" aria-hidden="true"></span> Counter
+                <span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
             </NavLink>
         </div>
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="fetchdata">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
+                <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
             </NavLink>
         </div>
     </nav>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
         "ms-azuretools.vscode-azurefunctions",
         "ms-dotnettools.csharp"
       ]
-    }
+    }