efcore · roji · Apr 27, 2021 · Nov 19, 2021
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/setup-dotnet@v1.8.2
         with:
-          dotnet-version: '5.0.x'
+          dotnet-version: '6.0.100'
 
       - name: Test
         run: dotnet test

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,8 +4,9 @@
     <AnalysisLevel>latest</AnalysisLevel>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,10 +1,11 @@
 <Project>
   <PropertyGroup>
-    <EFCoreVersion>5.0.12</EFCoreVersion>
+    <EFCoreVersion>6.0.0</EFCoreVersion>
+    <MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
 

diff --git a/EFCore.CheckConstraints.Test/DiscriminatorCheckConstraintTest.cs b/EFCore.CheckConstraints.Test/DiscriminatorCheckConstraintTest.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions;
+using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -29,9 +30,9 @@ public void Generate_check_constraint_with_all_enum_names()
                 });
             });
 
-            var checkConstraint = Assert.Single(model.FindEntityType("Parent").GetCheckConstraints());
+            var checkConstraint = Assert.Single(model.FindEntityType("Parent")!.GetCheckConstraints());
             Assert.NotNull(checkConstraint);
-            Assert.Equal("CK_Parent_Discriminator", checkConstraint.Name);
+            Assert.Equal("CK_Parent_Discriminator", checkConstraint!.Name);
             Assert.Equal("[Discriminator] IN (N'Child', N'Parent')", checkConstraint.Sql);
         }
 
@@ -45,7 +46,7 @@ public void Generate_check_constraint_skips_abstract_types()
                 b.Entity<Derived>();
             });
 
-            var checkConstraint = Assert.Single(model.FindEntityType(typeof(Base)).GetCheckConstraints());
+            var checkConstraint = Assert.Single(model.FindEntityType(typeof(Base))!.GetCheckConstraints());
             Assert.NotNull(checkConstraint);
             Assert.Equal("CK_Base_Discriminator", checkConstraint.Name);
             Assert.Equal("[Discriminator] IN (N'Base', N'Derived')", checkConstraint.Sql);
@@ -59,12 +60,12 @@ private class Base
 
         private abstract class Intermediate : Base
         {
-            public string Value { get; set; }
+            public string Value { get; set; }  = null!;
         }
 
         private class Derived : Intermediate
         {
-            public string Property { get; set; }
+            public string Property { get; set; } = null!;
         }
 
         #region Support
@@ -73,14 +74,20 @@ private IModel BuildModel(Action<ModelBuilder> buildAction)
         {
             var serviceProvider = SqlServerTestHelpers.Instance.CreateContextServices();
 
-            var conventionSet = SqlServerTestHelpers.Instance.CreateConventionSetBuilder().CreateConventionSet();
-            ConventionSet.Remove(conventionSet.ModelFinalizedConventions, typeof(ValidatingConvention));
+            var conventionSet = SqlServerTestHelpers
+                .Instance
+                .CreateContextServices()
+                .GetRequiredService<IConventionSetBuilder>()
+                .CreateConventionSet();
+
             conventionSet.ModelFinalizingConventions.Add(
-                new DiscriminatorCheckConstraintConvention(serviceProvider.GetRequiredService<ISqlGenerationHelper>()));
+                new DiscriminatorCheckConstraintConvention(
+                    serviceProvider.GetRequiredService<IRelationalTypeMappingSource>(),
+                    serviceProvider.GetRequiredService<ISqlGenerationHelper>()));
 
-            var builder = new ModelBuilder(conventionSet);
-            buildAction(builder);
-            return builder.FinalizeModel();
+            var modelBuilder = new ModelBuilder(conventionSet);
+            buildAction(modelBuilder);
+            return modelBuilder.FinalizeModel();
         }
 
         #endregion

diff --git a/EFCore.CheckConstraints.Test/EFCore.CheckConstraints.Test.csproj b/EFCore.CheckConstraints.Test/EFCore.CheckConstraints.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/EFCore.CheckConstraints.Test/EnumCheckConstraintTest.cs b/EFCore.CheckConstraints.Test/EnumCheckConstraintTest.cs
@@ -5,6 +5,7 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions;
+using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -96,13 +97,13 @@ public void TPH()
                 });
             });
 
