Merge pull request #85 from PandaTechAM/development

dotnet 10 upgrade

Author: HaikAsatryan

.github/workflows/main.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: global.json
 

.gitignore

@@ -1,9 +1,10 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from `dotnet new gitignore`
 
-.idea
+# dotenv files
+.env
 
 # User-specific files
 *.rsuser
@@ -31,7 +32,6 @@ x86/
 bld/
 [Bb]in/
 [Oo]bj/
-[Oo]ut/
 [Ll]og/
 [Ll]ogs/
 
@@ -60,11 +60,14 @@ dlldata.c
 # Benchmark Results
 BenchmarkDotNet.Artifacts/
 
-# .NET Core
+# .NET
 project.lock.json
 project.fragment.lock.json
 artifacts/
 
+# Tye
+.tye/
+
 # ASP.NET Scaffolding
 ScaffoldingReadMe.txt
 
@@ -93,6 +96,7 @@ StyleCopReport.xml
 *.tmp_proj
 *_wpftmp.csproj
 *.log
+*.tlog
 *.vspscc
 *.vssscc
 .builds
@@ -296,6 +300,17 @@ node_modules/
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -352,6 +367,9 @@ ASALocalRun/
 # Local History for Visual Studio
 .localhistory/
 
+# Visual Studio History (VSHistory) files
+.vshistory/
+
 # BeatPulse healthcheck temp database
 healthchecksdb
 
@@ -364,6 +382,107 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+*.sln.iml
+.idea/
+
+##
+## Visual studio for Mac
+##
+
+
+# globs
+Makefile.in
+*.userprefs
+*.usertasks
+config.make
+config.status
+aclocal.m4
+install-sh
+autom4te.cache/
+*.tar.gz
+tarballs/
+test-results/
+
+# Mac bundle stuff
+*.dmg
+*.app
+
+# content below from: https://github.com/github/gitignore/blob/main/Global/macOS.gitignore
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# content below from: https://github.com/github/gitignore/blob/main/Global/Windows.gitignore
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# Vim temporary swap files
+*.swp
+
 # Added by me
 logs
 LocalFileStorage

SharedKernel.Demo/MessageHub.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.SignalR;
 using ResponseCrafter.ExceptionHandlers.SignalR;
+using System.Threading;
 
 namespace SharedKernel.Demo;
 

SharedKernel.Demo/SharedKernel.Demo.csproj

@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="9.0.0"/>
-        <PackageReference Include="MassTransit.RabbitMQ" Version="8.5.5" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8"/>
+        <PackageReference Include="MassTransit.RabbitMQ" Version="8.5.7" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.1" />
     </ItemGroup>
 
     <ItemGroup>

SharedKernel.sln

@@ -0,0 +1,16 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".github/workflows/main.yml" />
+    <File Path=".gitignore" />
+    <File Path="global.json" />
+    <File Path="Readme.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/SharedKernel/SharedKernel.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="SharedKernel.Demo/SharedKernel.Demo.csproj" />
+    <Project Path="test/SharedKernel.Tests/SharedKernel.Tests.csproj" />
+  </Folder>
+</Solution>

SharedKernel.slnx

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.200",
+    "version": "10.0.101",
     "rollForward": "latestMinor"
   }
 }

global.json

@@ -9,47 +9,30 @@ internal static class ConfigurationExtensions
    private const string RepositoryNameConfigurationPath = "RepositoryName";
    private const string TimeZoneConfigurationPath = "DefaultTimeZone";
 
-   internal static string GetAllowedCorsOrigins(this IConfiguration configuration)
+   extension(IConfiguration configuration)
    {
-      var corsOrigins = configuration[CorsOriginsConfigurationPath];
-      if (corsOrigins is null)
+      internal string GetAllowedCorsOrigins()
       {
-         throw new InvalidOperationException("Allowed CORS origins are not configured.");
+         var corsOrigins = configuration[CorsOriginsConfigurationPath];
+         return corsOrigins ?? throw new InvalidOperationException("Allowed CORS origins are not configured.");
       }
 
-      return corsOrigins;
-   }
-
-   internal static string GetRepositoryName(this IConfiguration configuration)
-   {
-      var repositoryName = configuration[RepositoryNameConfigurationPath];
-      if (repositoryName is null)
+      internal string GetRepositoryName()
       {
-         throw new InvalidOperationException("Repository name is not configured.");
+         var repositoryName = configuration[RepositoryNameConfigurationPath];
+         return repositoryName ?? throw new InvalidOperationException("Repository name is not configured.");
       }
 
-      return repositoryName;
-   }
-
-   internal static string GetPersistentPath(this IConfiguration configuration)
-   {
-      var persistentPath = configuration.GetConnectionString(PersistentConfigurationPath);
-      if (persistentPath is null)
+      internal string GetPersistentPath()
       {
-         throw new InvalidOperationException("Persistent path is not configured.");
+         var persistentPath = configuration.GetConnectionString(PersistentConfigurationPath);
+         return persistentPath ?? throw new InvalidOperationException("Persistent path is not configured.");
       }
 
-      return persistentPath;
-   }
-
-   public static string GetDefaultTimeZone(this IConfiguration configuration)
-   {
-      var timeZone = configuration[TimeZoneConfigurationPath];
-      if (timeZone is null)
+      public string GetDefaultTimeZone()
       {
-         throw new InvalidOperationException("Default time zone is not configured.");
+         var timeZone = configuration[TimeZoneConfigurationPath];
+         return timeZone ?? throw new InvalidOperationException("Default time zone is not configured.");
       }
-
-      return timeZone;
    }
 }

src/SharedKernel/Extensions/ConfigurationExtensions.cs

@@ -41,8 +41,7 @@ public static WebApplication MapHealthCheckEndpoints(this WebApplication app)
       app
          .MapGet($"{EndpointConstants.BasePath}/ping", () => "pong")
          .Produces<string>()
-         .WithTags(EndpointConstants.TagName)
-         .WithOpenApi();
+         .WithTags(EndpointConstants.TagName);
 
       app.MapHealthChecks($"{EndpointConstants.BasePath}/health",
          new HealthCheckOptions