Merge pull request bassmaster187#1446 from motzky/NET8_fix_compile_an…

…d_test Fix compile issues and PackageReferences in NET8 branch
motzky · Jan 17, 2025 · ddbe501 · ddbe501
2 parents c8787f3 + 8900047
commit ddbe501
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/OSMMapGenerator/OSMMapGenerator.cs b/OSMMapGenerator/OSMMapGenerator.cs
@@ -739,7 +739,7 @@ private static SKBitmap DownloadTile(int zoom, int tile_x, int tile_y)
                     if (debug) Console.WriteLine("Download:" + url);
                     try
                     {
-                        using (WebClient wc = new WebClient())
+                        using (var wc = new WebClient())
                         {
                             wc.Headers["User-Agent"] = "TeslaLogger.OSMMapGenerator";
                             wc.DownloadFile(url, localMapCacheFilePath);

diff --git a/TeslaLogger/DBHelper.cs b/TeslaLogger/DBHelper.cs
@@ -7402,8 +7402,6 @@ from pos
                     return cmd.LastInsertedId;
                 }
             }
-
-            return 0;
         }
     }
 }
diff --git a/TeslaLogger/TeslaLoggerNET8.csproj b/TeslaLogger/TeslaLoggerNET8.csproj
@@ -111,14 +111,14 @@
     <Content Include="www\wakeup.php" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.0" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
     <PackageReference Include="Exceptionless" Version="6.0.3" />
     <PackageReference Include="Google.Protobuf" Version="3.25.3" />
     <PackageReference Include="HttpMultipartParser" Version="8.3.0" />
     <PackageReference Include="K4os.Compression.LZ4" Version="1.3.6" />
     <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.6" />
     <PackageReference Include="K4os.Hash.xxHash" Version="1.0.8" />
-    <PackageReference Include="M2Mqtt" Version="4.3.0" />
+    <PackageReference Include="M2MqttDotnetCore" Version="1.1.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/TeslaLogger/WebServer.cs b/TeslaLogger/WebServer.cs
@@ -386,7 +386,7 @@ private void OnContext(object o)
                         Dev_DumpJSON(response, true);
                         break;
                     case bool _ when request.Url.LocalPath.Equals("/dev/dumpJSON/off", System.StringComparison.Ordinal):
-                        Dev_DumpJSON(response, false);
+                        Dev_DumpJSON(response, false); 
                         break;
                     case bool _ when request.Url.LocalPath.Equals("/dev/verbose/on", System.StringComparison.Ordinal):
                         Program.VERBOSE = true;

diff --git a/UnitTestsTeslalogger/UnitTestDB.cs b/UnitTestsTeslalogger/UnitTestDB.cs
@@ -21,7 +21,7 @@ public static void ClassInit(TestContext context)
 
             UpdateTeslalogger.Start();
 
-            while (UpdateTeslalogger.Done == false)
+            while (UpdateTeslalogger.done.IsCancellationRequested == false)
             {
                 System.Threading.Thread.Sleep(100);
             }

diff --git a/UnitTestsTeslalogger/UnitTestsTeslaloggerNET8.csproj b/UnitTestsTeslalogger/UnitTestsTeslaloggerNET8.csproj
@@ -35,6 +35,8 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
+    <PackageReference Include="moq" Version="4.20.72" />
+    <PackageReference Include="M2MqttDotnetCore" Version="1.1.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.18.1" />

diff --git a/srtm/src/SRTM/SRTMNET8.csproj b/srtm/src/SRTM/SRTMNET8.csproj
@@ -28,6 +28,6 @@
     <ProjectReference Include="..\..\..\Logfile\LogfileNET8.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.IO.Compression" />
+    <PackageReference Include="System.IO.Compression" Version="4.3.0" />
   </ItemGroup>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7402,8 +7402,6 @@ from pos @@
                         return cmd.LastInsertedId;
                     }
                 }
-                return 0;
             }
         }
     }