Merge pull request #38 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
 
@@ -362,4 +380,110 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+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
+*.db*

Pandatech.Crypto.sln

@@ -0,0 +1,15 @@
+<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/Pandatech.Crypto/Pandatech.Crypto.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/Pandatech.Crypto.Tests/Pandatech.Crypto.Tests.csproj" />
+  </Folder>
+</Solution>

Pandatech.Crypto.slnx

@@ -230,6 +230,7 @@ if (JoseJwe.TryDecrypt(privateJwk, jwe, out var bytes))
 ```
 
 #### Security notes
+
 - RSA key **size ≥ 2048** bits (enforced).
 - `kid` must match the supplied `publicJwk` (enforced).
 - This is **encryption only** (no authenticity). If you need signing later, add JWS separately.

Readme.md

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

global.json

@@ -5,21 +5,23 @@ namespace Pandatech.Crypto.Extensions;
 
 public static class WebAppExtensions
 {
-   public static WebApplicationBuilder AddAes256Key(this WebApplicationBuilder builder, string aesKey)
+   extension(WebApplicationBuilder builder)
    {
-      Aes256.RegisterKey(aesKey);
-      Aes256SivLegacy.RegisterKey(aesKey);
-      Aes256Gcm.RegisterKey(aesKey);
-      Aes256Siv.RegisterKey(aesKey);
-      return builder;
-   }
+      public WebApplicationBuilder AddAes256Key(string aesKey)
+      {
+         Aes256.RegisterKey(aesKey);
+         Aes256SivLegacy.RegisterKey(aesKey);
+         Aes256Gcm.RegisterKey(aesKey);
+         Aes256Siv.RegisterKey(aesKey);
+         return builder;
+      }
 
-   public static WebApplicationBuilder ConfigureArgon2Id(this WebApplicationBuilder builder,
-      Action<Argon2IdOptions> configure)
-   {
-      var options = new Argon2IdOptions();
-      configure(options);
-      Argon2Id.Configure(options);
-      return builder;
+      public WebApplicationBuilder ConfigureArgon2Id(Action<Argon2IdOptions> configure)
+      {
+         var options = new Argon2IdOptions();
+         configure(options);
+         Argon2Id.Configure(options);
+         return builder;
+      }
    }
 }