Updated server and page manager to .NET 4.8 and MySql 8.3.

Threetwosevensixseven · Jan 27, 2024 · 8eb949e · 8eb949e
1 parent 8ec8e73
commit 8eb949e
Show file tree

Hide file tree

Showing 49 changed files with 199 additions and 2,409 deletions.
diff --git a/.gitignore b/.gitignore
@@ -73,6 +73,6 @@
 /server/NXStaticServer/bin
 /server/NXStaticServer/obj
 /build/*.ps1
-/build/zeustest.exe
 /docs/registrations.txt
 /uart
+.vs
diff --git a/build/zeustest.exe b/build/zeustest.exe
diff --git a/server/ESPATTest/bin/Debug/ESPATTest.exe b/server/ESPATTest/bin/Debug/ESPATTest.exe
diff --git a/server/ESPATTest/bin/Debug/ESPATTest.pdb b/server/ESPATTest/bin/Debug/ESPATTest.pdb
diff --git a/server/Markdown/bin/x86/Release/Markdown.dll b/server/Markdown/bin/x86/Release/Markdown.dll
diff --git a/server/NXtelData/Classes/Geo.cs b/server/NXtelData/Classes/Geo.cs
@@ -132,7 +132,7 @@ private static T LoadJson<T>(string URL)
                         }
                     }
                 }
-                catch (Exception ex)
+                catch (Exception /*ex*/)
                 {
                     var obj2 = JsonConvert.DeserializeObject<T>(EmptyJSON);
                     return obj2;
@@ -147,7 +147,7 @@ private static T LoadJson<T>(string URL)
                 var obj = JsonConvert.DeserializeObject<T>(json);
                 return obj;
             }
-            catch (Exception ex)
+            catch (Exception /*ex*/)
             {
                 var obj = JsonConvert.DeserializeObject<T>(EmptyJSON);
                 return obj;

diff --git a/server/NXtelData/Classes/Route.cs b/server/NXtelData/Classes/Route.cs
@@ -128,7 +128,7 @@ public static Route GetRoute(string CurrentPageNo, string CurrentFrame, string P
                 if (CurrentFrameNo < 0)
                     CurrentFrameNo = -1;
 
-                byte KeyCode = 0;
+                //byte KeyCode = 0;
                 string sql = @"SELECT @CurrentPageNo AS CurrentPageNo,@CurrentFrameNo AS CurrentFrameNo,
                     @NextPageNo AS NextPageNo,@NextFrameNo AS NextFrameNo,
                     @GoNextPage AS GoNextPage,@GoNextFrame AS GoNextFrame,dp.PageID AS DirectPageID,dp.PageNo AS DirectPageNo,dp.FrameNo AS DirectFrameNo,

diff --git a/server/NXtelData/Classes/Settings.cs b/server/NXtelData/Classes/Settings.cs
@@ -41,7 +41,7 @@ public Settings Load()
                 }
                 settings.appDir = appDir;
             }
-            catch (Exception ex)
+            catch (Exception /*ex*/)
             {
                 settings = new Settings(appDir);
             }

diff --git a/server/NXtelData/Classes/User.cs b/server/NXtelData/Classes/User.cs
@@ -188,7 +188,7 @@ public static string GetUniqueMailbox()
             catch (Exception ex)
             {
                 throw ex;
-                return "";
+                //return "";
             }
         }
 

diff --git a/server/NXtelData/NXtelData.csproj b/server/NXtelData/NXtelData.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NXtelData</RootNamespace>
     <AssemblyName>NXtelData</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -63,6 +63,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -72,11 +73,11 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mysql.data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\mysql.data.dll</HintPath>
+    <Reference Include="MySql.Data, Version=8.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\NXtelManager\lib\MySql.Data.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>

diff --git a/server/NXtelData/app.config b/server/NXtelData/app.config
@@ -6,10 +6,14 @@
         <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-3.6.0.0" newVersion="3.6.0.0"/>
       </dependentAssembly>
-    </assemblyBinding>
+      <dependentAssembly>
+		<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d"/>
+		<bindingRedirect oldVersion="1.0.0.0-8.3.0.0" newVersion="8.3.0.0"/>
+	  </dependentAssembly>
+	</assemblyBinding>
   </runtime>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <system.data>
     <DbProviderFactories>

diff --git a/server/NXtelData/mysql.data.dll b/server/NXtelData/mysql.data.dll
diff --git a/server/NXtelData/packages.config b/server/NXtelData/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MySql.Data" version="6.7.9" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net48" requireReinstallation="true" />
 </packages>
