platformplatform · tjementum · Nov 19, 2024 · Nov 18, 2024 · Nov 18, 2024 · Nov 18, 2024
@@ -59,13 +59,12 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore .NET tools
         working-directory: application
         run: |
-          dotnet tool restore &&
-          dotnet workload install aspire
+          dotnet tool restore
 
       - name: Restore .NET dependencies
         working-directory: application
@@ -160,13 +159,12 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore .NET tools
         working-directory: application
         run: |
-          dotnet tool restore &&
-          dotnet workload install aspire
+          dotnet tool restore
 
       - name: Restore .NET dependencies
         working-directory: application

@@ -57,13 +57,12 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore .NET tools
         working-directory: application
         run: |
-          dotnet tool restore &&
-          dotnet workload install aspire
+          dotnet tool restore
 
       - name: Restore .NET dependencies
         working-directory: application
@@ -108,13 +107,12 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore .NET tools
         working-directory: application
         run: |
-          dotnet tool restore &&
-          dotnet workload install aspire
+          dotnet tool restore
 
       - name: Restore .NET dependencies
         working-directory: application

@@ -59,13 +59,12 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore .NET tools
         working-directory: application
         run: |
-          dotnet tool restore &&
-          dotnet workload install aspire
+          dotnet tool restore
 
       - name: Restore .NET dependencies
         working-directory: application
@@ -160,13 +159,12 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore .NET tools
         working-directory: application
         run: |
-          dotnet tool restore &&
-          dotnet workload install aspire
+          dotnet tool restore
 
       - name: Restore .NET dependencies
         working-directory: application

diff --git a/application/AppGateway/AppGateway.csproj b/application/AppGateway/AppGateway.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <AssemblyName>PlatformPlatform.AppGateway</AssemblyName>
         <RootNamespace>PlatformPlatform.AppGateway</RootNamespace>
         <Nullable>enable</Nullable>

diff --git a/application/AppGateway/Dockerfile b/application/AppGateway/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine
 
 WORKDIR /app
 COPY ./AppGateway/publish .

diff --git a/application/AppHost/AppHost.csproj b/application/AppHost/AppHost.csproj
@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsAspireHost>true</IsAspireHost>

