fix: ExcelPackage.License instead ExcelPackage.LicenseContext

Signed-off-by: Polianin Nikita <wesser@noreply.git.winsomnia.net>

.github/workflows/code-analyze.yaml

@@ -25,6 +25,7 @@ jobs:
           sonarHostname:  ${{ secrets.SONAR_HOST_URL }}
           dotnetPreBuildCmd: dotnet nuget add source --name="Winsomnia" --username ${{ secrets.NUGET_USERNAME }} --password ${{ secrets.NUGET_PASSWORD }} --store-password-in-clear-text ${{ secrets.NUGET_ADDRESS }} && dotnet format --verify-no-changes --diagnostics -v diag --severity warn
           dotnetTestArguments: --logger trx --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
+          dotnetBuildArguments: -c Release
           sonarBeginArguments: /d:sonar.cs.opencover.reportsPaths="**/TestResults/**/coverage.opencover.xml" -d:sonar.cs.vstest.reportsPaths="**/TestResults/*.trx"
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

ApiDto/ApiDto.csproj

@@ -1,13 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>disable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Company>Winsomnia</Company>
-		<Version>1.0.0</Version>
-		<AssemblyVersion>1.0.3.0</AssemblyVersion>
-		<FileVersion>1.0.3.0</FileVersion>
 		<AssemblyName>Mirea.Api.Dto</AssemblyName>
 		<RootNamespace>$(AssemblyName)</RootNamespace>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>

Backend.sln

@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Elements of the solution",
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		.github\workflows\code-analyze.yaml = .github\workflows\code-analyze.yaml
+		Directory.Build.props = Directory.Build.props
 		Dockerfile = Dockerfile
 		LICENSE.txt = LICENSE.txt
 		README.md = README.md

Directory.Build.props

@@ -0,0 +1,14 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <Company>Winsomnia</Company>
+    <Version>1.1.0</Version>
+    <AssemblyVersion>1.1.3.0</AssemblyVersion>
+    <FileVersion>1.1.3.0</FileVersion>
+  </PropertyGroup>
+
+</Project>

Endpoint/Common/Services/CronUpdateSkipService.cs

@@ -45,7 +45,7 @@ public static class CronUpdateSkipService
         if (depth <= 0)
             return [];
 
-        DateTimeOffset nextRunTime = (currentDate?.ToDateTime(TimeOnly.MinValue) ?? DateTime.Now).ToUniversalTime();
+        DateTimeOffset nextRunTime = (currentDate?.ToDateTime(TimeOnly.MinValue) ?? DateTime.Now);
         List<DateTimeOffset> result = [];
 
         do
@@ -68,7 +68,7 @@ public static class CronUpdateSkipService
                 continue;
             }
 
-            result.Add(nextOccurrence.Value.ToLocalTime());
+            result.Add(nextOccurrence.Value);
             nextRunTime = nextOccurrence.Value.AddMinutes(1);
 
         } while (result.Count < depth);

Endpoint/Controllers/V1/ImportController.cs

@@ -52,7 +52,7 @@ public class ImportController(IMediator mediator, IOptionsSnapshot<GeneralConfig
             LessonTypeIds = request.LessonType
         })).Schedules.ToList();
 
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Winsomnia");
         using var package = new ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Расписание");
 

Endpoint/Endpoint.csproj

@@ -1,13 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>disable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Company>Winsomnia</Company>
-		<Version>1.0.0</Version>
-		<AssemblyVersion>1.0.3.0</AssemblyVersion>
-		<FileVersion>1.0.3.0</FileVersion>
 		<AssemblyName>Mirea.Api.Endpoint</AssemblyName>
 		<RootNamespace>$(AssemblyName)</RootNamespace>
 		<OutputType>Exe</OutputType>
@@ -23,49 +16,62 @@
 		<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
 		<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="9.0.0" />
 		<PackageReference Include="AspNetCore.HealthChecks.System" Version="9.0.0" />
