diff --git a/API/OCM.Net/OCM.API.Client/OCM.API.Client.csproj b/API/OCM.Net/OCM.API.Client/OCM.API.Client.csproj index 30c0ee4f..c84a0701 100644 --- a/API/OCM.Net/OCM.API.Client/OCM.API.Client.csproj +++ b/API/OCM.Net/OCM.API.Client/OCM.API.Client.csproj @@ -1,7 +1,7 @@  8.0.30703 - net8.0 + net9.0 ..\..\..\ OCM.API.Client OCM.API.Client @@ -43,7 +43,7 @@ - + diff --git a/API/OCM.Net/OCM.API.Core/OCM.API.Core.csproj b/API/OCM.Net/OCM.API.Core/OCM.API.Core.csproj index 7cfaaa9e..c9b8f38b 100644 --- a/API/OCM.Net/OCM.API.Core/OCM.API.Core.csproj +++ b/API/OCM.Net/OCM.API.Core/OCM.API.Core.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 Library @@ -57,22 +57,22 @@ - + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - - - + + + diff --git a/API/OCM.Net/OCM.API.Model/OCM.API.Common.Model.csproj b/API/OCM.Net/OCM.API.Model/OCM.API.Common.Model.csproj index c267d795..4ea6ada8 100644 --- a/API/OCM.Net/OCM.API.Model/OCM.API.Common.Model.csproj +++ b/API/OCM.Net/OCM.API.Model/OCM.API.Common.Model.csproj @@ -2,7 +2,7 @@ 8.0.30703 {F330ECA1-D079-4EE0-AEB4-30A3FD67FE03} - net8.0 + net9.0 ..\..\..\ OCM.API.Model http://openchargemap.org diff --git a/API/OCM.Net/OCM.API.Web/OCM.API.Web.csproj b/API/OCM.Net/OCM.API.Web/OCM.API.Web.csproj index d95e0681..6b076f11 100644 --- a/API/OCM.Net/OCM.API.Web/OCM.API.Web.csproj +++ b/API/OCM.Net/OCM.API.Web/OCM.API.Web.csproj @@ -1,14 +1,14 @@  - net8.0 + net9.0 407b1e1a-5108-48b6-bb48-4990a0804269 - - + + diff --git a/API/OCM.Net/OCM.API.Worker/OCM.API.Worker.csproj b/API/OCM.Net/OCM.API.Worker/OCM.API.Worker.csproj index 92233806..c83e8db7 100644 --- a/API/OCM.Net/OCM.API.Worker/OCM.API.Worker.csproj +++ b/API/OCM.Net/OCM.API.Worker/OCM.API.Worker.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable 22dd266a-d0c7-4802-a609-26bd7bda47e9 Linux @@ -9,8 +9,8 @@ - - + + diff --git a/Import/OCM.Import.Analysis/OCM.Import.Analysis.csproj b/Import/OCM.Import.Analysis/OCM.Import.Analysis.csproj index 44342338..351c931e 100644 --- a/Import/OCM.Import.Analysis/OCM.Import.Analysis.csproj +++ b/Import/OCM.Import.Analysis/OCM.Import.Analysis.csproj @@ -1,7 +1,7 @@  {FBD1BB19-0912-4A8C-BE95-197CCDC27CF3} - net8.0 + net9.0 OCM.Import.Analysis OCM.Import.Analysis Copyright © 2015 @@ -28,7 +28,7 @@ - + diff --git a/Import/OCM.Import.Common/NetworkServices/ServiceManager.cs b/Import/OCM.Import.Common/NetworkServices/ServiceManager.cs deleted file mode 100644 index 20b60dc8..00000000 --- a/Import/OCM.Import.Common/NetworkServices/ServiceManager.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Net; -using System.Web.Script.Serialization; -using OCM.Import.NetworkServices.ThirdPartyServices; - -namespace OCM.API.NetworkServices -{ - public class ReservationStatus - { - - } - - public class ReservationRequest - { - public DateTime StartDate { get; set; } - public DateTime DurationMinutes { get; set; } - public string[] Credentials { get; set; } - public string Reference { get; set; } - } - - public class EquipmentStatus - { - public int OCM_ID { get; set; } - public string Status { get; set; } - } - - - public enum ServiceProvider - { - CoulombChargePoint = 10, - SemaConnect = 20, - BlinkNetwork = 30 - } - - public class ServiceManager - { - - public string GetAllResultsAsJSON(ServiceProvider serviceProvider, string apiKey, string apiPwd) - { - if (serviceProvider == ServiceProvider.CoulombChargePoint) - { - //Coulomb notes: logdata.endTime field in Reference.cs autocreated as DateTime but needs to be serialized as string as value is often 24:00, change property type to string - OCM.Import.NetworkServices.ThirdPartyServices.Coulomb.coulombservicesClient svc = new Import.NetworkServices.ThirdPartyServices.Coulomb.coulombservicesClient(); - svc.ClientCredentials.UserName.UserName = apiKey; - svc.ClientCredentials.UserName.Password = apiPwd; - - string output = ""; - OCM.Import.NetworkServices.ThirdPartyServices.Coulomb.logdata[] stationData = { new OCM.Import.NetworkServices.ThirdPartyServices.Coulomb.logdata() { } }; - string result = svc.getAllUSStations(new OCM.Import.NetworkServices.ThirdPartyServices.Coulomb.stationSearchRequest() - { - // Geo = new Import.NetworkServices.ThirdPartyServices.Coulomb.stationSearchRequestGeo { lat = "38.5846", @long = "-121.4961" }, - Country = "USA", - Proximity = 50000, - postalCode = "95816" - }, - out output, out stationData); - - JavaScriptSerializer js = new JavaScriptSerializer(); - js.MaxJsonLength = 10000000; - string outputJS = js.Serialize(stationData); - System.Diagnostics.Debug.WriteLine(""+outputJS+""); - return outputJS; - } - return null; - } - - public int CheckAvailability(int id, DateTime startDate, int durationMins, string[] credentials) - { - return 0; - } - - public bool PerformReservation(int id, DateTime startDate, int durationMins, string[] credentials) - { - return false; - } - - public bool CancelReservation(int id, DateTime startDate, int durationMins, string[] credentials) - { - return false; - } - - public bool UpdateOCMStatus(int id, string connectionRef, int statusTypeID) - { - return true; - } - - public EquipmentStatus GetEquipmentStatus(int id) - { - //looking relevant network provider for equipment - - //if network provider supported, query status - - return new EquipmentStatus() { }; - } - - } -} diff --git a/Import/OCM.Import.Common/OCM.Import.Common.csproj b/Import/OCM.Import.Common/OCM.Import.Common.csproj index 0d490557..490264e0 100644 --- a/Import/OCM.Import.Common/OCM.Import.Common.csproj +++ b/Import/OCM.Import.Common/OCM.Import.Common.csproj @@ -2,7 +2,7 @@ 8.0.30703 OCM.Import - net8.0 + net9.0 ..\..\ OCM.Import.Common http://openchargemap.org @@ -42,14 +42,14 @@ - + - + - - + + @@ -74,12 +74,8 @@ - - - - \ No newline at end of file diff --git a/Import/OCM.Import.Manager.Console/OCM.Import.Manager.Console.csproj b/Import/OCM.Import.Manager.Console/OCM.Import.Manager.Console.csproj index 5906ead5..c7b27880 100644 --- a/Import/OCM.Import.Manager.Console/OCM.Import.Manager.Console.csproj +++ b/Import/OCM.Import.Manager.Console/OCM.Import.Manager.Console.csproj @@ -1,7 +1,7 @@  Exe - net8.0-windows7.0 + net9.0-windows7.0 true true @@ -18,7 +18,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Import/OCM.Import.Manager.UI/OCM.Import.Manager.UI.csproj b/Import/OCM.Import.Manager.UI/OCM.Import.Manager.UI.csproj index 7ee4a3d1..31f2e7e3 100644 --- a/Import/OCM.Import.Manager.UI/OCM.Import.Manager.UI.csproj +++ b/Import/OCM.Import.Manager.UI/OCM.Import.Manager.UI.csproj @@ -1,7 +1,7 @@  WinExe - net8.0-windows7.0 + net9.0-windows7.0 true true @@ -23,12 +23,12 @@ - - - - - - + + + + + + diff --git a/Import/OCM.Import.Worker/Dockerfile b/Import/OCM.Import.Worker/Dockerfile index 312969b1..b1cf7699 100644 --- a/Import/OCM.Import.Worker/Dockerfile +++ b/Import/OCM.Import.Worker/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["Import/OCM.Import.Worker/OCM.Import.Worker.csproj", "Import/OCM.Import.Worker/"] RUN dotnet restore "Import/OCM.Import.Worker/OCM.Import.Worker.csproj" diff --git a/Import/OCM.Import.Worker/OCM.Import.Worker.csproj b/Import/OCM.Import.Worker/OCM.Import.Worker.csproj index 7b2fa00e..502b286a 100644 --- a/Import/OCM.Import.Worker/OCM.Import.Worker.csproj +++ b/Import/OCM.Import.Worker/OCM.Import.Worker.csproj @@ -1,18 +1,18 @@  - net8.0 + net9.0 dotnet-OCM.Import.Worker-31047500-D9C3-4C39-8E22-3C8E9E9091FF Linux ..\.. - - - - - + + + + + diff --git a/Tests/OCM.API.Tests/OCM.API.Tests.csproj b/Tests/OCM.API.Tests/OCM.API.Tests.csproj index df23c217..27229c61 100644 --- a/Tests/OCM.API.Tests/OCM.API.Tests.csproj +++ b/Tests/OCM.API.Tests/OCM.API.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false @@ -64,13 +64,13 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Website/OCM.Web/OCM.Web.csproj b/Website/OCM.Web/OCM.Web.csproj index 9fd50a69..d75d8594 100644 --- a/Website/OCM.Web/OCM.Web.csproj +++ b/Website/OCM.Web/OCM.Web.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 OCM.Web Exe @@ -20,9 +20,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive