Merge branch 'main' of https://github.com/sanderdewit/SynoAI

sanderdewit · Nov 22, 2024 · f15d743 · f15d743
2 parents d3b02be + 7653bda
commit f15d743
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/compile_upload.yml b/.github/workflows/compile_upload.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.x
 
     - name: Install dotnet-outdated
       run: dotnet tool install --global dotnet-outdated-tool
@@ -72,7 +72,9 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Build the Docker image
-      run: docker build -t dewitauto/synoai-fork:latest SynoAI
+      #run: docker build -t dewitauto/synoai-fork:latest SynoAI
+      run: docker build --build-arg DOTNET_VERSION=9.0 -t dewitauto/synoai-fork:latest SynoAI
+
 
     - name: Login to Docker Hub
       uses: docker/login-action@v3

diff --git a/SynoAI.Tests/packages.lock.json b/SynoAI.Tests/packages.lock.json
@@ -823,8 +823,8 @@
       },
       "Telegram.Bot": {
         "type": "Transitive",
-        "resolved": "22.1.2",
-        "contentHash": "5ehl9lwENSULyxJ86kIVXS5a3V9XvAYvorSEmlf7mDY747eoVZmnS0dyqgWbkaE9GoTOxbpre8s2D+n5+8ZxLw==",
+        "resolved": "22.1.3",
+        "contentHash": "sEY7ihfNuvrcGRYsvTwtKQpLP2WJnnLK7FiVwMN3fZe5cDTed3w9SUNZA6Q8jC3QmVR/zW8BeRoJXkHkeOV2VQ==",
         "dependencies": {
           "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0",
           "System.Text.Json": "8.0.5"
@@ -881,7 +881,7 @@
           "SkiaSharp.NativeAssets.Linux": "[2.88.9, )",
           "Swashbuckle.AspNetCore": "[7.0.0, )",
           "System.Drawing.Common": "[9.0.0, )",
-          "Telegram.Bot": "[22.1.2, )"
+          "Telegram.Bot": "[22.1.3, )"
         }
       }
     }

diff --git a/SynoAI/SynoAI.csproj b/SynoAI/SynoAI.csproj
@@ -37,7 +37,7 @@
 		<PackageReference Include="SkiaSharp" Version="2.88.9" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
-		<PackageReference Include="Telegram.Bot" Version="22.1.2" />
+		<PackageReference Include="Telegram.Bot" Version="22.1.3" />
 		<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
 	</ItemGroup>
 

diff --git a/SynoAI/packages.lock.json b/SynoAI/packages.lock.json
@@ -72,9 +72,9 @@
       },
       "Telegram.Bot": {
         "type": "Direct",
-        "requested": "[22.1.2, )",
-        "resolved": "22.1.2",
-        "contentHash": "5ehl9lwENSULyxJ86kIVXS5a3V9XvAYvorSEmlf7mDY747eoVZmnS0dyqgWbkaE9GoTOxbpre8s2D+n5+8ZxLw==",
+        "requested": "[22.1.3, )",
+        "resolved": "22.1.3",
+        "contentHash": "sEY7ihfNuvrcGRYsvTwtKQpLP2WJnnLK7FiVwMN3fZe5cDTed3w9SUNZA6Q8jC3QmVR/zW8BeRoJXkHkeOV2VQ==",
         "dependencies": {
           "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0",
           "System.Text.Json": "8.0.5"