diff --git a/server/NXtelGeo/App.config b/server/NXtelGeo/App.config
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <appSettings>
         <add key="GeoEndpoint" value="http://ip-api.com/json/{{IP}}?fields=status,lat,lon"/>
         <add key="GeoRequestsPerMinute" value="175"/>
     </appSettings>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/server/NXtelGeo/NXtelGeo.csproj b/server/NXtelGeo/NXtelGeo.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NXtelGeo</RootNamespace>
     <AssemblyName>NXtelGeo</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -27,6 +27,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/server/NXtelLogImport/App.config b/server/NXtelLogImport/App.config
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <appSettings>
-    <add key="ImportLogFile" value="C:\Users\robin\Documents\Visual Studio 2015\Projects\NXtel\tmp\logs\NXtelServerLog_Prod_002.txt" />
-    <add key="TimestampCutoff" value="2019-05-29 13:57:31" />
-    <add key="HashSalt" value="m8FYG8w5LZwV78tu" />
-    <add key="TimestampCutoff_Test" value="2019-05-29 13:57:31" />
-    <add key="TimestampCutoff_Prod" value="2019-05-29 13:57:41" />
+    <add key="ImportLogFile" value="C:\Users\robin\Documents\Visual Studio 2015\Projects\NXtel\tmp\logs\NXtelServerLog_Prod_002.txt"/>
+    <add key="TimestampCutoff" value="2019-05-29 13:57:31"/>
+    <add key="HashSalt" value="m8FYG8w5LZwV78tu"/>
+    <add key="TimestampCutoff_Test" value="2019-05-29 13:57:31"/>
+    <add key="TimestampCutoff_Prod" value="2019-05-29 13:57:41"/>
   </appSettings>
-</configuration>
+</configuration>
diff --git a/server/NXtelLogImport/NXtelLogImport.csproj b/server/NXtelLogImport/NXtelLogImport.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NXtelLogImport</RootNamespace>
     <AssemblyName>NXtelLogImport</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -21,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/server/NXtelLogImport/bin/Debug/NXtelLogImport.exe b/server/NXtelLogImport/bin/Debug/NXtelLogImport.exe
diff --git a/server/NXtelLogImport/bin/Debug/NXtelLogImport.exe.config b/server/NXtelLogImport/bin/Debug/NXtelLogImport.exe.config
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <appSettings>
-    <add key="ImportLogFile" value="C:\Users\robin\Documents\Visual Studio 2015\Projects\NXtel\tmp\logs\NXtelServerLog_Prod_002.txt" />
-    <add key="TimestampCutoff" value="2019-05-29 13:57:31" />
-    <add key="HashSalt" value="m8FYG8w5LZwV78tu" />
-    <add key="TimestampCutoff_Test" value="2019-05-29 13:57:31" />
-    <add key="TimestampCutoff_Prod" value="2019-05-29 13:57:41" />
+    <add key="ImportLogFile" value="C:\Users\robin\Documents\Visual Studio 2015\Projects\NXtel\tmp\logs\NXtelServerLog_Prod_002.txt"/>
+    <add key="TimestampCutoff" value="2019-05-29 13:57:31"/>
+    <add key="HashSalt" value="m8FYG8w5LZwV78tu"/>
+    <add key="TimestampCutoff_Test" value="2019-05-29 13:57:31"/>
+    <add key="TimestampCutoff_Prod" value="2019-05-29 13:57:41"/>
   </appSettings>
-</configuration>
+</configuration>
diff --git a/server/NXtelManager/Controllers/MessageController.cs b/server/NXtelManager/Controllers/MessageController.cs
@@ -23,12 +23,12 @@ public ActionResult Save(MessageComposeModel Model)
         {
             if (ModelState.IsValid)
             {
-                string err;
+                //string err;
                 //if (!Model.Zone.Save(out err))
                 {
                     return View("Edit", Model);
                 }
-                return RedirectToAction("Index");
+                //return RedirectToAction("Index");
             }
             return View("Edit", Model);
         }

diff --git a/server/NXtelManager/Controllers/UserPreferenceController.cs b/server/NXtelManager/Controllers/UserPreferenceController.cs
@@ -35,7 +35,7 @@ public ActionResult Set(UserPreferences Pref)
                 UserPreferences.Set(userID, Pref.Key, (Pref.Value ?? "").ToString());
                 return AllowGet(true);
             }
-            catch (Exception ex)
+            catch (Exception /*ex*/)
             {
             }
             return AllowGet(false);