Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,10 @@
/Clients/BlogRazor/bin/Debug/net9.0
/BlogWebApp/BlogBlazor/bin/Debug/net9.0
/BlogWebApp/BlogBlazor/obj
/Sdk/Blog.Sdk/bin/Debug/net10.0
/BlogWebApp/Services/Blog.CommonServices/bin/Debug/net10.0
/BlogWebApp/Aspire/Blog.Aspire/Blog.Aspire.ServiceDefaults/bin/Debug/net10.0
/Clients/BlogRazor/bin/Debug/net10.0
/BlogWebApp/Tests/Blog.ServicesTests/bin/Debug/net10.0
/BlogWebApp/Tests/Blog.UnitTests/bin/Debug/net10.0
/Sdk/Blog.Sdk.ExampleUsage/bin/Debug/net10.0
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="9.3.1" />
<Sdk Name="Aspire.AppHost.Sdk" Version="13.1.1" />
Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment


<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UserSecretsId>71670871-af4d-479a-9cab-951af46f8cf7</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.3.1" />
<PackageReference Include="Aspire.Hosting.Redis" Version="9.3.1" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.1" />
<PackageReference Include="Aspire.Hosting.Redis" Version="13.1.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
Expand All @@ -10,13 +10,13 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.4.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.3.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />
</ItemGroup>

</Project>
12 changes: 6 additions & 6 deletions BlogWebApp/Blog.Web/Blog.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<IsPackable>false</IsPackable>
Expand All @@ -22,14 +22,14 @@
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="BrotliSharpLib" Version="0.3.3" />
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.9" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="9.0.0" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions BlogWebApp/Blog.Web/Controllers/V1/AccountsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
using Blog.Services.Core.Utilities;
using CommonServices.EmailServices.Interfaces;
using EntityServices.ControllerContext;
using EntityServices.Identity.Auth;
using EntityServices.Identity.Registration;
using EntityServices.Identity.User;
using Blog.Contracts.V1;
using Blog.Contracts.V1.Requests.UsersRequests;
using Blog.Contracts.V1.Responses.UsersResponses;
using Blog.Contracts.V1.Responses.Chart;
using Core.Consts;
using Cache;
using EntityServices.EntityFrameworkServices.Identity.Auth;
using EntityServices.EntityFrameworkServices.Identity.Registration;
using EntityServices.EntityFrameworkServices.Identity.User;

/// <summary>
/// Accounts controller.
Expand Down
2 changes: 1 addition & 1 deletion BlogWebApp/Blog.Web/Controllers/V1/MessagesController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Blog.EntityServices.ControllerContext;
using Blog.EntityServices.Interfaces;

namespace Blog.Web.Controllers.V1;

Expand All @@ -16,6 +15,7 @@ namespace Blog.Web.Controllers.V1;
using Blog.Contracts.V1.Responses;
using Core.Consts;
using Data.Specifications;
using EntityServices.Interfaces;

/// <summary>
/// Messages controller.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Blog.EntityServices;

namespace Blog.Web.StartupConfigureServicesInstallers;
namespace Blog.Web.StartupConfigureServicesInstallers;

using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
Expand All @@ -23,11 +21,12 @@ namespace Blog.Web.StartupConfigureServicesInstallers;
using CommonServices.EmailServices;
using CommonServices.Interfaces;
using EntityServices.ControllerContext;
using EntityServices.Identity.Auth;
using EntityServices.Identity.User;
using EntityServices.Identity.RefreshToken;
using EntityServices.Identity.Registration;
using EntityServices.Interfaces;
using EntityServices.EntityFrameworkServices;
using EntityServices.EntityFrameworkServices.Identity.Auth;
using EntityServices.EntityFrameworkServices.Identity.RefreshToken;
using EntityServices.EntityFrameworkServices.Identity.Registration;
using EntityServices.EntityFrameworkServices.Identity.User;

