Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 upgrade to .net8.0 #104

Merged
merged 1 commit into from
Apr 23, 2024
Merged

🐛 upgrade to .net8.0 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions src/Application/Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>CleanArchitecture.Razor.Application</RootNamespace>
<AssemblyName>CleanArchitecture.Razor.Application</AssemblyName>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
<PackageReference Include="Hangfire.Core" Version="1.8.5" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.12" />
<PackageReference Include="Hangfire.Core" Version="1.8.12" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageReference Include="ClosedXML" Version="0.102.1" />
<PackageReference Include="ClosedXML" Version="0.102.2" />
<PackageReference Include="DotNetZip" Version="1.16.0" />
<PackageReference Include="FluentValidation" Version="11.7.1" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.7.1" />
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.8.0" />
<PackageReference Include="LazyCache" Version="2.4.0" />
<PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
<PackageReference Include="MediatR" Version="12.1.1" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.10" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.4" />
<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.4" />
<PackageReference Include="WorkflowCore" Version="3.9.0" />
<PackageReference Include="WorkflowCore.Persistence.EntityFramework" Version="3.9.0" />
<PackageReference Include="WorkflowCore.Persistence.SqlServer" Version="3.9.0" />
<PackageReference Include="WorkflowCore.Users" Version="3.9.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
<PackageReference Include="Polly" Version="7.2.4" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.12" />
<PackageReference Include="WorkflowCore" Version="3.10.0" />
<PackageReference Include="WorkflowCore.Persistence.EntityFramework" Version="3.10.0" />
<PackageReference Include="WorkflowCore.Persistence.SqlServer" Version="3.10.0" />
<PackageReference Include="WorkflowCore.Users" Version="3.10.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.4" />
<PackageReference Include="Polly" Version="8.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Application/Customers/Commands/AddEdit/AddEditCustomerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class AddEditCustomerCommand : CustomerDto, IRequest<Result<int>>, IMapFr
{
public string CacheKey => CustomerCacheKey.GetAllCacheKey;

public CancellationTokenSource ResetCacheToken => CustomerCacheTokenSource.ResetCacheToken;
public CancellationTokenSource SharedExpiryTokenSource => CustomerCacheTokenSource.ResetCacheToken;
}

public class AddEditCustomerCommandHandler : IRequestHandler<AddEditCustomerCommand, Result<int>>
Expand Down
2 changes: 1 addition & 1 deletion src/Application/Customers/Commands/Delete/DeleteCustomerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class DeleteCustomerCommand: IRequest<Result>, ICacheInvalidator
public int Id { get; set; }
public string CacheKey => CustomerCacheKey.GetAllCacheKey;

public CancellationTokenSource ResetCacheToken => CustomerCacheTokenSource.ResetCacheToken;
public CancellationTokenSource SharedExpiryTokenSource => CustomerCacheTokenSource.ResetCacheToken;
}
public class DeleteCheckedCustomersCommand : IRequest<Result>, ICacheInvalidator
{
Expand Down
2 changes: 1 addition & 1 deletion src/Application/Customers/Commands/Import/ImportCustomersCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class ImportCustomersCommand : IRequest<Result>, ICacheInvalidator
public byte[] Data { get; set; }
public string CacheKey => CustomerCacheKey.GetAllCacheKey;

public CancellationTokenSource ResetCacheToken => CustomerCacheTokenSource.ResetCacheToken;
public CancellationTokenSource SharedExpiryTokenSource => CustomerCacheTokenSource.ResetCacheToken;
}
public class CreateCustomerTemplateCommand : IRequest<byte[]>
{
Expand Down
2 changes: 1 addition & 1 deletion src/Application/DocumentTypes/Commands/AddEdit/AddEditDocumentTypeCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class AddEditDocumentTypeCommand : DocumentTypeDto, IRequest<Result<int>>
{
public string CacheKey => string.Empty;

public CancellationTokenSource ResetCacheToken => DocumentTypeCacheTokenSource.ResetCacheToken;
public CancellationTokenSource SharedExpiryTokenSource => DocumentTypeCacheTokenSource.ResetCacheToken;
}

public class AddEditDocumentTypeCommandHandler : IRequestHandler<AddEditDocumentTypeCommand, Result<int>>
Expand Down
4 changes: 2 additions & 2 deletions src/Application/DocumentTypes/Commands/Delete/DeleteDocumentTypeCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ public class DeleteDocumentTypeCommand: IRequest<Result>, ICacheInvalidator

public string CacheKey => DocumentTypeCacheKey.GetAllCacheKey;

public CancellationTokenSource ResetCacheToken => DocumentTypeCacheTokenSource.ResetCacheToken;
public CancellationTokenSource SharedExpiryTokenSource => DocumentTypeCacheTokenSource.ResetCacheToken;
}
public class DeleteCheckedDocumentTypesCommand : IRequest<Result>, ICacheInvalidator
{
public int[] Id { get; set; }

public string CacheKey => DocumentTypeCacheKey.GetAllCacheKey;

public CancellationTokenSource ResetCacheToken => DocumentTypeCacheTokenSource.ResetCacheToken;
public CancellationTokenSource SharedExpiryTokenSource => DocumentTypeCacheTokenSource.ResetCacheToken;
}

