Upgraded to .NET 8, removed .NET 6.0, added .NET 9 support

.github/workflows/web-app.yaml

@@ -20,11 +20,11 @@ jobs:
                 with:
                     fetch-depth: 0
 
-            # sets up .NET 6
+            # sets up .NET 8
             -   name: Setup .NET
                 uses: actions/setup-dotnet@v4
                 with:
-                    dotnet-version: 6.0.x
+                    dotnet-version: 8.0.x
 
             # publishes Blazor project to the release-folder
             -   name: Publish .NET Core Project

Directory.Build.props

@@ -7,7 +7,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>

build/Build.cs

@@ -1,14 +1,13 @@
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using Nuke.Common.CI.GitHubActions;
+using Nuke.Common;
 using Nuke.Common.CI;
+using Nuke.Common.CI.GitHubActions;
 using Nuke.Common.Git;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
-using Nuke.Common.Utilities.Collections;
-using Nuke.Common;
 using Nuke.Common.Tooling;
 using Nuke.Common.Tools.ReportGenerator;
+using Nuke.Common.Utilities.Collections;
 using Nuke.Components;
 
 [GitHubActions(
@@ -21,7 +20,7 @@
     PublishArtifacts = true,
     InvokedTargets = new[] { nameof(ITest.Test), nameof(IReportCoverage.ReportCoverage), nameof(IPack.Pack) },
     CacheKeyFiles = new[] { "global.json", "**/*.csproj" },
-    ImportSecrets = new [] { nameof(IReportCoverage.CodecovToken) },
+    ImportSecrets = new[] { nameof(IReportCoverage.CodecovToken) },
     EnableGitHubToken = true)]
 [GitHubActions(
     "continuous",
@@ -31,7 +30,7 @@
     PublishArtifacts = true,
     InvokedTargets = new[] { nameof(IReportCoverage.ReportCoverage), nameof(IPublish.Publish) },
     CacheKeyFiles = new[] { "global.json", "**/*.csproj" },
-    ImportSecrets = new [] { nameof(PublicNuGetApiKey) },
+    ImportSecrets = new[] { nameof(PublicNuGetApiKey) },
     EnableGitHubToken = true)]
 class Build : NukeBuild,
     IHazChangelog,
@@ -79,7 +78,7 @@ class Build : NukeBuild,
     public bool CreateCoverageHtmlReport => true;
     public bool ReportToCodecov => false; // TODO: #74 RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 
-    public Configure<ReportGeneratorSettings> ReportGeneratorSettings => x => x.SetFramework("net6.0");
+    public Configure<ReportGeneratorSettings> ReportGeneratorSettings => x => x.SetFramework("net8.0");
 
     string PublicNuGetSource => "https://api.nuget.org/v3/index.json";
 
@@ -88,7 +87,7 @@ class Build : NukeBuild,
         : null;
 
 
-    [Parameter] [Secret] readonly string PublicNuGetApiKey;
+    [Parameter][Secret] readonly string PublicNuGetApiKey;
 
     bool IsOriginalRepository => GitRepository.Identifier == "kthompson/glob";
     string IPublish.NuGetApiKey => GitRepository.IsOnMainBranch() ? PublicNuGetApiKey : GitHubActions.Token;

build/_build.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
@@ -11,13 +11,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1">
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Nuke.Common" Version="8.0.0" />
-    <PackageReference Include="Nuke.Components" Version="8.0.0" />
-    <PackageReference Include="Nuke.GitHub" Version="5.0.1" />
+    <PackageReference Include="Nuke.Common" Version="9.0.3" />
+    <PackageReference Include="Nuke.Components" Version="9.0.3" />
+    <PackageReference Include="Nuke.GitHub" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Glob/Glob.csproj

@@ -44,6 +44,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <RootNamespace>GlobExpressions</RootNamespace>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -58,4 +59,8 @@
     <Folder Include="Text" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
+  </ItemGroup>
+
 </Project>

src/GlobApp/GlobApp.csproj

@@ -1,9 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.8" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -15,4 +20,8 @@
       <Link>README.md</Link>
     </Content>
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
+  </ItemGroup>
 </Project>

src/GlobApp/Program.cs

@@ -1,19 +1,12 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+using GlobApp;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
 
-namespace GlobApp;
 
-public class Program
-{
-    public static async Task Main(string[] args)
-    {
-            var builder = WebAssemblyHostBuilder.CreateDefault(args);
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
 
-            builder.RootComponents.Add<App>("app");
-            builder.Services.AddScoped(sp => new HttpClient {BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)});
-            await builder.Build().RunAsync();
-        }
-}
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+
+await builder.Build().RunAsync();

src/GlobApp/Properties/launchSettings.json

@@ -1,29 +1,41 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:57268",
-      "sslPort": 44341
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+    "$schema": "http://json.schemastore.org/launchsettings.json",
+    "iisSettings": {
+        "windowsAuthentication": false,
+        "anonymousAuthentication": true,
+        "iisExpress": {
+            "applicationUrl": "http://localhost:15349",
+            "sslPort": 44359
+        }
     },
-    "GlobApp": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+    "profiles": {
+        "http": {
+            "commandName": "Project",
+            "dotnetRunMessages": true,
+            "launchBrowser": true,
+            "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+            "applicationUrl": "http://localhost:5256",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            }
+        },
+        "https": {
+            "commandName": "Project",
+            "dotnetRunMessages": true,
+            "launchBrowser": true,
+            "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+            "applicationUrl": "https://localhost:7178;http://localhost:5256",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            }
+        },
+        "IIS Express": {
+            "commandName": "IISExpress",
+            "launchBrowser": true,
+            "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+            "environmentVariables": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            }
+        }
     }
-  }
 }