diff --git a/application/AppHost/SslCertificateManager.cs b/application/AppHost/SslCertificateManager.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.Extensions.Configuration;
@@ -10,10 +9,7 @@
 
 public static class SslCertificateManager
 {
-    public static readonly bool IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-
-    private static string UserSecretsId =>
-        Assembly.GetEntryAssembly()!.GetCustomAttribute<UserSecretsIdAttribute>()!.UserSecretsId;
+    private static string UserSecretsId => Assembly.GetEntryAssembly()!.GetCustomAttribute<UserSecretsIdAttribute>()!.UserSecretsId;
 
     public static string CreateSslCertificateIfNotExists(this IDistributedApplicationBuilder builder)
     {
@@ -24,9 +20,13 @@
                                   ?? builder.CreateStablePassword(certificatePasswordKey).Resource.Value;
 
         var certificateLocation = GetCertificateLocation("localhost");
-        if (!IsValidCertificate(certificatePassword, certificateLocation))
+        try
+        {
+            X509CertificateLoader.LoadPkcs12FromFile(certificateLocation, certificatePassword);
+        }
+        catch (CryptographicException)
         {
-            CreateNewSelfSignedDeveloperCertificate(certificatePassword, certificateLocation);
+            CreateNewSelfSignedDeveloperCertificate(certificateLocation, certificatePassword);
         }
 
         return certificatePassword;
@@ -38,77 +38,23 @@
         return $"{userFolder}/.aspnet/dev-certs/https/{domain}.pfx";
     }
 
-    private static bool IsValidCertificate(string? password, string certificateLocation)
-    {
-        if (!File.Exists(certificateLocation))
-        {
-            return false;
-        }
-
-        if (IsWindows)
-        {
-            try
-            {
-                // Try to load the certificate with the provided password
-                _ = new X509Certificate2(certificateLocation, password);
-                return true;
-            }
-            catch (CryptographicException)
-            {
-                // If a CryptographicException is thrown, the password is invalid
-                // Ignore the exception and return false
-            }
-        }
-        else
-        {
-            var certificateValidation = StartProcess(new ProcessStartInfo
-                {
-                    FileName = "openssl",
-                    Arguments = $"pkcs12 -in {certificateLocation} -passin pass:{password} -nokeys",
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true,
-                    CreateNoWindow = true
-                }
-            );
-
-            if (certificateValidation.Contains("--BEGIN CERTIFICATE--"))
-            {
-                return true;
-            }
-        }
-
-        Console.WriteLine($"Certificate {certificateLocation} exists, but password {password} was invalid. Creating a new certificate.");
-        return false;
-    }
-
-    private static void CreateNewSelfSignedDeveloperCertificate(string password, string certificateLocation)
+    private static void CreateNewSelfSignedDeveloperCertificate(string certificateLocation, string password)
     {
         if (File.Exists(certificateLocation))
         {
+            Console.WriteLine($"Certificate {certificateLocation} exists, but password {password} was invalid. Creating a new certificate.");
+
             File.Delete(certificateLocation);
         }
 
-        StartProcess(new ProcessStartInfo
+        Process.Start(new ProcessStartInfo
             {
                 FileName = "dotnet",
                 Arguments = $"dev-certs https --trust -ep {certificateLocation} -p {password}",
                 RedirectStandardOutput = false,
                 RedirectStandardError = false,
                 UseShellExecute = false
             }
-        );
-    }
-
-    private static string StartProcess(ProcessStartInfo processStartInfo)
-    {
-        var process = Process.Start(processStartInfo)!;
-
-        var output = string.Empty;
-        if (processStartInfo.RedirectStandardOutput) output += process.StandardOutput.ReadToEnd();
-        if (processStartInfo.RedirectStandardError) output += process.StandardError.ReadToEnd();
-
-        process.WaitForExit();
-
-        return output;
+        )!.WaitForExit();
     }
 }
diff --git a/application/Directory.Packages.props b/application/Directory.Packages.props
@@ -29,13 +29,13 @@
     <PackageVersion Include="Meziantou.Xunit.ParallelTestFramework" Version="2.3.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.22.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="8.0.10">
+    <PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="9.0.0">
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         <PrivateAssets>all</PrivateAssets>
     </PackageVersion>

diff --git a/application/account-management/Api/AccountManagement.Api.csproj b/application/account-management/Api/AccountManagement.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <AssemblyName>PlatformPlatform.AccountManagement.Api</AssemblyName>
         <RootNamespace>PlatformPlatform.AccountManagement.Api</RootNamespace>
         <Nullable>enable</Nullable>

diff --git a/application/account-management/Api/Dockerfile b/application/account-management/Api/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine
 
 RUN apk add --no-cache icu-libs
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false

diff --git a/application/account-management/Core/AccountManagement.csproj b/application/account-management/Core/AccountManagement.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <AssemblyName>PlatformPlatform.AccountManagement</AssemblyName>
         <RootNamespace>PlatformPlatform.AccountManagement</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/application/account-management/Tests/AccountManagement.Tests.csproj b/application/account-management/Tests/AccountManagement.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <AssemblyName>PlatformPlatform.AccountManagement.Tests</AssemblyName>
         <RootNamespace>PlatformPlatform.AccountManagement.Tests</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/application/account-management/WebApp/AccountManagement.WebApp.esproj b/application/account-management/WebApp/AccountManagement.WebApp.esproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <ShouldRunNpmInstall>false</ShouldRunNpmInstall>
         <ShouldRunBuildScript>false</ShouldRunBuildScript>
