diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 9f091ce341..016b7e362d 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -16,8 +16,11 @@ on:
- 'templates/**/*.cshtml'
- 'templates/**/*.csproj'
- 'templates/**/*.razor'
+ - 'framework/**/*.targets'
- 'Directory.Build.props'
+ - 'Directory.Build.targets'
- 'Directory.Packages.props'
+ - 'global.json'
- '.github/workflows/build-and-test.yml'
pull_request:
@@ -37,8 +40,11 @@ on:
- 'templates/**/*.cshtml'
- 'templates/**/*.csproj'
- 'templates/**/*.razor'
+ - 'framework/**/*.targets'
- 'Directory.Build.props'
+ - 'Directory.Build.targets'
- 'Directory.Packages.props'
+ - 'global.json'
- '.github/workflows/build-and-test.yml'
types:
- opened
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 1e424cc5c6..acd591415e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,8 +1,9 @@
-
-
+
false
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 5394b53100..e0c6e7d6f8 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -58,64 +58,64 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -171,18 +171,18 @@
-
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -197,6 +197,6 @@
-
+
diff --git a/docs/en/package-version-changes.md b/docs/en/package-version-changes.md
index 8ae56b77f2..8352a8a07a 100644
--- a/docs/en/package-version-changes.md
+++ b/docs/en/package-version-changes.md
@@ -26,68 +26,69 @@
| @ng-bootstrap/ng-bootstrap | ~20.0.0 | ~21.0.0 | #26380 |
| @swimlane/ngx-datatable | ~22.0.0 | ~25.1.0 | #26380, #26381 |
| Devart.Data.Oracle.EFCore | 11.0.0.9 | 11.2.192.10 | #26147 |
-| Microsoft.AspNetCore.Authentication.JwtBearer | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Authentication.OpenIdConnect | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Authorization | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Components | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Components.Authorization | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Components.Web | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Components.WebAssembly | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Components.WebAssembly.Authentication | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Components.WebAssembly.DevServer | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Components.WebAssembly.Server | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Components.WebView.Maui | 10.0.51 | 11.0.0-rc.2.26505.5 | #26147 |
-| Microsoft.AspNetCore.DataProtection | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.DataProtection.StackExchangeRedis | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Mvc.NewtonsoftJson | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.Mvc.Testing | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.TestHost | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.AspNetCore.WebUtilities | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Bcl.AsyncInterfaces | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Data.Sqlite | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.EntityFrameworkCore | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.EntityFrameworkCore.Design | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.EntityFrameworkCore.InMemory | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.EntityFrameworkCore.Proxies | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.EntityFrameworkCore.Relational | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.EntityFrameworkCore.SqlServer | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.EntityFrameworkCore.Sqlite | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.EntityFrameworkCore.Tools | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Caching.Memory | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Caching.StackExchangeRedis | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Configuration.Binder | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Configuration.CommandLine | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Configuration.EnvironmentVariables | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Configuration.UserSecrets | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.DependencyInjection | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.DependencyInjection.Abstractions | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.FileProviders.Composite | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.FileProviders.Embedded | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.FileProviders.Physical | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.FileSystemGlobbing | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Hosting | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Hosting.Abstractions | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Http | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Identity.Core | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Localization | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Logging | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Logging.Abstractions | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Logging.Console | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Options | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Extensions.Options.ConfigurationExtensions | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| Microsoft.Maui.Controls | 10.0.51 | 11.0.0-rc.2.26505.5 | #26147 |
+| Microsoft.AspNetCore.Authentication.JwtBearer | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Authentication.OpenIdConnect | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Authorization | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Components | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Components.Authorization | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Components.Web | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Components.WebAssembly | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Components.WebAssembly.Authentication | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Components.WebAssembly.DevServer | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Components.WebAssembly.Server | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Components.WebView.Maui | 10.0.51 | 11.0.0 | #26147, #26453 |
+| Microsoft.AspNetCore.DataProtection | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.DataProtection.StackExchangeRedis | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Mvc.NewtonsoftJson | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.Mvc.Testing | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.TestHost | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.AspNetCore.WebUtilities | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Bcl.AsyncInterfaces | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Data.Sqlite | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.EntityFrameworkCore | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.EntityFrameworkCore.Design | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.EntityFrameworkCore.InMemory | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.EntityFrameworkCore.Proxies | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.EntityFrameworkCore.Relational | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.EntityFrameworkCore.SqlServer | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.EntityFrameworkCore.Sqlite | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.EntityFrameworkCore.Tools | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Caching.Memory | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Caching.StackExchangeRedis | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Configuration.Binder | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Configuration.CommandLine | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Configuration.EnvironmentVariables | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Configuration.UserSecrets | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.DependencyInjection | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.DependencyInjection.Abstractions | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.FileProviders.Composite | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.FileProviders.Embedded | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.FileProviders.Physical | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.FileSystemGlobbing | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Hosting | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Hosting.Abstractions | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Http | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Identity.Core | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Localization | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Logging | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Logging.Abstractions | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Logging.Console | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Options | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Extensions.Options.ConfigurationExtensions | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| Microsoft.Maui.Controls | 10.0.51 | 11.0.0 | #26147, #26453 |
| MongoDB.Driver | 3.12.0 | 3.13.0 | #26334 |
| MySql.EntityFrameworkCore | 10.0.9 | 11.0.0-preview | #26400 |
| Npgsql.EntityFrameworkCore.PostgreSQL | 10.0.3 | 11.0.0-rc.3 | #26147, #26400 |
| Oracle.EntityFrameworkCore | 10.23.26000 | 10.23.26301 | #26147 |
-| System.Collections.Immutable | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| System.Management | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| System.Security.Cryptography.Xml | 10.0.10 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| System.Security.Permissions | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| System.Text.Encoding.CodePages | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| System.Text.Encodings.Web | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
-| System.Text.Json | 10.0.11 | 11.0.0-rc.3.26522.148 | #26147, #26340 |
+| System.Collections.Immutable | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| System.Management | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| System.Security.Cryptography.Pkcs | 11.0.0-rc.3.26522.148 | 11.0.0 | #26453 |
+| System.Security.Cryptography.Xml | 10.0.10 | 11.0.0 | #26147, #26340, #26453 |
+| System.Security.Permissions | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| System.Text.Encoding.CodePages | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| System.Text.Encodings.Web | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
+| System.Text.Json | 10.0.11 | 11.0.0 | #26147, #26340, #26453 |
| ng-zorro-antd | ~21.3.1 | ~22.1.0 | #26380 |
## 10.8.0-rc.1
diff --git a/docs/en/release-info/migration-guides/abp-11-0.md b/docs/en/release-info/migration-guides/abp-11-0.md
index a43bb07586..93032d0c9c 100644
--- a/docs/en/release-info/migration-guides/abp-11-0.md
+++ b/docs/en/release-info/migration-guides/abp-11-0.md
@@ -49,19 +49,55 @@ No action is required unless a handler of yours relies on receiving an event for
> See [#26126](https://github.com/abpframework/abp/pull/26126) for details.
-### MySQL and Oracle Providers Do Not Work on EF Core 11 Yet
+### Some EF Core Providers Have No EF Core 11 Release Yet
**Who is affected**
-- Applications that use `Volo.Abp.EntityFrameworkCore.MySQL`, `Volo.Abp.EntityFrameworkCore.Oracle` or `Volo.Abp.EntityFrameworkCore.Oracle.Devart`.
+- Applications that use `Volo.Abp.EntityFrameworkCore.PostgreSql`, `Volo.Abp.EntityFrameworkCore.MySQL`, `Volo.Abp.EntityFrameworkCore.MySQL.Pomelo`, `Volo.Abp.EntityFrameworkCore.Oracle` or `Volo.Abp.EntityFrameworkCore.Oracle.Devart`.
**What changed**
-- ABP v11.0 targets .NET 11 and EF Core 11. The database providers these packages use (`MySql.EntityFrameworkCore`, `Oracle.EntityFrameworkCore` and `Devart.Data.Oracle.EFCore`) have no EF Core 11 release yet, and the current versions fail with `MissingMethodException` or `TypeLoadException` when the `DbContext` is created.
+ABP v11.0 uses EF Core 11. These database providers have no stable EF Core 11 release yet:
+
+| ABP package | Provider version | Status |
+| --- | --- | --- |
+| `Volo.Abp.EntityFrameworkCore.PostgreSql` | `Npgsql.EntityFrameworkCore.PostgreSQL` 11.0.0-rc.3 | Works with EF Core 11.0.0. NuGet reports `NU1608`, because this version asks for EF Core 11.0.0-rc.3. |
+| `Volo.Abp.EntityFrameworkCore.MySQL` | `MySql.EntityFrameworkCore` 11.0.0-preview | Preview release of the provider. |
+| `Volo.Abp.EntityFrameworkCore.MySQL.Pomelo` | `Pomelo.EntityFrameworkCore.MySql` 9.0.0 | Fails with `MissingMethodException` when the `DbContext` is created. |
+| `Volo.Abp.EntityFrameworkCore.Oracle` | `Oracle.EntityFrameworkCore` 10.23.26301 | Fails with `MissingMethodException` when the `DbContext` is created. |
+| `Volo.Abp.EntityFrameworkCore.Oracle.Devart` | `Devart.Data.Oracle.EFCore` 11.2.192.10 | Fails with `TypeLoadException` when the `DbContext` is created. |
+
+**What to do**
+
+- PostgreSQL and MySQL applications can upgrade. ABP will move to the stable provider versions once they are released.
+- Keep Oracle and Devart applications on ABP v10.x until the provider ships an EF Core 11 version.
+- Pomelo 9.0.0 targets EF Core 9, so it doesn't work on ABP v10.x either.
+
+### Static Assets on .NET 11.0.1xx SDKs
+
+**Who is affected**
+
+- Applications that map static assets with `MapStaticAssets()` instead of `MapAbpStaticAssets()`.
+- Web SDK class libraries that are built in Debug with a .NET 11.0.1xx SDK.
+
+**What changed**
+
+- The .NET 11.0.1xx SDKs give the compressed copies of package static assets duplicate labels. When two packages have a static asset with the same path, the application fails on startup with `The static asset '...' is already mapped`. `MapAbpStaticAssets()` adds the missing package base path to these labels, so static asset compression stays enabled.
+- A Debug build of a Web SDK project also fails on these SDKs when it references a Web SDK class library. `Volo.Abp.AspNetCore` sets `EnableHotReloadInRuntimeConfigDevFile` to `false` in Web SDK class libraries in Debug builds.
**What to do**
-Keep these applications on ABP v10.x until the provider ships an EF Core 11 version.
+No action is required if your application uses `MapAbpStaticAssets()`, as the startup templates do. If it calls `MapStaticAssets()` directly and fails with this error, use `MapAbpStaticAssets()` instead, or turn off static asset compression in the project:
+
+```xml
+
+ false
+
+```
+
+ABP will remove these workarounds once the SDK fixes the problems.
+
+> See [dotnet/sdk#56891](https://github.com/dotnet/sdk/issues/56891) and [dotnet/sdk#56656](https://github.com/dotnet/sdk/issues/56656) for details.
### Polly Is No Longer Referenced
diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
index aab5b5cc2b..d5b190d59c 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.RequestLocalization;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticAssets;
+using Microsoft.AspNetCore.StaticAssets.Infrastructure;
using Microsoft.AspNetCore.Timing;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders;
@@ -213,7 +214,9 @@ public static class AbpApplicationBuilderExtensions
app.UseVirtualStaticFiles();
- return endpoints.MapStaticAssets(staticAssetsManifestPath);
+ var builder = endpoints.MapStaticAssets(staticAssetsManifestPath);
+ AbpStaticAssetLabelFixer.FixDuplicateLabels(StaticAssetsEndpointDataSourceHelper.ResolveStaticAssetDescriptors(endpoints, staticAssetsManifestPath));
+ return builder;
}
///
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/StaticFiles/AbpStaticAssetLabelFixer.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/StaticFiles/AbpStaticAssetLabelFixer.cs
new file mode 100644
index 0000000000..05ad3b6814
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/StaticFiles/AbpStaticAssetLabelFixer.cs
@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.StaticAssets;
+
+namespace Volo.Abp.AspNetCore.StaticFiles;
+
+///
+/// The 11.0.1xx SDKs leave the package base path out of the labels of compressed package assets, so two packages with
+/// the same asset path produce duplicate labels, and Razor Pages and Razor Components fail on startup when they read
+/// the asset collection. This adds the missing base path to the duplicate labels before the endpoints are built.
+/// Remove it once the SDK fixes the labels.
+///
+internal static class AbpStaticAssetLabelFixer
+{
+ private const string LabelPropertyName = "label";
+
+ public static void FixDuplicateLabels(IReadOnlyList descriptors)
+ {
+ // A fixed label can collide with another label that was unique, so repeat until nothing changes.
+ // Every change adds a missing base path, so a label can only grow up to its full path and the loop ends.
+ while (FixDuplicateLabelsOnce(descriptors))
+ {
+ }
+
+ // The route of an endpoint is unique, so it is used for the labels whose base path couldn't be found.
+ foreach (var (descriptor, _) in GetDuplicates(descriptors))
+ {
+ SetLabel(descriptor, descriptor.Route);
+ }
+ }
+
+ private static bool FixDuplicateLabelsOnce(IReadOnlyList descriptors)
+ {
+ var duplicates = GetDuplicates(descriptors);
+ if (duplicates.Count == 0)
+ {
+ return false;
+ }
+
+ var labelsByAssetPath = descriptors
+ .Where(descriptor => descriptor.Selectors.Count > 0)
+ .Select(descriptor => (descriptor.AssetPath, Label: GetLabel(descriptor)))
+ .Where(x => x.Label != null)
+ .GroupBy(x => x.AssetPath, StringComparer.Ordinal)
+ .ToDictionary(group => group.Key, group => group.Select(x => x.Label!).ToList(), StringComparer.Ordinal);
+
+ var changed = false;
+ foreach (var (descriptor, label) in duplicates)
+ {
+ var basePath = GetBasePathFromUncompressedLabel(descriptor, label, labelsByAssetPath);
+ if (basePath.IsNullOrEmpty())
+ {
+ basePath = GetBasePathFromRoute(descriptor.Route, label);
+ }
+
+ if (basePath.IsNullOrEmpty())
+ {
+ continue;
+ }
+
+ SetLabel(descriptor, basePath + label);
+ changed = true;
+ }
+
+ return changed;
+ }
+
+ private static List<(StaticAssetDescriptor Descriptor, string Label)> GetDuplicates(IReadOnlyList descriptors)
+ {
+ return descriptors
+ .Where(descriptor => descriptor.Selectors.Count == 0)
+ .Select(descriptor => (Descriptor: descriptor, Label: GetLabel(descriptor)))
+ .Where(x => x.Label != null)
+ .GroupBy(x => x.Label!, StringComparer.OrdinalIgnoreCase)
+ .Where(group => group.Count() > 1)
+ .SelectMany(group => group)
+ .Select(x => (x.Descriptor, x.Label!))
+ .ToList();
+ }
+
+ ///
+ /// The endpoint that serves the same compressed file through content negotiation has the full label of the
+ /// uncompressed asset, such as "_content/Package/scripts/app.js" for "scripts/app.js.gz".
+ ///
+ private static string GetBasePathFromUncompressedLabel(
+ StaticAssetDescriptor descriptor,
+ string label,
+ Dictionary> labelsByAssetPath)
+ {
+ var extensionIndex = label.LastIndexOf('.');
+ if (extensionIndex <= 0 || !labelsByAssetPath.TryGetValue(descriptor.AssetPath, out var uncompressedLabels))
+ {
+ return string.Empty;
+ }
+
+ var uncompressedLabel = label.Substring(0, extensionIndex);
+ foreach (var fullLabel in uncompressedLabels)
+ {
+ if (fullLabel.Length > uncompressedLabel.Length &&
+ fullLabel.EndsWith("/" + uncompressedLabel, StringComparison.OrdinalIgnoreCase))
+ {
+ return fullLabel.Substring(0, fullLabel.Length - uncompressedLabel.Length);
+ }
+ }
+
+ return string.Empty;
+ }
+
+ private static string GetBasePathFromRoute(string route, string label)
+ {
+ var routeDirectory = GetDirectory(route);
+ var labelDirectory = GetDirectory(label);
+ if (!routeDirectory.EndsWith(labelDirectory, StringComparison.OrdinalIgnoreCase))
+ {
+ return string.Empty;
+ }
+
+ return routeDirectory.Substring(0, routeDirectory.Length - labelDirectory.Length);
+ }
+
+ private static string GetDirectory(string path)
+ {
+ var index = path.LastIndexOf('/');
+ return index < 0 ? string.Empty : path.Substring(0, index + 1);
+ }
+
+ private static string? GetLabel(StaticAssetDescriptor descriptor)
+ {
+ return descriptor.Properties.FirstOrDefault(IsLabel)?.Value;
+ }
+
+ private static void SetLabel(StaticAssetDescriptor descriptor, string label)
+ {
+ descriptor.Properties = descriptor.Properties
+ .Select(property => IsLabel(property) ? new StaticAssetProperty(property.Name, label) : property)
+ .ToList();
+ }
+
+ private static bool IsLabel(StaticAssetProperty property)
+ {
+ return property.Name.Equals(LabelPropertyName, StringComparison.OrdinalIgnoreCase);
+ }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore/buildTransitive/Volo.Abp.AspNetCore.targets b/framework/src/Volo.Abp.AspNetCore/buildTransitive/Volo.Abp.AspNetCore.targets
index ac2b3a951d..fecfbe06b4 100644
--- a/framework/src/Volo.Abp.AspNetCore/buildTransitive/Volo.Abp.AspNetCore.targets
+++ b/framework/src/Volo.Abp.AspNetCore/buildTransitive/Volo.Abp.AspNetCore.targets
@@ -1,14 +1,9 @@
-
-
+
+
false
-
-
-
- false
-
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
index f77908170f..6c29d29b9a 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
@@ -22,6 +22,10 @@
+
+
+
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj
index 4f5cbe34c1..61d0af8512 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj
@@ -22,6 +22,10 @@
+
+
+
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj
index ee88c8680a..22b4e4d155 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj
@@ -22,6 +22,10 @@
+
+
+
diff --git a/global.json b/global.json
index 390868cfce..e26c590b52 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "11.0.100-rc.3.26522.148",
+ "version": "11.0.100",
"rollForward": "latestFeature"
}
}
diff --git a/modules/virtual-file-explorer/app/DemoApp.csproj b/modules/virtual-file-explorer/app/DemoApp.csproj
index 645007cd56..6e1a7c9523 100644
--- a/modules/virtual-file-explorer/app/DemoApp.csproj
+++ b/modules/virtual-file-explorer/app/DemoApp.csproj
@@ -46,11 +46,11 @@
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
index a98fb37270..d63af671bc 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
@@ -79,7 +79,7 @@
-
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
index 5875d4c666..d978422cc6 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@@ -80,15 +80,15 @@
-
+
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
index ad40cfa715..39965495bc 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj
index 876f70f75c..e5f8fa50d5 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj
@@ -8,7 +8,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj
index b4882d49fe..83f9593bf8 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj
@@ -8,7 +8,7 @@
-
+
@@ -79,15 +79,15 @@
-
+
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared/MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared/MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj
index 6a81e7e7be..39383ea211 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared/MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Shared/MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj
@@ -29,7 +29,7 @@
-
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
index 652aedb847..1bb5d7791e 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
@@ -73,7 +73,7 @@
-
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
index 6199b1b9ca..1a20922087 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
@@ -74,15 +74,15 @@
-
+
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
index 84611a527e..0d15d4c21c 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
@@ -76,7 +76,7 @@
-
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
index c0627e78c5..09c2188556 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
@@ -77,15 +77,15 @@
-
+
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
-
+
runtime; build; native; contentfiles; analyzers
compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
index c15806f4da..7867f969d3 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
@@ -41,7 +41,7 @@
-
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj
index b02a2f0c46..7103663e64 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
index 5d59d2e13d..3183918333 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
index 261ac115e8..6eb898e8b2 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj
index 4ced8a7834..848eb50c6c 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj
index fc053427a2..05420366fb 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj
index 17dd59ee29..155cecbe13 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj
@@ -15,10 +15,10 @@
-
+
-
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj
index ec6822f4f1..86b61362a5 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
index 50994ac5d7..a28ec67d57 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj
index e525fb1eb9..1019bf3629 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj
@@ -22,7 +22,7 @@
-
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj
index 30a3014454..9ec6095665 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj
@@ -26,7 +26,7 @@
-
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj
index 9b1018a058..c7c68d0093 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj
@@ -22,11 +22,11 @@
-
+
all
runtime; build; native; contentfiles; analyzers
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
index 1a39ca986a..84573dc583 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
index 0eddc3f5fe..48689c2cb8 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj
index 68e814e28b..85dac23304 100644
--- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj
+++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj
@@ -22,8 +22,8 @@
-
-
+
+
diff --git a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
index dc8a68c078..1326742b0e 100644
--- a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
+++ b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/templates/maui/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/maui/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
index 17d4d97c11..06e71921fc 100644
--- a/templates/maui/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
+++ b/templates/maui/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
@@ -35,7 +35,7 @@
-
+
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
index d9cde25d68..643248ea97 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj
@@ -13,12 +13,12 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj
index 77d6fb8579..b9d639dd85 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
index acec683e13..2c3dc35424 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj
index 7e688ed4fd..0fb1699088 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
index 19073b122c..1eca600d5b 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj
@@ -14,10 +14,10 @@
-
-
-
-
+
+
+
+
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
index 9259b2fd67..c3619e897d 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj
index f7a8b3b02c..4126537ca8 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj
@@ -13,11 +13,11 @@
-
+
all
runtime; build; native; contentfiles; analyzers
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj
index a3fb96bdd6..62e431afd6 100644
--- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj
+++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
index bca8c23f26..ea9c328cac 100644
--- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
+++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
@@ -22,7 +22,7 @@
-
+
diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj
index 2c3a062c02..f064fdf6f8 100644
--- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj
+++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj
index d7cc76fa3e..ae4a94d1ed 100644
--- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj
+++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
index 69f7ae768f..283aa9a67f 100644
--- a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
+++ b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
@@ -14,7 +14,7 @@
-
+