-		<PackageReference Include="Cronos" Version="0.9.0" />
+    <PackageReference Include="Cronos" Version="0.10.0" />
-    <PackageReference Include="EPPlus" Version="7.6.0" />
+    <PackageReference Include="EPPlus" Version="8.0.5" />
-		<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
+    <PackageReference Include="EPPlus.System.Drawing" Version="8.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.12" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.12.1" />
-		<PackageReference Include="Microsoft.Build.Framework" Version="17.12.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.16" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1">
+    <PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.5">
       <PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="9.0.1">
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="9.0.5">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.4.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.5" />
-		<PackageReference Include="Mirea.Tools.Schedule.Parser" Version="1.2.5" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.5" />
-		<PackageReference Include="Mirea.Tools.Schedule.WebParser" Version="1.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.10.0" />
+    <PackageReference Include="Microsoft.Win32.SystemEvents" Version="9.0.5" />
+    <PackageReference Include="Mirea.Tools.Schedule.Parser" Version="1.2.7" />
+    <PackageReference Include="Mirea.Tools.Schedule.WebParser" Version="1.0.7" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="Serilog" Version="4.2.0" />
 		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
 		<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
 		<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
 		<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
-		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.5" />
 		<PackageReference Include="Serilog.Sinks.Seq" Version="9.0.0" />
-		<PackageReference Include="StackExchange.Redis" Version="2.8.24" />
+    <PackageReference Include="StackExchange.Redis" Version="2.8.37" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
-		<PackageReference Include="System.CodeDom" Version="[8.0.0, 9.0.0)" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="8.1.1" />
-		<PackageReference Include="System.Composition" Version="[8.0.0, 9.0.0)" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="8.1.1" />
-		<PackageReference Include="System.Composition.AttributedModel" Version="9.0.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
-		<PackageReference Include="System.Composition.Convention" Version="9.0.1" />
+    <PackageReference Include="System.Composition" Version="9.0.5" />
-		<PackageReference Include="System.Composition.Hosting" Version="9.0.1" />
+    <PackageReference Include="System.Composition.AttributedModel" Version="9.0.5" />
-		<PackageReference Include="System.Composition.Runtime" Version="9.0.1" />
+    <PackageReference Include="System.Composition.Convention" Version="9.0.5" />
-		<PackageReference Include="System.Composition.TypedParts" Version="9.0.1" />
+    <PackageReference Include="System.Composition.Hosting" Version="9.0.5" />
-		<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
+    <PackageReference Include="System.Composition.Runtime" Version="9.0.5" />
-		<PackageReference Include="System.Drawing.Common" Version="9.0.1" />
+    <PackageReference Include="System.Composition.TypedParts" Version="9.0.5" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.4.0" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="9.0.5" />
-		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.1" />
+    <PackageReference Include="System.Formats.Asn1" Version="9.0.5" />
-		<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.10.0" />
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.1" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.5" />
-		<PackageReference Include="System.Threading.Channels" Version="[8.0.0, 9.0.0)" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.5" />
-		<PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="9.103.7" />
+    <PackageReference Include="System.Text.Json" Version="9.0.5" />
+    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="9.103.8.1" />
 	</ItemGroup>
 
 	<ItemGroup>

Endpoint/Program.cs

@@ -19,6 +19,7 @@ using Mirea.Api.Endpoint.Configuration.Model;
 using Mirea.Api.Endpoint.Configuration.Validation;
 using Mirea.Api.Endpoint.Configuration.Validation.Validators;
 using Mirea.Api.Security.Services;
+using OfficeOpenXml;
 using System;
 using System.IO;
 
@@ -158,6 +159,8 @@ public class Program
 
         app.MapControllers();
 
+        ExcelPackage.License.SetNonCommercialOrganization("Winsomnia");
+
         app.Run();
     }
 }

README.md

@@ -86,12 +86,11 @@ To set up the `redirect URL` when registering and logging in using OAuth 2, use
 
 **Where:**
 