-            var customerCheckConstraint = Assert.Single(model.FindEntityType("Customer").GetCheckConstraints());
+            var customerCheckConstraint = Assert.Single(model.FindEntityType("Customer")!.GetCheckConstraints());
             Assert.NotNull(customerCheckConstraint);
-            Assert.Equal("CK_Customer_Type_Enum", customerCheckConstraint.Name);
+            Assert.Equal("CK_Customer_Type_Enum", customerCheckConstraint!.Name);
 
-            var specialCustomerCheckConstraint = Assert.Single(model.FindEntityType("SpecialCustomer").GetCheckConstraints());
-            Assert.NotNull(specialCustomerCheckConstraint);
-            Assert.Equal("CK_Customer_AnotherType_Enum", specialCustomerCheckConstraint.Name);
+            Assert.Collection(model.FindEntityType("SpecialCustomer")!.GetCheckConstraints().OrderBy(ck => ck.Name),
+                ck => Assert.Equal("CK_Customer_AnotherType_Enum", ck.Name),
+                ck => Assert.Same(customerCheckConstraint, ck));
         }
 
         [Fact]
@@ -123,13 +124,14 @@ public void TPT()
                 });
             });
 
-            var customerCheckConstraint = Assert.Single(model.FindEntityType("Customer").GetCheckConstraints());
+            var customerCheckConstraint = Assert.Single(model.FindEntityType("Customer")!.GetCheckConstraints());
             Assert.NotNull(customerCheckConstraint);
-            Assert.Equal("CK_Customer_Type_Enum", customerCheckConstraint.Name);
+            Assert.Equal("CK_Customer_Type_Enum", customerCheckConstraint!.Name);
 
-            var specialCustomerCheckConstraint = Assert.Single(model.FindEntityType("SpecialCustomer").GetCheckConstraints());
-            Assert.NotNull(specialCustomerCheckConstraint);
-            Assert.Equal("CK_SpecialCustomer_AnotherType_Enum", specialCustomerCheckConstraint.Name);
+            Assert.Collection(
+                model.FindEntityType("SpecialCustomer")!.GetCheckConstraints().OrderBy(ck => ck.Name),
+                ck => Assert.Same(customerCheckConstraint, ck),
+                ck => Assert.Equal("CK_SpecialCustomer_AnotherType_Enum", ck.Name));
         }
 
         #region Support
@@ -153,10 +155,16 @@ private IModel BuildModel(Action<ModelBuilder> buildAction)
         {
             var serviceProvider = SqlServerTestHelpers.Instance.CreateContextServices();
 
-            var conventionSet = SqlServerTestHelpers.Instance.CreateConventionSetBuilder().CreateConventionSet();
-            ConventionSet.Remove(conventionSet.ModelFinalizedConventions, typeof(ValidatingConvention));
+            var conventionSet = SqlServerTestHelpers
+                .Instance
+                .CreateContextServices()
+                .GetRequiredService<IConventionSetBuilder>()
+                .CreateConventionSet();
+
             conventionSet.ModelFinalizingConventions.Add(
-                new EnumCheckConstraintConvention(serviceProvider.GetRequiredService<ISqlGenerationHelper>()));
+                new EnumCheckConstraintConvention(
+                    serviceProvider.GetRequiredService<IRelationalTypeMappingSource>(),
+                    serviceProvider.GetRequiredService<ISqlGenerationHelper>()));
 
             var builder = new ModelBuilder(conventionSet);
             buildAction(builder);

diff --git a/EFCore.CheckConstraints.Test/OptionsBuilderTest.cs b/EFCore.CheckConstraints.Test/OptionsBuilderTest.cs
@@ -21,7 +21,7 @@ public void DiscriminatorCheckConstraintOptionsTest()
             var options = extensions[0] as CheckConstraintsOptionsExtension;
 
             Assert.NotNull(options);
-            Assert.True(options.AreDiscriminatorCheckConstraintsEnabled);
+            Assert.True(options!.AreDiscriminatorCheckConstraintsEnabled);
             Assert.False(options.AreEnumCheckConstraintsEnabled);
             Assert.False(options.AreValidationCheckConstraintsEnabled);
             Assert.Equal("using check constraints (discriminators)", options.Info.LogFragment);
