diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Internal/ResponseContentTypeHelper.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Internal/ResponseContentTypeHelper.cs
index 7a492371b9..1389365715 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Internal/ResponseContentTypeHelper.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Internal/ResponseContentTypeHelper.cs
@@ -7,7 +7,7 @@ using Microsoft.Net.Http.Headers;
namespace Microsoft.AspNetCore.Internal;
///
-/// https://github.com/dotnet/aspnetcore/blob/release/7.0/src/Shared/ResponseContentTypeHelper.cs
+/// https://github.com/dotnet/aspnetcore/blob/release/8.0-rc1/src/Shared/ResponseContentTypeHelper.cs
///
public static class ResponseContentTypeHelper
{
@@ -15,7 +15,7 @@ public static class ResponseContentTypeHelper
/// Gets the content type and encoding that need to be used for the response.
/// The priority for selecting the content type is:
/// 1. ContentType property set on the action result
- /// 2. property set on
+ /// 2. property set on
/// 3. Default content type set on the action result
///
///
@@ -75,4 +75,4 @@ public static class ResponseContentTypeHelper
return default;
}
-}
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Options/AbpOptionsFactory.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Options/AbpOptionsFactory.cs
index 1f86e73eb3..0be4b54956 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Options/AbpOptionsFactory.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Options/AbpOptionsFactory.cs
@@ -1,20 +1,21 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using Microsoft.Extensions.Options;
namespace Volo.Abp.Options;
//TODO: Derive from OptionsFactory when this is released: https://github.com/aspnet/Options/pull/258 (or completely remove this!)
-// https://github.com/dotnet/runtime/blob/master/src/libraries/Microsoft.Extensions.Options/src/OptionsFactory.cs
+// https://github.com/dotnet/runtime/blob/release/8.0-rc1/src/libraries/Microsoft.Extensions.Options/src/OptionsFactory.cs#L9
public class AbpOptionsFactory : IOptionsFactory where TOptions : class, new()
{
- private readonly IEnumerable> _setups;
- private readonly IEnumerable> _postConfigures;
- private readonly IEnumerable>? _validations;
+ private readonly IConfigureOptions[] _setups;
+ private readonly IPostConfigureOptions[] _postConfigures;
+ private readonly IValidateOptions[] _validations;
public AbpOptionsFactory(
IEnumerable> setups,
IEnumerable> postConfigures)
- : this(setups, postConfigures, validations: null)
+ : this(setups, postConfigures, validations: Array.Empty>())
{
}
@@ -22,16 +23,16 @@ public class AbpOptionsFactory : IOptionsFactory where TOpti
public AbpOptionsFactory(
IEnumerable> setups,
IEnumerable> postConfigures,
- IEnumerable>? validations)
+ IEnumerable> validations)
{
- _setups = setups;
- _postConfigures = postConfigures;
- _validations = validations;
+ _setups = setups as IConfigureOptions[] ?? new List>(setups).ToArray();
+ _postConfigures = postConfigures as IPostConfigureOptions[] ?? new List>(postConfigures).ToArray();
+ _validations = validations as IValidateOptions[] ?? new List>(validations).ToArray();
}
public virtual TOptions Create(string name)
{
- var options = new TOptions();
+ var options = CreateInstance(name);
ConfigureOptions(name, options);
PostConfigureOptions(name, options);
@@ -65,21 +66,28 @@ public class AbpOptionsFactory : IOptionsFactory where TOpti
protected virtual void ValidateOptions(string name, TOptions options)
{
- if (_validations != null)
+ if (_validations.Length <= 0)
{
- var failures = new List();
- foreach (var validate in _validations)
- {
- var result = validate.Validate(name, options);
- if (result.Failed)
- {
- failures.AddRange(result.Failures);
- }
- }
- if (failures.Count > 0)
+ return;
+ }
+
+ var failures = new List();
+ foreach (var validate in _validations)
+ {
+ var result = validate.Validate(name, options);
+ if (result.Failed)
{
- throw new OptionsValidationException(name, typeof(TOptions), failures);
+ failures.AddRange(result.Failures);
}
}
+ if (failures.Count > 0)
+ {
+ throw new OptionsValidationException(name, typeof(TOptions), failures);
+ }
+ }
+
+ protected virtual TOptions CreateInstance(string name)
+ {
+ return Activator.CreateInstance();
}
}
diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContextModelCreatingExtensions.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContextModelCreatingExtensions.cs
index 849ac3c5d5..5b51c8809d 100644
--- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContextModelCreatingExtensions.cs
+++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContextModelCreatingExtensions.cs
@@ -28,7 +28,7 @@ public static class BackgroundJobsDbContextModelCreatingExtensions
b.Property(x => x.NextTryTime);
b.Property(x => x.LastTryTime);
b.Property(x => x.IsAbandoned).HasDefaultValue(false);
- b.Property(x => x.Priority).HasDefaultValue(BackgroundJobPriority.Normal);
+ b.Property(x => x.Priority).HasDefaultValue(BackgroundJobPriority.Normal).HasSentinel(BackgroundJobPriority.Normal);
b.HasIndex(x => new { x.IsAbandoned, x.NextTryTime });
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20230713030359_Initial.Designer.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20231003031426_Initial.Designer.cs
similarity index 98%
rename from templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20230713030359_Initial.Designer.cs
rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20231003031426_Initial.Designer.cs
index f9551bd313..e73ffc0d1d 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20230713030359_Initial.Designer.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20231003031426_Initial.Designer.cs
@@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
{
[DbContext(typeof(MyProjectNameDbContext))]
- [Migration("20230713030359_Initial")]
+ [Migration("20231003031426_Initial")]
partial class Initial
{
///
@@ -22,7 +22,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
- .HasAnnotation("ProductVersion", "7.0.1")
+ .HasAnnotation("ProductVersion", "8.0.0-rc.1.23419.6")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -65,6 +65,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -85,6 +86,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("datetime2");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -419,6 +421,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -428,6 +431,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("nvarchar(256)");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -493,6 +497,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -501,6 +506,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -593,6 +599,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -605,6 +612,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("datetime2");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -654,6 +662,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -690,6 +699,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -974,6 +984,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1004,6 +1015,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1082,6 +1094,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1113,6 +1126,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("nvarchar(max)");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1170,6 +1184,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1194,6 +1209,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnName("DeletionTime");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1244,6 +1260,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1277,6 +1294,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("nvarchar(max)");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1325,6 +1343,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1352,6 +1371,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("datetime2");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1610,6 +1630,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1634,6 +1655,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20230713030359_Initial.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20231003031426_Initial.cs
similarity index 98%
rename from templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20230713030359_Initial.cs
rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20231003031426_Initial.cs
index c06a4f0ae5..8b6e1b81cf 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20230713030359_Initial.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20231003031426_Initial.cs
@@ -37,8 +37,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
Exceptions = table.Column(type: "nvarchar(max)", nullable: true),
Comments = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true),
HttpStatusCode = table.Column(type: "int", nullable: true),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true)
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false)
},
constraints: table =>
{
@@ -57,8 +57,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
RegexDescription = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true),
Description = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true),
ValueType = table.Column(type: "int", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true)
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false)
},
constraints: table =>
{
@@ -141,8 +141,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
Code = table.Column(type: "nvarchar(95)", maxLength: 95, nullable: false),
DisplayName = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false),
EntityVersion = table.Column(type: "int", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
@@ -222,8 +222,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
IsStatic = table.Column(type: "bit", nullable: false),
IsPublic = table.Column(type: "bit", nullable: false),
EntityVersion = table.Column(type: "int", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true)
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false)
},
constraints: table =>
{
@@ -247,8 +247,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
ClientIpAddress = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true),
BrowserInfo = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: true),
CreationTime = table.Column(type: "datetime2", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true)
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false)
},
constraints: table =>
{
@@ -297,8 +297,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
Id = table.Column(type: "uniqueidentifier", nullable: false),
Name = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false),
EntityVersion = table.Column(type: "int", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
@@ -354,8 +354,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
ShouldChangePasswordOnNextLogin = table.Column(type: "bit", nullable: false),
EntityVersion = table.Column(type: "int", nullable: false),
LastPasswordChangeTime = table.Column(type: "datetimeoffset", nullable: true),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
@@ -387,8 +387,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true),
ClientUri = table.Column(type: "nvarchar(max)", nullable: true),
LogoUri = table.Column(type: "nvarchar(max)", nullable: true),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
@@ -414,8 +414,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
Name = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: true),
Properties = table.Column(type: "nvarchar(max)", nullable: true),
Resources = table.Column(type: "nvarchar(max)", nullable: true),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
@@ -673,8 +673,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
Status = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true),
Subject = table.Column(type: "nvarchar(400)", maxLength: 400, nullable: true),
Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
@@ -732,8 +732,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
Status = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true),
Subject = table.Column(type: "nvarchar(400)", maxLength: 400, nullable: true),
Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/MyProjectNameDbContextModelSnapshot.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/MyProjectNameDbContextModelSnapshot.cs
index a4bed9e946..cdb1b5bacf 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/MyProjectNameDbContextModelSnapshot.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/MyProjectNameDbContextModelSnapshot.cs
@@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
- .HasAnnotation("ProductVersion", "7.0.1")
+ .HasAnnotation("ProductVersion", "8.0.0-rc.1.23419.6")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -62,6 +62,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -82,6 +83,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("datetime2");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -416,6 +418,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -425,6 +428,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("nvarchar(256)");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -490,6 +494,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -498,6 +503,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -590,6 +596,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -602,6 +609,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("datetime2");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -651,6 +659,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -687,6 +696,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -971,6 +981,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1001,6 +1012,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1079,6 +1091,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1110,6 +1123,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("nvarchar(max)");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1167,6 +1181,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1191,6 +1206,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnName("DeletionTime");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1241,6 +1257,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1274,6 +1291,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("nvarchar(max)");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1322,6 +1340,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1349,6 +1368,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("datetime2");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1607,6 +1627,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1631,6 +1652,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Migrations/20230713030712_Initial.Designer.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Migrations/20231003031450_Initial.Designer.cs
similarity index 98%
rename from templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Migrations/20230713030712_Initial.Designer.cs
rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Migrations/20231003031450_Initial.Designer.cs
index 3e93b9fd7f..f2ed06d4cd 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Migrations/20230713030712_Initial.Designer.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Migrations/20231003031450_Initial.Designer.cs
@@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace MyCompanyName.MyProjectName.Migrations
{
[DbContext(typeof(MyProjectNameDbContext))]
- [Migration("20230713030712_Initial")]
+ [Migration("20231003031450_Initial")]
partial class Initial
{
///
@@ -22,7 +22,7 @@ namespace MyCompanyName.MyProjectName.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
- .HasAnnotation("ProductVersion", "7.0.1")
+ .HasAnnotation("ProductVersion", "8.0.0-rc.1.23419.6")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -65,6 +65,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -85,6 +86,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("datetime2");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -419,6 +421,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -428,6 +431,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("nvarchar(256)");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -493,6 +497,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -501,6 +506,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -593,6 +599,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -605,6 +612,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("datetime2");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -654,6 +662,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -690,6 +699,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -974,6 +984,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1004,6 +1015,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1082,6 +1094,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1113,6 +1126,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("nvarchar(max)");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1170,6 +1184,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1194,6 +1209,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnName("DeletionTime");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1244,6 +1260,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1277,6 +1294,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("nvarchar(max)");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1325,6 +1343,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1352,6 +1371,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("datetime2");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
@@ -1610,6 +1630,7 @@ namespace MyCompanyName.MyProjectName.Migrations
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
+ .IsRequired()
.HasMaxLength(40)
.HasColumnType("nvarchar(40)")
.HasColumnName("ConcurrencyStamp");
@@ -1634,6 +1655,7 @@ namespace MyCompanyName.MyProjectName.Migrations
.HasColumnType("int");
b.Property("ExtraProperties")
+ .IsRequired()
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20230713030452_Initial.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Migrations/20231003031450_Initial.cs
similarity index 98%
rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20230713030452_Initial.cs
rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Migrations/20231003031450_Initial.cs
index d88b3c07fb..d79d7169cb 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20230713030452_Initial.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Migrations/20231003031450_Initial.cs
@@ -37,8 +37,8 @@ namespace MyCompanyName.MyProjectName.Migrations
Exceptions = table.Column(type: "nvarchar(max)", nullable: true),
Comments = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true),
HttpStatusCode = table.Column(type: "int", nullable: true),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true)
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false)
},
constraints: table =>
{
@@ -57,8 +57,8 @@ namespace MyCompanyName.MyProjectName.Migrations
RegexDescription = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true),
Description = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true),
ValueType = table.Column(type: "int", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true)
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false)
},
constraints: table =>
{
@@ -141,8 +141,8 @@ namespace MyCompanyName.MyProjectName.Migrations
Code = table.Column(type: "nvarchar(95)", maxLength: 95, nullable: false),
DisplayName = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false),
EntityVersion = table.Column(type: "int", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
@@ -222,8 +222,8 @@ namespace MyCompanyName.MyProjectName.Migrations
IsStatic = table.Column(type: "bit", nullable: false),
IsPublic = table.Column(type: "bit", nullable: false),
EntityVersion = table.Column(type: "int", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true)
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false)
},
constraints: table =>
{
@@ -247,8 +247,8 @@ namespace MyCompanyName.MyProjectName.Migrations
ClientIpAddress = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true),
BrowserInfo = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: true),
CreationTime = table.Column(type: "datetime2", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true)
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false)
},
constraints: table =>
{
@@ -297,8 +297,8 @@ namespace MyCompanyName.MyProjectName.Migrations
Id = table.Column(type: "uniqueidentifier", nullable: false),
Name = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false),
EntityVersion = table.Column(type: "int", nullable: false),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
@@ -354,8 +354,8 @@ namespace MyCompanyName.MyProjectName.Migrations
ShouldChangePasswordOnNextLogin = table.Column(type: "bit", nullable: false),
EntityVersion = table.Column(type: "int", nullable: false),
LastPasswordChangeTime = table.Column(type: "datetimeoffset", nullable: true),
- ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
- ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: false),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: false),
CreationTime = table.Column(type: "datetime2", nullable: false),
CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column(type: "datetime2", nullable: true),
@@ -387,8 +387,8 @@ namespace MyCompanyName.MyProjectName.Migrations
Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true),
ClientUri = table.Column(type: "nvarchar(max)", nullable: true),
LogoUri = table.Column(type: "nvarchar(max)", nullable: true),
- ExtraProperties = table.Column