Browse Source

Merge branch 'abpframework:dev' into dev

pull/11091/head
Afresh Klo 5 years ago
committed by GitHub
parent
commit
51c9adf5ec
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyHostBuilderExtensions.cs
  2. 6
      modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/tui-editor/toastui-editor-all.min.js
  3. 2
      modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/tui-editor/toastui-editor.min.css
  4. 6
      modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/tui-editor/toastui-editor-all.min.js
  5. 2
      modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/tui-editor/toastui-editor.min.css
  6. 6
      npm/packs/tui-editor/src/toastui-editor-all.min.js
  7. 2
      npm/packs/tui-editor/src/toastui-editor.min.css
  8. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs
  9. 2
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/Program.cs

2
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyHostBuilderExtensions.cs

@ -65,7 +65,7 @@ public static class AbpWebAssemblyHostBuilderExtensions
return application;
}
public async static Task InitializeAsync(
public async static Task InitializeApplicationAsync(
[NotNull] this IAbpApplicationWithExternalServiceProvider application,
[NotNull] IServiceProvider serviceProvider)
{

6
modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/tui-editor/toastui-editor-all.min.js

File diff suppressed because one or more lines are too long

2
modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/tui-editor/toastui-editor.min.css

File diff suppressed because one or more lines are too long

6
modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/tui-editor/toastui-editor-all.min.js

File diff suppressed because one or more lines are too long

2
modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/tui-editor/toastui-editor.min.css

File diff suppressed because one or more lines are too long

6
npm/packs/tui-editor/src/toastui-editor-all.min.js

File diff suppressed because one or more lines are too long

2
npm/packs/tui-editor/src/toastui-editor.min.css

File diff suppressed because one or more lines are too long

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs

@ -16,7 +16,7 @@ public class Program
var host = builder.Build();
await application.InitializeAsync(host.Services);
await application.InitializeApplicationAsync(host.Services);
await host.RunAsync();
}

2
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/Program.cs

@ -16,7 +16,7 @@ public class Program
var host = builder.Build();
await application.InitializeAsync(host.Services);
await application.InitializeApplicationAsync(host.Services);
await host.RunAsync();
}

Loading…
Cancel
Save