-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/abp-8.2.x' into develop
- Loading branch information
Showing
30 changed files
with
3,149 additions
and
526 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 19 additions & 23 deletions
42
app/src/Passingwind.WorkflowApp.DbMigrator/Passingwind.WorkflowApp.DbMigrator.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,27 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <Import Project="..\..\common.props" /> | ||
| <Import Project="..\..\common.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" /> | ||
| <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> | ||
| <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> | ||
| <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.*" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.*" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" /> | ||
| <ProjectReference Include="..\Passingwind.WorkflowApp.Application.Contracts\Passingwind.WorkflowApp.Application.Contracts.csproj" /> | ||
| <ProjectReference Include="..\Passingwind.WorkflowApp.EntityFrameworkCore\Passingwind.WorkflowApp.EntityFrameworkCore.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" /> | ||
| <ProjectReference Include="..\Passingwind.WorkflowApp.Application.Contracts\Passingwind.WorkflowApp.Application.Contracts.csproj" /> | ||
| <ProjectReference Include="..\Passingwind.WorkflowApp.EntityFrameworkCore\Passingwind.WorkflowApp.EntityFrameworkCore.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Remove="Logs\**" /> | ||
| <Content Remove="Logs\**" /> | ||
| <EmbeddedResource Remove="Logs\**" /> | ||
| <None Remove="Logs\**" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Remove="Logs\**" /> | ||
| <Content Remove="Logs\**" /> | ||
| <EmbeddedResource Remove="Logs\**" /> | ||
| <None Remove="Logs\**" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,19 @@ | ||
| using System.IO; | ||
| using System.Threading.Tasks; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.Extensions.Configuration; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Hosting; | ||
| using Microsoft.Extensions.Logging; | ||
| using Serilog; | ||
| using Serilog.Events; | ||
|
|
||
| namespace Passingwind.WorkflowApp.DbMigrator; | ||
|
|
||
| class Program | ||
| internal static class Program | ||
| { | ||
| static async Task Main(string[] args) | ||
| private static async Task Main(string[] args) | ||
| { | ||
| Log.Logger = new LoggerConfiguration() | ||
| .MinimumLevel.Information() | ||
| .MinimumLevel.Override("Microsoft", LogEventLevel.Warning) | ||
| .MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning) | ||
| #if DEBUG | ||
| .MinimumLevel.Override("Passingwind.WorkflowApp", LogEventLevel.Debug) | ||
| #else | ||
| .MinimumLevel.Override("Passingwind.WorkflowApp", LogEventLevel.Information) | ||
| #endif | ||
| .Enrich.FromLogContext() | ||
| .WriteTo.Async(c => c.File("Logs/logs.txt")) | ||
| .WriteTo.Async(c => c.Console()) | ||
| .CreateLogger(); | ||
|
|
||
| await CreateHostBuilder(args).RunConsoleAsync(); | ||
| } | ||
|
|
||
| public static IHostBuilder CreateHostBuilder(string[] args) => | ||
| Host.CreateDefaultBuilder(args) | ||
| .AddAppSettingsSecretsJson() | ||
| .ConfigureLogging((context, logging) => logging.ClearProviders()) | ||
| .ConfigureServices((hostContext, services) => | ||
| { | ||
| services.AddHostedService<DbMigratorHostedService>(); | ||
| }); | ||
| .ConfigureServices((_, services) => services.AddHostedService<DbMigratorHostedService>()); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.