public class DeleteDocumentTypeCommandHandler : IRequestHandler<DeleteDocumentTypeCommand, Result>,
Expand Down
2 changes: 1 addition & 1 deletion src/Application/KeyValues/Commands/SaveChanged/SaveChangedKeyValuesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class SaveChangedKeyValuesCommand:IRequest<Result>, ICacheInvalidator

public string CacheKey => KeyValueCacheKey.GetAllCacheKey;

public CancellationTokenSource ResetCacheToken => KeyValueCacheTokenSource.ResetCacheToken;
public CancellationTokenSource SharedExpiryTokenSource => KeyValueCacheTokenSource.ResetCacheToken;
}

public class SaveChangedKeyValuesCommandHandler : IRequestHandler<SaveChangedKeyValuesCommand, Result>
Expand Down
4 changes: 2 additions & 2 deletions src/Domain/Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>CleanArchitecture.Razor.Domain</RootNamespace>
<AssemblyName>CleanArchitecture.Razor.Domain</AssemblyName>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
42 changes: 21 additions & 21 deletions src/Infrastructure/Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>CleanArchitecture.Razor.Infrastructure</RootNamespace>
<AssemblyName>CleanArchitecture.Razor.Infrastructure</AssemblyName>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MailKit" Version="4.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="7.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.10">
<PackageReference Include="MailKit" Version="4.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
<PackageReference Include="MimeKit" Version="4.1.0" />
<PackageReference Include="Duende.IdentityServer" Version="6.3.3" />
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="6.3.3" />
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="6.3.3" />
<PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="6.3.3" />
<PackageReference Include="Duende.IdentityServer.Storage" Version="6.3.3" />
<PackageReference Include="Polly" Version="7.2.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.6.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.4" />
<PackageReference Include="MimeKit" Version="4.5.0" />
<PackageReference Include="Duende.IdentityServer" Version="7.0.4" />
<PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.0.4" />
<PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.0.4" />
<PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.0.4" />
<PackageReference Include="Duende.IdentityServer.Storage" Version="7.0.4" />
<PackageReference Include="Polly" Version="8.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down
24 changes: 9 additions & 15 deletions src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<LangVersion>latest</LangVersion>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-SmartAdmin.WebUI-E383D1D3-A583-4134-97C9-6DFEB2F1657F</UserSecretsId>
</PropertyGroup>

<ItemGroup>

<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Application\Application.csproj" />
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
</ItemGroup>

<Target Name="CreateFilesFolder" AfterTargets="AfterPublish">
<MakeDir Directories="$(PublishUrl)Files" Condition="!Exists('$(PublishUrl)Files')" />
</Target>
</Project>
</Project>
2 changes: 1 addition & 1 deletion tests/Application.IntegrationTests/Application.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>CleanArchitecture.Application.IntegrationTests</RootNamespace>
<AssemblyName>CleanArchitecture.Application.IntegrationTests</AssemblyName>

Expand Down
2 changes: 1 addition & 1 deletion tests/Application.UnitTests/Application.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>CleanArchitecture.Application.UnitTests</RootNamespace>
<AssemblyName>CleanArchitecture.Application.UnitTests</AssemblyName>

Expand Down
2 changes: 1 addition & 1 deletion tests/Domain.UnitTests/Domain.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>CleanArchitecture.Domain.UnitTests</RootNamespace>
<AssemblyName>CleanArchitecture.Domain.UnitTests</AssemblyName>

Expand Down
Loading