Fixed more issues

koenbeuk · koenbeuk · commit 844bd85368c1 · 2021-09-17T05:40:43.000+08:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <Configurations>Debug;DebugV1;Release;ReleaseV1</Configurations>
+    <Configurations>Debug;Release;DebugV1;ReleaseV1;DebugV2;ReleaseV2</Configurations>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/samples/v1/Directory.Build.props b/samples/v1/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <Configurations>Debug;Release;DebugV1;ReleaseV1;DebugV2;ReleaseV2</Configurations>
     <EFCoreTriggeredPackageVersion Condition=" '$(EFCoreTriggeredPackageVersion )'=='' ">1.4.0</EFCoreTriggeredPackageVersion >
   </PropertyGroup>
 </Project>
diff --git a/samples/v2/Directory.Build.props b/samples/v2/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <Configurations>Debug;Release;DebugV1;ReleaseV1;DebugV2;ReleaseV2</Configurations>
     <EFCorePackageVersion Condition=" '$(EFCorePackageVersion)'=='' ">5.0.0</EFCorePackageVersion>
     <EFCoreTriggeredPackageVersion Condition=" '$(EFCoreTriggeredPackageVersion )'=='' ">2.3.2</EFCoreTriggeredPackageVersion>
   </PropertyGroup>
diff --git a/src/EntityFrameworkCore.Triggered.Transactions/Internal/AfterCommitTriggerDescriptor.cs b/src/EntityFrameworkCore.Triggered.Transactions/Internal/AfterCommitTriggerDescriptor.cs
@@ -15,10 +15,9 @@ public AfterCommitTriggerDescriptor(Type entityType)
         {
             var triggerType = typeof(IAfterCommitTrigger<>).MakeGenericType(entityType);
             var triggerMethod = triggerType.GetMethod(nameof(IAfterCommitTrigger<object>.AfterCommit));
-            Debug.Assert(triggerMethod is not null);
 
             _triggerType = triggerType;
-            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);
+            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);
         }
 
         public Type TriggerType => _triggerType;
diff --git a/src/EntityFrameworkCore.Triggered.Transactions/Internal/AfterRollbackTriggerDescriptor.cs b/src/EntityFrameworkCore.Triggered.Transactions/Internal/AfterRollbackTriggerDescriptor.cs
@@ -15,10 +15,9 @@ public AfterRollbackTriggerDescriptor(Type entityType)
         {
             var triggerType = typeof(IAfterRollbackTrigger<>).MakeGenericType(entityType);
             var triggerMethod = triggerType.GetMethod(nameof(IAfterRollbackTrigger<object>.AfterRollback));
-            Debug.Assert(triggerMethod is not null);
 
             _triggerType = triggerType;
-            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);
+            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);
         }
 
         public Type TriggerType => _triggerType;
diff --git a/src/EntityFrameworkCore.Triggered.Transactions/Internal/BeforeCommitTriggerDescriptor.cs b/src/EntityFrameworkCore.Triggered.Transactions/Internal/BeforeCommitTriggerDescriptor.cs
@@ -15,10 +15,9 @@ public BeforeCommitTriggerDescriptor(Type entityType)
         {
             var triggerType = typeof(IBeforeCommitTrigger<>).MakeGenericType(entityType);
             var triggerMethod = triggerType.GetMethod(nameof(IBeforeCommitTrigger<object>.BeforeCommit));
-            Debug.Assert(triggerMethod is not null);
 
             _triggerType = triggerType;
-            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);
+            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);
         }
 
         public Type TriggerType => _triggerType;
diff --git a/src/EntityFrameworkCore.Triggered.Transactions/Internal/BeforeRollbackTriggerDescriptor.cs b/src/EntityFrameworkCore.Triggered.Transactions/Internal/BeforeRollbackTriggerDescriptor.cs
@@ -15,10 +15,9 @@ public BeforeRollbackTriggerDescriptor(Type entityType)
         {
             var triggerType = typeof(IBeforeRollbackTrigger<>).MakeGenericType(entityType);
             var triggerMethod = triggerType.GetMethod(nameof(IBeforeRollbackTrigger<object>.BeforeRollback));
-            Debug.Assert(triggerMethod is not null);
 
             _triggerType = triggerType;
-            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);
+            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);
         }
 
         public Type TriggerType => _triggerType;
diff --git a/src/EntityFrameworkCore.Triggered/Extensions/ServiceCollectionExtensions.cs b/src/EntityFrameworkCore.Triggered/Extensions/ServiceCollectionExtensions.cs
@@ -143,6 +143,10 @@ public static IServiceCollection AddTriggeredPooledDbContextFactory<TContext>(th
                     lifetime: ServiceLifetime.Scoped
                 ));
             }
+            else if (serviceDescriptor?.ImplementationFactory != null)
+            {
+                throw new NotImplementedException();
+            }
 
             return serviceCollection;
         }
diff --git a/src/EntityFrameworkCore.Triggered/Infrastructure/Internal/TriggersOptionExtension.cs b/src/EntityFrameworkCore.Triggered/Infrastructure/Internal/TriggersOptionExtension.cs
@@ -84,8 +84,8 @@ public override int GetServiceProviderHashCode()
 
             public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other)
                 => other is ExtensionInfo otherInfo
-                    && Extension._triggers == otherInfo.Extension._triggers
-                    && Extension._triggers == otherInfo.Extension._triggerTypes
+                    && Enumerable.SequenceEqual(Extension._triggers ?? Enumerable.Empty<ValueTuple<object, ServiceLifetime>>(), otherInfo.Extension._triggers ?? Enumerable.Empty<ValueTuple<object, ServiceLifetime>>())
+                    && Enumerable.SequenceEqual(Extension._triggerTypes ?? Enumerable.Empty<Type>(), otherInfo.Extension._triggerTypes ?? Enumerable.Empty<Type>())
                     && Extension._maxCascadeCycles == otherInfo.Extension._maxCascadeCycles
                     && Extension._cascadeBehavior == otherInfo.Extension._cascadeBehavior
                     && Extension._serviceProviderTransform == otherInfo.Extension._serviceProviderTransform;
diff --git a/src/EntityFrameworkCore.Triggered/Internal/AfterSaveFailedTriggerDescriptor.cs b/src/EntityFrameworkCore.Triggered/Internal/AfterSaveFailedTriggerDescriptor.cs
@@ -14,10 +14,9 @@ public AfterSaveFailedTriggerDescriptor(Type entityType, Exception exception)
         {
             var triggerType = typeof(IAfterSaveFailedTrigger<>).MakeGenericType(entityType);
             var triggerMethod = triggerType.GetMethod(nameof(IAfterSaveFailedTrigger<object>.AfterSaveFailed));
-            Debug.Assert(triggerMethod is not null);
 
             _triggerType = triggerType;
-            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegateWithException(triggerType, entityType, triggerMethod);
+            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegateWithException(triggerType, entityType, triggerMethod!);
         }
 
         public Type TriggerType => _triggerType;
diff --git a/src/EntityFrameworkCore.Triggered/Internal/AfterSaveTriggerDescriptor.cs b/src/EntityFrameworkCore.Triggered/Internal/AfterSaveTriggerDescriptor.cs
@@ -14,10 +14,9 @@ public AfterSaveTriggerDescriptor(Type entityType)
         {
             var triggerType = typeof(IAfterSaveTrigger<>).MakeGenericType(entityType);
             var triggerMethod = triggerType.GetMethod(nameof(IAfterSaveTrigger<object>.AfterSave));
-            Debug.Assert(triggerMethod is not null);
 
             _triggerType = triggerType;
-            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);
+            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);
         }
 
         public Type TriggerType => _triggerType;
diff --git a/src/EntityFrameworkCore.Triggered/Internal/ApplicationTriggerServiceProviderAccessor.cs b/src/EntityFrameworkCore.Triggered/Internal/ApplicationTriggerServiceProviderAccessor.cs
@@ -57,8 +57,7 @@ public IServiceProvider GetTriggerServiceProvider()
                 {
                     var dbContextOptions = _internalServiceProvider.GetRequiredService<IDbContextOptions>();
                     var coreOptionsExtension = dbContextOptions.FindExtension<CoreOptionsExtension>();
-                    Debug.Assert(coreOptionsExtension is not null);
-                    var serviceProvider = coreOptionsExtension.ApplicationServiceProvider ?? _internalServiceProvider;
+                    var serviceProvider = coreOptionsExtension!.ApplicationServiceProvider ?? _internalServiceProvider;
 
                     _applicationScopedServiceProvider = _scopedServiceProviderTransform(serviceProvider);
                 }
diff --git a/src/EntityFrameworkCore.Triggered/Internal/BeforeSaveTriggerDescriptor.cs b/src/EntityFrameworkCore.Triggered/Internal/BeforeSaveTriggerDescriptor.cs
@@ -14,10 +14,9 @@ public BeforeSaveTriggerDescriptor(Type entityType)
         {
             var triggerType = typeof(IBeforeSaveTrigger<>).MakeGenericType(entityType);
             var triggerMethod = triggerType.GetMethod(nameof(IBeforeSaveTrigger<object>.BeforeSave));
-            Debug.Assert(triggerMethod is not null);
 
             _triggerType = triggerType;
-            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);
+            _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);
         }
 
         public Type TriggerType => _triggerType;
diff --git a/src/EntityFrameworkCore.Triggered/Internal/TriggerTypeDescriptorHelpers.cs b/src/EntityFrameworkCore.Triggered/Internal/TriggerTypeDescriptorHelpers.cs
@@ -15,9 +15,7 @@ public static Func<object, object, CancellationToken, Task> GetWeakDelegate(Type
             var triggerContextType = typeof(ITriggerContext<>).MakeGenericType(entityType);
 
             var genericHelper = typeof(TriggerTypeDescriptorHelpers).GetMethod(nameof(TriggerTypeDescriptorHelpers.GetWeakDelegateHelper), BindingFlags.Static | BindingFlags.NonPublic);
-            Debug.Assert(genericHelper is not null);
-            var constructedHelper = genericHelper.MakeGenericMethod(triggerType, triggerContextType);
-            Debug.Assert(constructedHelper is not null);
+            var constructedHelper = genericHelper!.MakeGenericMethod(triggerType, triggerContextType);
 
             return (Func<object, object, CancellationToken, Task>)constructedHelper.Invoke(null, new object[] { method })!;
         }
