diff --git a/ApiDto/ApiDto.csproj b/ApiDto/ApiDto.csproj index 70b9ee2..c078af8 100644 --- a/ApiDto/ApiDto.csproj +++ b/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> diff --git a/Backend.sln b/Backend.sln index ee30ecc..c12e123 100644 --- a/Backend.sln +++ b/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 diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..899da35 --- /dev/null +++ b/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> \ No newline at end of file diff --git a/Endpoint/Endpoint.csproj b/Endpoint/Endpoint.csproj index 26d3fbb..a3f2e45 100644 --- a/Endpoint/Endpoint.csproj +++ b/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,47 +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="EPPlus" Version="7.6.1" /> + <PackageReference Include="Cronos" Version="0.10.0" /> + <PackageReference Include="EPPlus" Version="8.0.5" /> <PackageReference Include="EPPlus.System.Drawing" Version="8.0.0" /> - <PackageReference Include="HtmlAgilityPack" Version="1.12.0" /> - <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.13" /> - <PackageReference Include="Microsoft.Build.Framework" Version="17.13.9" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2"> + <PackageReference Include="HtmlAgilityPack" Version="1.12.1" /> + <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.16" /> + <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.2"> + <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.2" /> - <PackageReference Include="Microsoft.IdentityModel.Protocols" Version="8.6.1" /> - <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.6.1" /> - <PackageReference Include="Mirea.Tools.Schedule.Parser" Version="1.2.5" /> - <PackageReference Include="Mirea.Tools.Schedule.WebParser" Version="1.0.6" /> + <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.5" /> + <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.5" /> + <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.5" /> + <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.6" /> + <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="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.2" /> + <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" /> + <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.31" /> - <PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" /> - <PackageReference Include="System.CodeDom" Version="9.0.2" /> - <PackageReference Include="System.Composition" Version="9.0.2" /> - <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.2" /> - <PackageReference Include="System.Drawing.Common" Version="9.0.2" /> - <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.6.1" /> - <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" /> - <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.2" /> - <PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.2" /> - <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" /> - <PackageReference Include="System.Threading.Channels" Version="9.0.2" /> - <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="9.103.7.2" /> + <PackageReference Include="StackExchange.Redis" Version="2.8.37" /> + <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" /> + <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="8.1.1" /> + <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="8.1.1" /> + <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" /> + <PackageReference Include="System.Composition" Version="9.0.5" /> + <PackageReference Include="System.Composition.AttributedModel" Version="9.0.5" /> + <PackageReference Include="System.Composition.Convention" Version="9.0.5" /> + <PackageReference Include="System.Composition.Hosting" Version="9.0.5" /> + <PackageReference Include="System.Composition.Runtime" Version="9.0.5" /> + <PackageReference Include="System.Composition.TypedParts" Version="9.0.5" /> + <PackageReference Include="System.Diagnostics.EventLog" Version="9.0.5" /> + <PackageReference Include="System.Formats.Asn1" Version="9.0.5" /> + <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.10.0" /> + <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.5" /> + <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.5" /> + <PackageReference Include="System.Text.Json" Version="9.0.5" /> + <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="9.103.8.1" /> </ItemGroup> <ItemGroup> diff --git a/Security/Security.csproj b/Security/Security.csproj index 8e8aff3..67d3a29 100644 --- a/Security/Security.csproj +++ b/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.2" /> - <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" /> + <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.5" /> + <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> diff --git a/SqlData/Application/Application.csproj b/SqlData/Application/Application.csproj index 1d5889c..0557291 100644 --- a/SqlData/Application/Application.csproj +++ b/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.DependencyInjectionExtensions" Version="11.11.0" /> - <PackageReference Include="MediatR" Version="12.4.1" /> - <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.2" /> + <PackageReference Include="FluentValidation" Version="12.0.0" /> + <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" /> + <PackageReference Include="MediatR" Version="12.5.0" /> + <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> diff --git a/SqlData/Domain/Domain.csproj b/SqlData/Domain/Domain.csproj index 940e1f5..368d485 100644 --- a/SqlData/Domain/Domain.csproj +++ b/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> diff --git a/SqlData/Migrations/MysqlMigrations/MysqlMigrations.csproj b/SqlData/Migrations/MysqlMigrations/MysqlMigrations.csproj index d9d83f2..eca2df8 100644 --- a/SqlData/Migrations/MysqlMigrations/MysqlMigrations.csproj +++ b/SqlData/Migrations/MysqlMigrations/MysqlMigrations.csproj @@ -1,7 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net8.0</TargetFramework> <BaseOutputPath>..\..\Persistence\bin\</BaseOutputPath> </PropertyGroup> diff --git a/SqlData/Migrations/PsqlMigrations/PsqlMigrations.csproj b/SqlData/Migrations/PsqlMigrations/PsqlMigrations.csproj index d9d83f2..eca2df8 100644 --- a/SqlData/Migrations/PsqlMigrations/PsqlMigrations.csproj +++ b/SqlData/Migrations/PsqlMigrations/PsqlMigrations.csproj @@ -1,7 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net8.0</TargetFramework> <BaseOutputPath>..\..\Persistence\bin\</BaseOutputPath> </PropertyGroup> diff --git a/SqlData/Migrations/SqliteMigrations/SqliteMigrations.csproj b/SqlData/Migrations/SqliteMigrations/SqliteMigrations.csproj index d9d83f2..eca2df8 100644 --- a/SqlData/Migrations/SqliteMigrations/SqliteMigrations.csproj +++ b/SqlData/Migrations/SqliteMigrations/SqliteMigrations.csproj @@ -1,7 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net8.0</TargetFramework> <BaseOutputPath>..\..\Persistence\bin\</BaseOutputPath> </PropertyGroup> diff --git a/SqlData/Persistence/Persistence.csproj b/SqlData/Persistence/Persistence.csproj index 9bacd11..19b4650 100644 --- a/SqlData/Persistence/Persistence.csproj +++ b/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,15 +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.2" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.2" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" /> - <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.2" /> - <PackageReference Include="MySqlConnector" Version="2.4.0" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" /> - <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.11" /> - <PackageReference Include="SQLitePCLRaw.core" Version="2.1.11" /> </ItemGroup> <ItemGroup>