.net Framework 4.8

bassmaster187 · Jan 20, 2023 · 69fd392 · 69fd392
1 parent c677eb9
commit 69fd392
Show file tree

Hide file tree

Showing 13 changed files with 130 additions and 87 deletions.
diff --git a/Logfile/Logfile.csproj b/Logfile/Logfile.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Logfile</RootNamespace>
     <AssemblyName>Logfile</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/MQTTClient/App.config b/MQTTClient/App.config
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="MQTTClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="MQTTClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
     <applicationSettings>
         <MQTTClient.Properties.Settings>
             <setting name="MQTTHost" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="MQTTPort" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Topic" serializeAs="String">
                 <value>Tesla</value>
@@ -23,14 +23,14 @@
                 <value>False</value>
             </setting>
             <setting name="Name" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Password" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="ClientID" serializeAs="String">
-                <value />
+                <value/>
             </setting>
         </MQTTClient.Properties.Settings>
     </applicationSettings>
-</configuration>
+</configuration>
diff --git a/MQTTClient/MQTTClient.csproj b/MQTTClient/MQTTClient.csproj
@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>MQTTClient</RootNamespace>
     <AssemblyName>MQTTClient</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/MQTTClient/Properties/Settings.Designer.cs b/MQTTClient/Properties/Settings.Designer.cs
diff --git a/OSMMapGenerator/OSMMapGenerator.csproj b/OSMMapGenerator/OSMMapGenerator.csproj
@@ -7,7 +7,8 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>OSMMapGenerator</RootNamespace>
     <AssemblyName>OSMMapGenerator</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,6 +41,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

diff --git a/OSMMapGenerator/app.config b/OSMMapGenerator/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/TeslaLogger/NearbySuCService.cs b/TeslaLogger/NearbySuCService.cs
@@ -69,81 +69,117 @@ private void Work()
                     string result = string.Empty;
                     try
                     {
-                        result = car.webhelper.GetNearbyChargingSites().Result;
-                        if (result == null || result == "NULL")
-                            continue;
-
-                        if (result.Contains("Retry later"))
-                        {
-                            Tools.DebugLog("NearbySuCService: Retry later");
-                            return;
-                        }
-                        else if (result.Contains("vehicle unavailable"))
-                        {
-                            Tools.DebugLog("NearbySuCService: vehicle unavailable");
-                            return;
-                        }
-                        else if (result.Contains("502 Bad Gateway"))
+                        bool logSent = true;
+
+                        double lat = car.CurrentJSON.GetLatitude();
+                        double lng = car.CurrentJSON.GetLongitude();
+                        /*
+                        for (double lat = 20; lat < 55; lat += 5)
+                            for(double lng = -124; lng < -61; lng += 5)
+                        */
                         {
-                            Tools.DebugLog("NearbySuCService: 502 Bad Gateway");
-                            return;
-                        }
+                            result = car.webhelper.GetNearbyChargingSites(lat, lng).Result;
+                            if (result == null || result == "NULL")
+                            {
+                                continue;
+                            }
 
-                        dynamic jsonResult = JsonConvert.DeserializeObject(result);
-                        if (jsonResult == null)
-                            continue;
+                            if (result.Contains("Retry later"))
+                            {
+                                Tools.DebugLog("NearbySuCService: Retry later");
+                                return;
+                            }
+                            else if (result.Contains("vehicle unavailable"))
+                            {
+                                Tools.DebugLog("NearbySuCService: vehicle unavailable");
+                                return;
+                            }
+                            else if (result.Contains("502 Bad Gateway"))
+                            {
+                                Tools.DebugLog("NearbySuCService: 502 Bad Gateway");
+                                return;
+                            }
 
-                        if (jsonResult.ContainsKey("data"))
-                        {
-                            dynamic data = jsonResult["data"];
-                            if (data == null)
+                            dynamic jsonResult = JsonConvert.DeserializeObject(result);
+                            if (jsonResult == null)
                                 continue;
 
-                            if (data.ContainsKey("charging"))
+                            if (jsonResult.ContainsKey("data"))
                             {
-                                dynamic charging = data["charging"];
-                                if (charging == null)
+                                dynamic data = jsonResult["data"];
+                                if (data == null)
                                     continue;
 
-                                if (charging.ContainsKey("nearbySites"))
+                                if (data.ContainsKey("charging"))
                                 {
-                                    dynamic nearbySites = charging["nearbySites"];
-                                    if (nearbySites == null)
+                                    dynamic charging = data["charging"];
+                                    if (charging == null)
                                         continue;
 
-                                    if (nearbySites.ContainsKey("sitesAndDistances"))
+                                    if (charging.ContainsKey("nearbySites"))
                                     {
-                                        dynamic superchargers = nearbySites["sitesAndDistances"];
-                                        foreach (dynamic suc in superchargers)
+                                        dynamic nearbySites = charging["nearbySites"];
+                                        if (nearbySites == null)
+                                            continue;
+
+                                        if (nearbySites.ContainsKey("sitesAndDistances"))
                                         {
-                                            /*
-                  {
-                    "location": { "lat": 33.848756, "long": -84.36434 },
-                    "name": "Atlanta, GA - Peachtree Road",
-                    "type": "supercharger",
-                    "distance_miles": 10.868304,
-                    "available_stalls": 4,
-                    "total_stalls": 5,
-                    "site_closed": false
-                  }
-                                             */
-
-                                            try
-                                            {
-                                                AddSuperchargerState(suc, send, result);
-                                            }
-                                            catch (Exception ex)
+                                            car.webhelper.nearbySuCServiceOK++;
+                                            car.Log("nearbySuCServiceOK " + car.webhelper.nearbySuCServiceOK);
+
+                                            dynamic superchargers = nearbySites["sitesAndDistances"];
+                                            foreach (dynamic suc in superchargers)
                                             {
-                                                car.CreateExceptionlessClient(ex).AddObject(result, "ResultContent").Submit();
-                                                Logfile.Log(ex.ToString());
+                                                /*
+                      {
+                        "location": { "lat": 33.848756, "long": -84.36434 },
+                        "name": "Atlanta, GA - Peachtree Road",
+                        "type": "supercharger",
+                        "distance_miles": 10.868304,
+                        "available_stalls": 4,
+                        "total_stalls": 5,
+                        "site_closed": false
+                      }
+                                                 */
+
+                                                try
+                                                {
+                                                    AddSuperchargerState(suc, send, result);
+                                                }
+                                                catch (Exception ex)
+                                                {
+                                                    car.CreateExceptionlessClient(ex).AddObject(result, "ResultContent").Submit();
+                                                    Logfile.Log(ex.ToString());
+                                                }
                                             }
                                         }
                                     }
                                 }
+
+                                if (logSent)
+                                {
+                                    string firstname = "";
+                                    try
+                                    {
+                                        if (send.Count > 0)
+                                        {
+                                            dynamic d = send[0];
+                                            firstname = d["n"];
+                                        }
+                                    }
+                                    catch (Exception ex)
+                                    { System.Diagnostics.Debug.WriteLine(ex.ToString()); }
+
+                                    car.Log("SuC sent: " + send.Count + " lat:" + lat + " lng: " + lng + " - " + firstname);
+                                }
+
+                                if (send.Count > 0)
+                                    ShareSuc(send);
+
+                                send.Clear();
                             }
 
-                            if (send.Count > 0)
-                                ShareSuc(send);
+                            Thread.Sleep(1000);
                         }
                         Thread.Sleep(30000);
                     }