@@ -42,7 +42,7 @@ public void EnumCheckConstraintOptionsTest()
             var options = extensions[0] as CheckConstraintsOptionsExtension;
 
             Assert.NotNull(options);
-            Assert.False(options.AreDiscriminatorCheckConstraintsEnabled);
+            Assert.False(options!.AreDiscriminatorCheckConstraintsEnabled);
             Assert.True(options.AreEnumCheckConstraintsEnabled);
             Assert.False(options.AreValidationCheckConstraintsEnabled);
             Assert.Equal("using check constraints (enums)", options.Info.LogFragment);
@@ -63,15 +63,16 @@ public void ValidationCheckConstraintOptionsTest()
             var options = extensions[0] as CheckConstraintsOptionsExtension;
 
             Assert.NotNull(options);
-            Assert.False(options.AreDiscriminatorCheckConstraintsEnabled);
+            Assert.False(options!.AreDiscriminatorCheckConstraintsEnabled);
             Assert.False(options.AreEnumCheckConstraintsEnabled);
             Assert.True(options.AreValidationCheckConstraintsEnabled);
             Assert.Equal("using check constraints (validation)", options.Info.LogFragment);
             Assert.NotNull(options.ValidationCheckConstraintOptions);
 
             var validationOptions = options.ValidationCheckConstraintOptions;
 
-            Assert.Null(validationOptions.CreditCardRegex);
+            Assert.NotNull(validationOptions);
+            Assert.Null(validationOptions!.CreditCardRegex);
             Assert.Null(validationOptions.EmailAddressRegex);
             Assert.Null(validationOptions.PhoneRegex);
             Assert.Null(validationOptions.UrlRegex);
@@ -92,15 +93,16 @@ public void ValidationCheckConstraintOptionsNoRegexTest()
             var options = extensions[0] as CheckConstraintsOptionsExtension;
 
             Assert.NotNull(options);
-            Assert.False(options.AreDiscriminatorCheckConstraintsEnabled);
+            Assert.False(options!.AreDiscriminatorCheckConstraintsEnabled);
             Assert.False(options.AreEnumCheckConstraintsEnabled);
             Assert.True(options.AreValidationCheckConstraintsEnabled);
             Assert.Equal("using check constraints (validation)", options.Info.LogFragment);
             Assert.NotNull(options.ValidationCheckConstraintOptions);
 
             var validationOptions = options.ValidationCheckConstraintOptions;
 
-            Assert.Null(validationOptions.CreditCardRegex);
+            Assert.NotNull(validationOptions);
+            Assert.Null(validationOptions!.CreditCardRegex);
             Assert.Null(validationOptions.EmailAddressRegex);
             Assert.Null(validationOptions.PhoneRegex);
             Assert.Null(validationOptions.UrlRegex);
@@ -121,14 +123,15 @@ public void AllCheckConstraintOptionsTest()
             var options = extensions[0] as CheckConstraintsOptionsExtension;
 
             Assert.NotNull(options);
-            Assert.True(options.AreDiscriminatorCheckConstraintsEnabled);
+            Assert.True(options!.AreDiscriminatorCheckConstraintsEnabled);
             Assert.True(options.AreEnumCheckConstraintsEnabled);
             Assert.True(options.AreValidationCheckConstraintsEnabled);
             Assert.NotNull(options.ValidationCheckConstraintOptions);
 
             var validationOptions = options.ValidationCheckConstraintOptions;
 
-            Assert.Null(validationOptions.CreditCardRegex);
+            Assert.NotNull(validationOptions);
+            Assert.Null(validationOptions!.CreditCardRegex);
             Assert.Null(validationOptions.EmailAddressRegex);
             Assert.Null(validationOptions.PhoneRegex);
             Assert.Null(validationOptions.UrlRegex);
@@ -149,14 +152,15 @@ public void AllCheckConstraintOptionsNoRegexTest()
             var options = extensions[0] as CheckConstraintsOptionsExtension;
 
             Assert.NotNull(options);
-            Assert.True(options.AreDiscriminatorCheckConstraintsEnabled);
+            Assert.True(options!.AreDiscriminatorCheckConstraintsEnabled);
             Assert.True(options.AreEnumCheckConstraintsEnabled);
             Assert.True(options.AreValidationCheckConstraintsEnabled);
             Assert.NotNull(options.ValidationCheckConstraintOptions);
 
             var validationOptions = options.ValidationCheckConstraintOptions;
 