-- `{schema}` is the protocol you are using (`http` or `https').
+- `{schema}` is the protocol you are using (`http` or `https`).
 - `{domain}` is your domain (for example, `mydomain.com` or IP address).
-- `{portString}` is a port string that is only needed if your application is running on a non—standard port (for
+- `{portString}` is a port string that is only needed if your application is running on a non-standard port (for
   example, `:8080`). If you use standard ports (`80` for `http` and `443` for `https`), this parameter can be omitted.
-- `{ACTUAL_SUB_PATH}` is the path to your API that you specify in the settings. If it ends with `/api', then don't add `
+- `{ACTUAL_SUB_PATH}` is the path to your API that you specify in the settings. If it ends with `/api`, then don't add `/api` at the end of the URL.
-  /api` at the end of the URL.
 
 **Examples:**
 

Security/Security.csproj

@@ -1,13 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>disable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Company>Winsomnia</Company>
-		<Version>1.0.0</Version>
-		<AssemblyVersion>1.0.3.0</AssemblyVersion>
-		<FileVersion>1.0.3.0</FileVersion>
 		<AssemblyName>Mirea.Api.Security</AssemblyName>
 		<RootNamespace>$(AssemblyName)</RootNamespace>
 		<OutputType>Library</OutputType>
@@ -15,10 +8,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
-		<PackageReference Include="System.Memory" Version="4.6.0" />
 	</ItemGroup>
 
 </Project>

SqlData/Application/Application.csproj

@@ -1,22 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>disable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Company>Winsomnia</Company>
-		<Version>1.0.0</Version>
-		<AssemblyVersion>1.0.3.0</AssemblyVersion>
-		<FileVersion>1.0.3.0</FileVersion>
 		<AssemblyName>Mirea.Api.DataAccess.Application</AssemblyName>
 		<RootNamespace>$(AssemblyName)</RootNamespace>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation" Version="11.11.0" />
+		<PackageReference Include="FluentValidation" Version="12.0.0" />
-		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
+		<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
-		<PackageReference Include="MediatR" Version="12.4.1" />
+		<PackageReference Include="MediatR" Version="12.5.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
 	</ItemGroup>
 
 	<ItemGroup>

SqlData/Domain/Domain.csproj

@@ -1,13 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>disable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Company>Winsomnia</Company>
-		<Version>1.0.0</Version>
-		<AssemblyVersion>1.0.3.0</AssemblyVersion>
-		<FileVersion>1.0.3.0</FileVersion>
 		<AssemblyName>Mirea.Api.DataAccess.Domain</AssemblyName>
 		<RootNamespace>$(AssemblyName)</RootNamespace>
 	</PropertyGroup>

SqlData/Migrations/MysqlMigrations/MysqlMigrations.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
 		<BaseOutputPath>..\..\Persistence\bin\</BaseOutputPath>
 	</PropertyGroup>
 

SqlData/Migrations/PsqlMigrations/PsqlMigrations.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
 		<BaseOutputPath>..\..\Persistence\bin\</BaseOutputPath>
 	</PropertyGroup>
 

SqlData/Migrations/SqliteMigrations/SqliteMigrations.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
 		<BaseOutputPath>..\..\Persistence\bin\</BaseOutputPath>
 	</PropertyGroup>
 

SqlData/Persistence/Persistence.csproj

@@ -1,13 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<ImplicitUsings>disable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Company>Winsomnia</Company>
-		<Version>1.0.0</Version>
-		<AssemblyVersion>1.0.3.0</AssemblyVersion>
-		<FileVersion>1.0.3.0</FileVersion>
 		<AssemblyName>Mirea.Api.DataAccess.Persistence</AssemblyName>
 		<RootNamespace>$(AssemblyName)</RootNamespace>
 	</PropertyGroup>
@@ -16,14 +9,9 @@
 		<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="9.0.0" />
 		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0" />
 		<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="9.0.0" />
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.1" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
+		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.1" />
-		<PackageReference Include="MySqlConnector" Version="2.4.0" />
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
-		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.2.efcore.9.0.0" />
-		<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.10" />
 	</ItemGroup>
 
 	<ItemGroup>