@@ -27,9 +25,7 @@ public static Func<object, object, CancellationToken, Task> GetWeakDelegate(Type
             var triggerContextType = typeof(ITriggerContext<>).MakeGenericType(entityType);
 
             var genericHelper = typeof(TriggerTypeDescriptorHelpers).GetMethod(nameof(TriggerTypeDescriptorHelpers.GetWeakDelegateHelperWithException), BindingFlags.Static | BindingFlags.NonPublic);
-            Debug.Assert(genericHelper is not null);
-            var constructedHelper = genericHelper.MakeGenericMethod(triggerType, triggerContextType);
-            Debug.Assert(constructedHelper is not null);
+            var constructedHelper = genericHelper!.MakeGenericMethod(triggerType, triggerContextType);
 
             return (Func<object, object, Exception?, CancellationToken, Task>)constructedHelper.Invoke(null, new object[] { method })!;
         }

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,9 @@ public AfterCommitTriggerDescriptor(Type entityType)`
`15`	`15`	`{`
`16`	`16`	`var triggerType = typeof(IAfterCommitTrigger<>).MakeGenericType(entityType);`
`17`	`17`	`var triggerMethod = triggerType.GetMethod(nameof(IAfterCommitTrigger<object>.AfterCommit));`
`18`		`- Debug.Assert(triggerMethod is not null);`
`19`	`18`
`20`	`19`	`_triggerType = triggerType;`
`21`		`- _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);`
	`20`	`+ _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`public Type TriggerType => _triggerType;`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,9 @@ public AfterRollbackTriggerDescriptor(Type entityType)`
`15`	`15`	`{`
`16`	`16`	`var triggerType = typeof(IAfterRollbackTrigger<>).MakeGenericType(entityType);`
`17`	`17`	`var triggerMethod = triggerType.GetMethod(nameof(IAfterRollbackTrigger<object>.AfterRollback));`
`18`		`- Debug.Assert(triggerMethod is not null);`
`19`	`18`
`20`	`19`	`_triggerType = triggerType;`
`21`		`- _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);`
	`20`	`+ _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`public Type TriggerType => _triggerType;`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,9 @@ public BeforeCommitTriggerDescriptor(Type entityType)`
`15`	`15`	`{`
`16`	`16`	`var triggerType = typeof(IBeforeCommitTrigger<>).MakeGenericType(entityType);`
`17`	`17`	`var triggerMethod = triggerType.GetMethod(nameof(IBeforeCommitTrigger<object>.BeforeCommit));`
`18`		`- Debug.Assert(triggerMethod is not null);`
`19`	`18`
`20`	`19`	`_triggerType = triggerType;`
`21`		`- _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);`
	`20`	`+ _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`public Type TriggerType => _triggerType;`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,9 @@ public BeforeRollbackTriggerDescriptor(Type entityType)`
`15`	`15`	`{`
`16`	`16`	`var triggerType = typeof(IBeforeRollbackTrigger<>).MakeGenericType(entityType);`
`17`	`17`	`var triggerMethod = triggerType.GetMethod(nameof(IBeforeRollbackTrigger<object>.BeforeRollback));`
`18`		`- Debug.Assert(triggerMethod is not null);`
`19`	`18`
`20`	`19`	`_triggerType = triggerType;`
`21`		`- _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);`
	`20`	`+ _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`public Type TriggerType => _triggerType;`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,10 @@ public static IServiceCollection AddTriggeredPooledDbContextFactory<TContext>(th`
`143`	`143`	`lifetime: ServiceLifetime.Scoped`
`144`	`144`	`));`
`145`	`145`	`}`
	`146`	`+ else if (serviceDescriptor?.ImplementationFactory != null)`
	`147`	`+ {`
	`148`	`+ throw new NotImplementedException();`
	`149`	`+ }`
`146`	`150`
`147`	`151`	`return serviceCollection;`
`148`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,9 @@ public AfterSaveFailedTriggerDescriptor(Type entityType, Exception exception)`
`14`	`14`	`{`
`15`	`15`	`var triggerType = typeof(IAfterSaveFailedTrigger<>).MakeGenericType(entityType);`
`16`	`16`	`var triggerMethod = triggerType.GetMethod(nameof(IAfterSaveFailedTrigger<object>.AfterSaveFailed));`
`17`		`- Debug.Assert(triggerMethod is not null);`
`18`	`17`
`19`	`18`	`_triggerType = triggerType;`
`20`		`- _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegateWithException(triggerType, entityType, triggerMethod);`
	`19`	`+ _invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegateWithException(triggerType, entityType, triggerMethod!);`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`public Type TriggerType => _triggerType;`