/// <summary>
/// Application services installer.
Expand Down
4 changes: 2 additions & 2 deletions BlogWebApp/Data/Blog.Data.Core/Blog.Data.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
8 changes: 4 additions & 4 deletions BlogWebApp/Data/Blog.Data.Models/Blog.Data.Models.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="10.0.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
16 changes: 8 additions & 8 deletions BlogWebApp/Data/Blog.Data/Blog.Data.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -17,19 +17,19 @@

<ItemGroup>
<PackageReference Include="EntityFrameworkCore.Data.AutoHistory" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9">
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9">
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 2 additions & 2 deletions BlogWebApp/Data/Blog.Data/Repository.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <copyright file="TableMethods.cs" company="Blog">
// <copyright file="Repository.cs" company="Blog">
// Copyright (c) Blog. All rights reserved.
// </copyright>

Expand All @@ -17,7 +17,7 @@ namespace Blog.Data;
using System.Threading.Tasks;

/// <summary>
/// Table methods.
/// Repository.
/// </summary>
/// <typeparam name="TEntity">TEntity.</typeparam>
public class Repository<TEntity> : IRepository<TEntity>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
10 changes: 3 additions & 7 deletions BlogWebApp/Services/Blog.Services.Core/Blog.Services.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="9.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.3.0" />
<PackageReference Include="RedLock.net.StrongName" Version="2.0.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -27,8 +27,4 @@
</Reference>
</ItemGroup>

<ItemGroup>
<Folder Include="Dtos\Exports\" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions BlogWebApp/Services/Blog.Services/Blog.EntityServices.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>Blog.EntityServices</AssemblyName>
<RootNamespace>Blog.EntityServices</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Blog.EntityServices.ControllerContext;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Data.Models;
using Identity.User;
using EntityFrameworkServices.Identity.User;

/// <summary>
/// Controller context.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>

namespace Blog.EntityServices;
namespace Blog.EntityServices.EntityFrameworkServices;

using System.Linq;
using System.Threading.Tasks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>

namespace Blog.EntityServices.Identity.Auth;
namespace Blog.EntityServices.EntityFrameworkServices.Identity.Auth;

using System;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>

namespace Blog.EntityServices.Identity.Auth;
namespace Blog.EntityServices.EntityFrameworkServices.Identity.Auth;

using Data.Models;
using Microsoft.AspNetCore.Identity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>

namespace Blog.EntityServices.Identity.RefreshToken;
namespace Blog.EntityServices.EntityFrameworkServices.Identity.RefreshToken;

using System.Threading.Tasks;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>

namespace Blog.EntityServices.Identity.RefreshToken;
namespace Blog.EntityServices.EntityFrameworkServices.Identity.RefreshToken;

using System.Linq;
using System.Threading.Tasks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>

namespace Blog.EntityServices.Identity.Registration;
namespace Blog.EntityServices.EntityFrameworkServices.Identity.Registration;

using Data.Models;
using Microsoft.AspNetCore.Identity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>

namespace Blog.EntityServices.Identity.Registration;
namespace Blog.EntityServices.EntityFrameworkServices.Identity.Registration;

using System;
using System.Text.RegularExpressions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>

namespace Blog.EntityServices.Identity.User;
namespace Blog.EntityServices.EntityFrameworkServices.Identity.User;

using Contracts.V1.Responses.Chart;
using Core.Infrastructure.Pagination;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) PlaceholderCompany. All rights reserved.
// </copyright>

namespace Blog.EntityServices.Identity.User;
namespace Blog.EntityServices.EntityFrameworkServices.Identity.User;

using AutoMapper;
using Contracts.V1.Responses.Chart;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Blog.EntityServices.Interfaces;
/// <summary>
/// Posts tags relations service interface.
/// </summary>
/// <seealso cref="IGeneralService{Message}" />
/// <seealso cref="IGeneralService{PostsTagsRelations}" />
public interface IPostsTagsRelationsService : IGeneralService<PostsTagsRelations>
{
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Blog.EntityServices.Interfaces;
/// <summary>
/// Tags service interface.
/// </summary>
/// <seealso cref="IGeneralService{Profile}" />
/// <seealso cref="IGeneralService{Tag}" />
public interface ITagsService : IGeneralService<Tag>
{
/// <summary>
Expand Down
Loading
Loading