diff --git a/AddHostToProxy/AddHostToProxy.csproj b/AddHostToProxy/AddHostToProxy.csproj index b07b03b..1c8ff43 100644 --- a/AddHostToProxy/AddHostToProxy.csproj +++ b/AddHostToProxy/AddHostToProxy.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 enable enable diff --git a/GenerateYAMLforZabbix/GenerateYAMLforZabbix.csproj b/GenerateYAMLforZabbix/GenerateYAMLforZabbix.csproj index 210ad2e..91c3b64 100644 --- a/GenerateYAMLforZabbix/GenerateYAMLforZabbix.csproj +++ b/GenerateYAMLforZabbix/GenerateYAMLforZabbix.csproj @@ -8,7 +8,7 @@ - + diff --git a/LC_AddCheckToDb/LC_AddCheckToDb.csproj b/LC_AddCheckToDb/LC_AddCheckToDb.csproj index 534849a..88256dd 100644 --- a/LC_AddCheckToDb/LC_AddCheckToDb.csproj +++ b/LC_AddCheckToDb/LC_AddCheckToDb.csproj @@ -2,14 +2,14 @@ Exe - net8.0 + net10.0 enable enable - - + + diff --git a/LC_Api/LC_Api.csproj b/LC_Api/LC_Api.csproj index ad80c05..66ba28c 100644 --- a/LC_Api/LC_Api.csproj +++ b/LC_Api/LC_Api.csproj @@ -9,6 +9,7 @@ + diff --git a/LC_Bot/LC_Bot.csproj b/LC_Bot/LC_Bot.csproj index ca708ac..a62450f 100644 --- a/LC_Bot/LC_Bot.csproj +++ b/LC_Bot/LC_Bot.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 enable enable LCS_logo.ico @@ -13,10 +13,10 @@ - - - - + + + + diff --git a/LC_ConfigCamer/App.config b/LC_ConfigCamer/App.config index 46edd75..0bf4c11 100644 --- a/LC_ConfigCamer/App.config +++ b/LC_ConfigCamer/App.config @@ -11,7 +11,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -27,16 +27,20 @@ - + - + + + + + diff --git a/LC_ConfigCamer/LC_ConfigCamer.csproj b/LC_ConfigCamer/LC_ConfigCamer.csproj index 0aa396f..7df6ee9 100644 --- a/LC_ConfigCamer/LC_ConfigCamer.csproj +++ b/LC_ConfigCamer/LC_ConfigCamer.csproj @@ -1,5 +1,6 @@  + Debug @@ -67,20 +68,26 @@ true - - ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.5\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.10\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll + + ..\packages\Selenium.WebDriver.4.46.0\lib\net462\Selenium.WebDriver.dll + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll + + ..\packages\System.Collections.Immutable.10.0.10\lib\net462\System.Collections.Immutable.dll + - - ..\packages\System.IO.Pipelines.10.0.5\lib\net462\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.10.0.10\lib\net462\System.IO.Pipelines.dll ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll @@ -92,14 +99,14 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Text.Encodings.Web.10.0.5\lib\net462\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.10.0.10\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.10.0.5\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.10.0.10\lib\net462\System.Text.Json.dll - - ..\packages\System.Threading.Channels.10.0.5\lib\net462\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.10.0.10\lib\net462\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll @@ -114,9 +121,6 @@ - - ..\packages\Selenium.WebDriver.4.41.0\lib\net462\WebDriver.dll - @@ -172,13 +176,12 @@ - Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их. Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}. - + \ No newline at end of file diff --git a/LC_ConfigCamer/packages.config b/LC_ConfigCamer/packages.config index 221f4a7..1dcc27b 100644 --- a/LC_ConfigCamer/packages.config +++ b/LC_ConfigCamer/packages.config @@ -1,16 +1,17 @@  - + - + - + + - - - + + + \ No newline at end of file diff --git a/LC_Error/LC_Error.csproj b/LC_Error/LC_Error.csproj index bf52c7f..52ed739 100644 --- a/LC_Error/LC_Error.csproj +++ b/LC_Error/LC_Error.csproj @@ -63,22 +63,22 @@ true - - ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.5\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.10\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll - - ..\packages\System.IO.Pipelines.10.0.5\lib\net462\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.10.0.10\lib\net462\System.IO.Pipelines.dll ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll - - ..\packages\System.Net.Http.Json.10.0.5\lib\net462\System.Net.Http.Json.dll + + ..\packages\System.Net.Http.Json.10.0.10\lib\net462\System.Net.Http.Json.dll @@ -87,11 +87,11 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Text.Encodings.Web.10.0.5\lib\net462\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.10.0.10\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.10.0.5\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.10.0.10\lib\net462\System.Text.Json.dll ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll diff --git a/LC_Error/packages.config b/LC_Error/packages.config index 68d537b..4c8e9b0 100644 --- a/LC_Error/packages.config +++ b/LC_Error/packages.config @@ -1,14 +1,14 @@  - + - + - + - - + + \ No newline at end of file diff --git a/Strela/Controllers/DeviceController.cs b/Strela/Controllers/DeviceController.cs index 7ee0f1b..42b0f2c 100644 --- a/Strela/Controllers/DeviceController.cs +++ b/Strela/Controllers/DeviceController.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Strela.Models; using Strela.Services; @@ -46,7 +45,7 @@ public class DeviceController : ControllerBase return Ok(d); //else return NoContent(); } - } + } #endregion //========================= POST ====================================// @@ -62,12 +61,12 @@ public class DeviceController : ControllerBase } } - + #endregion //========================= DELETE ====================================// #region DELETE - + [HttpDelete("DelDevice")] public IActionResult DelDevice(Guid id) //Удалить устройство по id { @@ -78,6 +77,6 @@ public class DeviceController : ControllerBase db.SaveChanges(); return Ok(); } - } + } #endregion } diff --git a/Strela/Controllers/ObjectController.cs b/Strela/Controllers/ObjectController.cs index 3eb81cb..a3926fb 100644 --- a/Strela/Controllers/ObjectController.cs +++ b/Strela/Controllers/ObjectController.cs @@ -22,7 +22,7 @@ public class ObjectController : ControllerBase using (var db = new SQLiteService()) { var oi = db.ObjectItems.ToList(); - return Ok(oi); + return Ok(oi); } } diff --git a/Strela/Controllers/TypeController.cs b/Strela/Controllers/TypeController.cs index f55afff..cc51514 100644 --- a/Strela/Controllers/TypeController.cs +++ b/Strela/Controllers/TypeController.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Strela.Models; using Strela.Services; @@ -42,7 +41,7 @@ public class TypeController : ControllerBase } } - + #endregion //========================= POST ====================================// @@ -72,6 +71,6 @@ public class TypeController : ControllerBase db.SaveChanges(); return Ok(); } - } + } #endregion } diff --git a/Strela/Services/SQLiteService.cs b/Strela/Services/SQLiteService.cs index ae7718b..7af89f5 100644 --- a/Strela/Services/SQLiteService.cs +++ b/Strela/Services/SQLiteService.cs @@ -3,7 +3,7 @@ using Strela.Models; namespace Strela.Services { - public class SQLiteService: DbContext + public class SQLiteService : DbContext { public SQLiteService() => Database.EnsureCreated(); public virtual DbSet Users { get; set; } diff --git a/Strela/Strela.csproj b/Strela/Strela.csproj index 586bc39..1599835 100644 --- a/Strela/Strela.csproj +++ b/Strela/Strela.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 enable enable a4a5f63c-2231-4614-977a-c009c38846a3 @@ -16,15 +16,15 @@ - - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + diff --git a/Strela/appsettings.json b/Strela/appsettings.json index 10f68b8..8dd331c 100644 --- a/Strela/appsettings.json +++ b/Strela/appsettings.json @@ -1,9 +1,11 @@ { "Logging": { "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Default": "Error", + "Microsoft.AspNetCore": "Error", + "Microsoft.AspNetCore.Hosting.Diagnostics": "Information" } }, + "Urls": "http://0.0.0.0:5050", "AllowedHosts": "*" } diff --git a/Strela/dotnet-tools.json b/Strela/dotnet-tools.json new file mode 100644 index 0000000..cce89d8 --- /dev/null +++ b/Strela/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "10.0.10", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/Visor/Visor/Models/AllPubData.cs b/Visor/Visor/Models/AllPubData.cs index 3328b10..1695e6a 100644 --- a/Visor/Visor/Models/AllPubData.cs +++ b/Visor/Visor/Models/AllPubData.cs @@ -7,7 +7,7 @@ public static List ListDeviceTypeItems { get; set; } = new(); public static HttpClient http { get; set; } = new() { - BaseAddress = new Uri("http://localhost:5262/") + BaseAddress = new Uri("http://172.22.10.31:5050/") }; public static Task GetAll() => _GetAllData(); diff --git a/Wiking/Wiking.csproj b/Wiking/Wiking.csproj index 9828522..58505ff 100644 --- a/Wiking/Wiking.csproj +++ b/Wiking/Wiking.csproj @@ -7,7 +7,7 @@ - + diff --git a/lsSoft.ServiceDefaults/lsSoft.ServiceDefaults.csproj b/lsSoft.ServiceDefaults/lsSoft.ServiceDefaults.csproj index 1b6e209..cf14840 100644 --- a/lsSoft.ServiceDefaults/lsSoft.ServiceDefaults.csproj +++ b/lsSoft.ServiceDefaults/lsSoft.ServiceDefaults.csproj @@ -10,13 +10,14 @@ - - - - - - - + + + + + + + + diff --git a/lsSoft.slnx b/lsSoft.slnx index 1e5299a..fa5f5e8 100644 --- a/lsSoft.slnx +++ b/lsSoft.slnx @@ -1,7 +1,4 @@ - - - @@ -20,7 +17,6 @@ - diff --git a/sync_time_hik/sync_time_hik.csproj b/sync_time_hik/sync_time_hik.csproj index 2150e37..ed9781c 100644 --- a/sync_time_hik/sync_time_hik.csproj +++ b/sync_time_hik/sync_time_hik.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 enable enable