diff --git a/TeslaLogger/TeslaLogger.csproj b/TeslaLogger/TeslaLogger.csproj
@@ -13,7 +13,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>TeslaLogger</RootNamespace>
     <AssemblyName>TeslaLogger</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />

diff --git a/UnitTestsTeslalogger/Settings.Designer.cs b/UnitTestsTeslalogger/Settings.Designer.cs
diff --git a/UnitTestsTeslalogger/UnitTestsTeslalogger.csproj b/UnitTestsTeslalogger/UnitTestsTeslalogger.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UnitTestsTeslalogger</RootNamespace>
     <AssemblyName>UnitTestsTeslalogger</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>

diff --git a/UnitTestsTeslalogger/app.config b/UnitTestsTeslalogger/app.config
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="UnitTestsTeslalogger.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="UnitTestsTeslalogger.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.15.0.0" newVersion="3.15.0.0" />
+        <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.15.0.0" newVersion="3.15.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <applicationSettings>
     <UnitTestsTeslalogger.Settings>
       <setting name="ElectricityMeterGoEURL" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="MapQuestKey" serializeAs="String">
-        <value />
+        <value/>
       </setting>
     </UnitTestsTeslalogger.Settings>
   </applicationSettings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/UnitTestsTeslalogger/packages.config b/UnitTestsTeslalogger/packages.config
@@ -3,6 +3,6 @@
   <package id="MSTest.TestAdapter" version="2.2.8" targetFramework="net452" />
   <package id="MSTest.TestFramework" version="2.2.8" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
-  <package id="Selenium.WebDriver" version="4.1.0" targetFramework="net452" />
+  <package id="Selenium.WebDriver" version="4.1.0" targetFramework="net452" requireReinstallation="true" />
   <package id="Selenium.WebDriver.ChromeDriver" version="98.0.4758.10200" targetFramework="net452" />
 </packages>
diff --git a/srtm/src/SRTM/SRTM.csproj b/srtm/src/SRTM/SRTM.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
   </PropertyGroup>