Upgrade to ABP 5.1.3

EasyAbp · Feb 9, 2022 · 5958cf2 · 5958cf2
1 parent edc8272
commit 5958cf2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -3,6 +3,7 @@ on:
  push:
  branches:
  - master
+ - main
 jobs:
  publish:
  runs-on: ubuntu-latest
@@ -18,7 +19,7 @@ jobs:
  with:
  find: \]\((/docs/)
  replace: "](/modules/${{ github.event.repository.name }}/"
- include: docs/
+ include: docs/**.md
 
  - name: Pull repo and change files
  id: change

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
 
- <AbpVersion>5.0.1</AbpVersion>
+ <AbpVersion>5.1.3</AbpVersion>
 
  </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
  <LangVersion>latest</LangVersion>
- <Version>1.6.0</Version>
+ <Version>1.6.1</Version>
  <NoWarn>$(NoWarn);CS1591</NoWarn>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  <Authors>EasyAbp Team</Authors>

diff --git a/sample/MyAbpApp/src/MyAbpApp.DbMigrator/DbMigratorHostedService.cs b/sample/MyAbpApp/src/MyAbpApp.DbMigrator/DbMigratorHostedService.cs
@@ -19,20 +19,20 @@ public DbMigratorHostedService(IHostApplicationLifetime hostApplicationLifetime)
 
  public async Task StartAsync(CancellationToken cancellationToken)
  {
- using (var application = AbpApplicationFactory.Create<MyAbpAppDbMigratorModule>(options =>
+ using (var application = await AbpApplicationFactory.CreateAsync<MyAbpAppDbMigratorModule>(options =>
  {
  options.UseAutofac();
  options.Services.AddLogging(c => c.AddSerilog());
  }))
  {
- application.Initialize();
+ await application.InitializeAsync();
 
  await application
  .ServiceProvider
  .GetRequiredService<MyAbpAppDbMigrationService>()
  .MigrateAsync();
 
- application.Shutdown();
+ await application.ShutdownAsync();
 
  _hostApplicationLifetime.StopApplication();
  }

diff --git a/sample/MyAbpApp/test/MyAbpApp.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs b/sample/MyAbpApp/test/MyAbpApp.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs
@@ -10,14 +10,14 @@ public class ConsoleTestAppHostedService : IHostedService
  {
  public async Task StartAsync(CancellationToken cancellationToken)
  {
- using (var application = AbpApplicationFactory.Create<MyAbpAppConsoleApiClientModule>())
+ using (var application = await AbpApplicationFactory.CreateAsync<MyAbpAppConsoleApiClientModule>())
  {
- application.Initialize();
+ await application.InitializeAsync();
 
  var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
  await demo.RunAsync();
 
- application.Shutdown();
+ await application.ShutdownAsync();
  }
  }
 

diff --git a/sample/MyAbpApp/test/MyAbpApp.Web.Tests/MyAbpAppWebTestModule.cs b/sample/MyAbpApp/test/MyAbpApp.Web.Tests/MyAbpAppWebTestModule.cs
@@ -27,7 +27,7 @@ public override void PreConfigureServices(ServiceConfigurationContext context)
  {
  context.Services.PreConfigure<IMvcBuilder>(builder =>
  {
- builder.PartManager.ApplicationParts.Add(new AssemblyPart(typeof(MyAbpAppWebModule).Assembly));
+ builder.PartManager.ApplicationParts.Add(new CompiledRazorAssemblyPart(typeof(MyAbpAppWebModule).Assembly));
  });
  }