Browse Source

Some minor changes.

pull/18876/head
maliming 2 years ago
parent
commit
466d800967
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 1
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/Components/App.razor
  2. 1
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Components/App.razor
  3. 1
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorClientModule.cs
  4. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyProjectNameBlazorModule.cs
  5. 5
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyCompanyName.MyProjectName.Blazor.Server.WebApp.csproj
  6. 1
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
  7. 1
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs
  8. 11
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/App.razor
  9. 1
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs

1
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/Components/App.razor

@ -12,6 +12,7 @@
<link href="global.css?_v=638424860497814240" rel="stylesheet"/> <link href="global.css?_v=638424860497814240" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/> <link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles--> <!--/ABP:Styles-->
<link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
<!-- <TEMPLATE-REMOVE IF-NOT='PWA'> --> <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->
<link href="manifest.json" rel="manifest" /> <link href="manifest.json" rel="manifest" />

1
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Components/App.razor

@ -12,6 +12,7 @@
<link href="global.css?_v=638424860497814240" rel="stylesheet"/> <link href="global.css?_v=638424860497814240" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/> <link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles--> <!--/ABP:Styles-->
<link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
<!-- <TEMPLATE-REMOVE IF-NOT='PWA'> --> <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->
<link href="manifest.json" rel="manifest" /> <link href="manifest.json" rel="manifest" />

1
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorClientModule.cs

@ -67,7 +67,6 @@ public class MyProjectNameBlazorClientModule : AbpModule
private static void ConfigureAuthentication(WebAssemblyHostBuilder builder) private static void ConfigureAuthentication(WebAssemblyHostBuilder builder)
{ {
builder.Services.AddCascadingAuthenticationState();
builder.Services.AddOidcAuthentication(options => builder.Services.AddOidcAuthentication(options =>
{ {
builder.Configuration.Bind("AuthServer", options.ProviderOptions); builder.Configuration.Bind("AuthServer", options.ProviderOptions);

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp.Tiered/MyProjectNameBlazorModule.cs

@ -7,7 +7,6 @@ using Medallion.Threading.Redis;
using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Authentication.OpenIdConnect;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@ -173,7 +172,6 @@ public class MyProjectNameBlazorModule : AbpModule
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
{ {
context.Services.TryAddScoped<ProtectedLocalStorage>();
context.Services.AddAuthentication(options => context.Services.AddAuthentication(options =>
{ {
options.DefaultScheme = "Cookies"; options.DefaultScheme = "Cookies";

5
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.WebApp/MyCompanyName.MyProjectName.Blazor.Server.WebApp.csproj

@ -70,9 +70,4 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="Components\Pages\_ViewImports.cshtml" />
<_ContentIncludedByDefault Remove="Components\Pages\Index.razor" />
</ItemGroup>
</Project> </Project>

1
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor

@ -11,6 +11,7 @@
<link href="global.css?_v=638417120185267609" rel="stylesheet"/> <link href="global.css?_v=638417120185267609" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/> <link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles--> <!--/ABP:Styles-->
<link href="MyCompanyName.MyProjectName.Blazor.Client.styles.css" rel="stylesheet"/>
<!-- <TEMPLATE-REMOVE IF-NOT='PWA'> --> <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->
<link href="manifest.json" rel="manifest" /> <link href="manifest.json" rel="manifest" />

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

@ -8,6 +8,7 @@ using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
//https://github.com/dotnet/aspnetcore/issues/52530
builder.Services.Configure<RouteOptions>(options => builder.Services.Configure<RouteOptions>(options =>
{ {
options.SuppressCheckForUnhandledSecurityMetadata = true; options.SuppressCheckForUnhandledSecurityMetadata = true;

11
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/App.razor

@ -7,10 +7,11 @@
<title>MyCompanyName.MyProjectName.Blazor</title> <title>MyCompanyName.MyProjectName.Blazor</title>
<base href="/" /> <base href="/" />
<!--ABP:Styles--> <!--ABP:Styles-->
<link href="global.css?_v=638424689870700471" rel="stylesheet"/> <link href="global.css?_v=638424689870700471" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/> <link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles--> <!--/ABP:Styles-->
<link href="MyCompanyName.MyProjectName.Blazor.Host.Client.styles.css" rel="stylesheet"/>
<HeadOutlet @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)" /> <HeadOutlet @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)" />
</head> </head>
@ -28,8 +29,8 @@
<Routes @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)"/> <Routes @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)"/>
</div> </div>
<!--ABP:Scripts--> <!--ABP:Scripts-->
<script src="global.js?_v=638424689871310405"></script> <script src="global.js?_v=638424689871310405"></script>
<!--/ABP:Scripts--> <!--/ABP:Scripts-->
</body> </body>

1
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs

@ -273,7 +273,6 @@ public class MyProjectNameBlazorHostModule : AbpModule
.AddInteractiveServerRenderMode() .AddInteractiveServerRenderMode()
.AddAdditionalAssemblies(builder.ServiceProvider.GetRequiredService<IOptions<AbpRouterOptions>>().Value.AdditionalAssemblies.ToArray()); .AddAdditionalAssemblies(builder.ServiceProvider.GetRequiredService<IOptions<AbpRouterOptions>>().Value.AdditionalAssemblies.ToArray());
}); });
app.UseConfiguredEndpoints();
using (var scope = context.ServiceProvider.CreateScope()) using (var scope = context.ServiceProvider.CreateScope())
{ {

Loading…
Cancel
Save