upgrade to net 8

thepirat000 · Oct 30, 2024 · 56e66f9 · 56e66f9
1 parent ae089a7
commit 56e66f9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/SpleeterAPI.csproj b/SpleeterAPI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>770f53e5-6b9c-4a58-b73c-528f7f74dc1d</UserSecretsId>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AspNetCoreModuleName>AspNetCoreModuleV2</AspNetCoreModuleName>
@@ -68,13 +68,13 @@
 
   <ItemGroup>
     <PackageReference Include="IpData" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.5" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
-    <PackageReference Include="Audit.NET" Version="14.8.0" />
-    <PackageReference Include="Audit.NET.Udp" Version="14.8.0" />
-    <PackageReference Include="Audit.WebApi" Version="14.8.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.6" />
+    <PackageReference Include="Audit.NET" Version="27.1.1" />
+    <PackageReference Include="Audit.NET.Udp" Version="27.1.1" />
+    <PackageReference Include="Audit.WebApi.Core" Version="27.1.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Split/GeoLocationHelper.cs b/Split/GeoLocationHelper.cs
@@ -29,8 +29,8 @@ public static string GetGeoLocation(string ip)
 
         public static async Task<IpInfo> GetIpInfo(string ip)
         {
-            IpInfo info;
-            if (!_ipInfoCache.TryGetValue(ip, out info))
+            IpInfo info = null;
+            if (ip.Length > 5 && !_ipInfoCache.TryGetValue(ip, out info))
             {
                 info = await _client.Lookup(ip);
                 _ipInfoCache.TryAdd(ip, info);

diff --git a/Startup/Startup.cs b/Startup/Startup.cs
@@ -12,6 +12,7 @@
 using System.IO;
 using Microsoft.OpenApi.Models;
 using System.Linq;
+using System.Text.Json.Serialization;
 
 namespace SpleeterAPI
 {
@@ -41,7 +42,7 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddControllers()
                 .AddJsonOptions(json => {
-                    json.JsonSerializerOptions.IgnoreNullValues = true;
+                    json.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
                     json.JsonSerializerOptions.WriteIndented = true;
                 });
 
@@ -142,10 +143,11 @@ public static void EphemeralLog(string text, bool important)
             }
 
             Console.WriteLine(text);
-            Audit.Core.AuditScope.CreateAndSave("Ephemeral", new { Status = text });
+            Audit.Core.AuditScope.Log("Ephemeral", new { Status = text });
         }
 
-        private static object _fleLogLocker = new object();
+        private static readonly object _fleLogLocker = new object();
+
         public static void FileLog(string text, bool noAppend = false)
         {
             var logFile = GetFileLogPath();

diff --git a/appsettings.json b/appsettings.json
@@ -28,11 +28,11 @@
   },
   "Kestrel": {
     "Certificates": {
-      "Default": {
-        "Subject": "spl.eastus.cloudapp.azure.com",
-        "Store": "Root",
-        "Location": "LocalMachine"
-      }
+      //"Default": {
+      //  "Subject": "spl.eastus.cloudapp.azure.com",
+      //  "Store": "Root",
+      //  "Location": "LocalMachine"
+      //}
     }
   },
   "AllowedHosts": "*"

diff --git a/docs/splitter.js b/docs/splitter.js
@@ -2,9 +2,9 @@ var buttonSplit = $("#btn-split");
 
 var max_duration_mins = 30;
 
-var split_yt_api = 'https://spl.eastus.cloudapp.azure.com/yt';
-var split_test_api = 'https://spl.eastus.cloudapp.azure.com/test';
-var split_mp3_api = 'https://spl.eastus.cloudapp.azure.com/mp3';
+var split_yt_api = 'https://localhost:7280/yt';
+var split_test_api = 'https://localhost:7280/test';
+var split_mp3_api = 'https://localhost:7280/mp3';
 
 var selectedFiles = [];
 var dropzone;