-        <TargetFrameworkMoniker>net8.0</TargetFrameworkMoniker>
+        <TargetFrameworkMoniker>net9.0</TargetFrameworkMoniker>
         <DefaultItemExcludes>$(DefaultItemExcludes);dist\**;*.config.*;*.d.ts</DefaultItemExcludes>
         <NpmInstallCheck>$(MSBuildProjectDirectory)\..\..\package-lock.json</NpmInstallCheck>
     </PropertyGroup>

diff --git a/application/account-management/Workers/AccountManagement.Workers.csproj b/application/account-management/Workers/AccountManagement.Workers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <AssemblyName>PlatformPlatform.AccountManagement.Workers</AssemblyName>
         <RootNamespace>PlatformPlatform.AccountManagement.Workers</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/application/account-management/Workers/Dockerfile b/application/account-management/Workers/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine
 
 RUN apk add --no-cache icu-libs
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false

diff --git a/application/back-office/Api/BackOffice.Api.csproj b/application/back-office/Api/BackOffice.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <AssemblyName>PlatformPlatform.BackOffice.Api</AssemblyName>
         <RootNamespace>PlatformPlatform.BackOffice.Api</RootNamespace>
         <Nullable>enable</Nullable>

diff --git a/application/back-office/Api/Dockerfile b/application/back-office/Api/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine
 
 RUN apk add --no-cache icu-libs
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false

diff --git a/application/back-office/Core/BackOffice.csproj b/application/back-office/Core/BackOffice.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <AssemblyName>PlatformPlatform.BackOffice</AssemblyName>
         <RootNamespace>PlatformPlatform.BackOffice</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/application/back-office/Tests/BackOffice.Tests.csproj b/application/back-office/Tests/BackOffice.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <AssemblyName>PlatformPlatform.BackOffice.Tests</AssemblyName>
         <RootNamespace>PlatformPlatform.BackOffice.Tests</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/application/back-office/WebApp/BackOffice.WebApp.esproj b/application/back-office/WebApp/BackOffice.WebApp.esproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <ShouldRunNpmInstall>false</ShouldRunNpmInstall>
         <ShouldRunBuildScript>false</ShouldRunBuildScript>
-        <TargetFrameworkMoniker>net8.0</TargetFrameworkMoniker>
+        <TargetFrameworkMoniker>net9.0</TargetFrameworkMoniker>
         <DefaultItemExcludes>$(DefaultItemExcludes);dist\**;*.config.*;*.d.ts</DefaultItemExcludes>
         <NpmInstallCheck>$(MSBuildProjectDirectory)\..\..\package-lock.json</NpmInstallCheck>
     </PropertyGroup>

diff --git a/application/back-office/Workers/BackOffice.Workers.csproj b/application/back-office/Workers/BackOffice.Workers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <AssemblyName>PlatformPlatform.BackOffice.Workers</AssemblyName>
         <RootNamespace>PlatformPlatform.BackOffice.Workers</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/application/back-office/Workers/Dockerfile b/application/back-office/Workers/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine
 
 RUN apk add --no-cache icu-libs
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false

diff --git a/application/global.json b/application/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.400",
+    "version": "9.0.100",
     "rollForward": "latestMinor"
   }
 }
diff --git a/application/shared-kernel/SharedKernel/Configuration/SharedInfrastructureConfiguration.cs b/application/shared-kernel/SharedKernel/Configuration/SharedInfrastructureConfiguration.cs
@@ -3,6 +3,7 @@
 using Azure.Storage.Blobs;
 using Microsoft.ApplicationInsights.AspNetCore.Extensions;
 using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -120,7 +121,8 @@ private static IHostApplicationBuilder AddConfigureOpenTelemetry(this IHostAppli
     {
         builder.Services.Configure<AspNetCoreTraceInstrumentationOptions>(options =>
             {
-                options.Filter = httpContext =>
+                // ReSharper disable once RedundantLambdaParameterType
+                options.Filter = (HttpContext httpContext) =>
                 {
                     var requestPath = httpContext.Request.Path.ToString();