-            Assert.Null(validationOptions.CreditCardRegex);
+            Assert.NotNull(validationOptions);
+            Assert.Null(validationOptions!.CreditCardRegex);
             Assert.Null(validationOptions.EmailAddressRegex);
             Assert.Null(validationOptions.PhoneRegex);
             Assert.Null(validationOptions.UrlRegex);

diff --git a/EFCore.CheckConstraints.Test/TestUtilities/SqlServerTestHelpers.cs b/EFCore.CheckConstraints.Test/TestUtilities/SqlServerTestHelpers.cs
@@ -12,7 +12,7 @@ protected SqlServerTestHelpers()
         {
         }
 
-        public static SqlServerTestHelpers Instance { get; } = new SqlServerTestHelpers();
+        public static SqlServerTestHelpers Instance { get; } = new();
 
         public override IServiceCollection AddProviderServices(IServiceCollection services)
             => services.AddEntityFrameworkSqlServer();

diff --git a/EFCore.CheckConstraints.Test/ValidationCheckConstraintTest.cs b/EFCore.CheckConstraints.Test/ValidationCheckConstraintTest.cs
@@ -6,6 +6,7 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Metadata.Conventions;
+using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -117,34 +118,47 @@ public virtual void RegularExpression()
         class Blog
         {
             public int Id { get; set; }
+
             [Range(1, 5)]
             public int Rating { get; set; }
+
             [MinLength(4)]
-            public string Name { get; set; }
+            public string Name { get; set; } = null!;
+
             [StringLength(100, MinimumLength = 1)]
-            public string Required { get; set; }
+            public string Required { get; set; } = null!;
+
             [Phone]
-            public string PhoneNumber { get; set; }
+            public string PhoneNumber { get; set; } = null!;
+
             [CreditCard]
-            public string CreditCard { get; set; }
+            public string CreditCard { get; set; } = null!;
+
             [EmailAddress]
-            public string Email { get; set; }
+            public string Email { get; set; } = null!;
+
             [Url]
-            public string Address { get; set; }
+            public string Address { get; set; } = null!;
+
             [RegularExpression("^A")]
-            public string StartsWithA { get; set; }
+            public string StartsWithA { get; set; } = null!;
         }
         // ReSharper restore UnusedMember.Local
 
         private IModel BuildModel(Action<ModelBuilder> buildAction, bool useRegex)
         {
             var serviceProvider = SqlServerTestHelpers.Instance.CreateContextServices();
 
-            var conventionSet = SqlServerTestHelpers.Instance.CreateConventionSetBuilder().CreateConventionSet();
-            ConventionSet.Remove(conventionSet.ModelFinalizedConventions, typeof(ValidatingConvention));
+            var conventionSet = SqlServerTestHelpers
+                .Instance
+                .CreateContextServices()
+                .GetRequiredService<IConventionSetBuilder>()
+                .CreateConventionSet();
+
             conventionSet.ModelFinalizingConventions.Add(
                 new ValidationCheckConstraintConvention(
-                    new ValidationCheckConstraintOptions() { UseRegex = useRegex },
+                    new ValidationCheckConstraintOptions { UseRegex = useRegex },
+                    serviceProvider.GetRequiredService<IRelationalTypeMappingSource>(),
                     serviceProvider.GetRequiredService<ISqlGenerationHelper>(),
                     serviceProvider.GetRequiredService<IRelationalTypeMappingSource>(),
                     serviceProvider.GetRequiredService<IDatabaseProvider>()));
@@ -154,7 +168,7 @@ private IModel BuildModel(Action<ModelBuilder> buildAction, bool useRegex)
             return builder.FinalizeModel();
         }
 
-        private IEntityType BuildEntityType<TEntity>(Action<EntityTypeBuilder<TEntity>> buildAction = null, bool useRegex = true)
+        private IEntityType BuildEntityType<TEntity>(Action<EntityTypeBuilder<TEntity>>? buildAction = null, bool useRegex = true)
             where TEntity : class
         {
             return BuildModel(buildAction is null