Fix S1066: merge collapsible if statements.

Author: tillig

src/Autofac/Core/Resolving/Middleware/CircularDependencyDetectorMiddleware.cs

@@ -49,19 +49,19 @@ public void Execute(ResolveRequestContext context, Action<ResolveRequestContext>
 
         var activationDepth = context.Operation.RequestDepth;
 
-        if (activationDepth > _maxResolveDepth)
-        {
 #if NETSTANDARD2_1
-            // In .NET Standard 2.1 we will try and keep going until we run out of stack space.
-            if (!RuntimeHelpers.TryEnsureSufficientExecutionStack())
-            {
-                throw new DependencyResolutionException(string.Format(CultureInfo.CurrentCulture, CircularDependencyDetectorMessages.MaxDepthExceeded, context.Service));
-            }
+        // In .NET Standard 2.1 we will try and keep going until we run out of stack space.
+        if (activationDepth > _maxResolveDepth && !RuntimeHelpers.TryEnsureSufficientExecutionStack())
+        {
+            throw new DependencyResolutionException(string.Format(CultureInfo.CurrentCulture, CircularDependencyDetectorMessages.MaxDepthExceeded, context.Service));
+        }
 #else
-            // Pre .NET Standard 2.1 we just end at 50.
+        // Pre .NET Standard 2.1 we just end at 50.
+        if (activationDepth > _maxResolveDepth)
+        {
             throw new DependencyResolutionException(string.Format(CultureInfo.CurrentCulture, CircularDependencyDetectorMessages.MaxDepthExceeded, context.Service));
-#endif
         }
+#endif
 
         var requestStack = dependencyTrackingResolveOperation.RequestStack;
 

src/Autofac/Util/InternalTypeExtensions.cs

@@ -80,31 +80,25 @@ public static bool IsCompatibleWithGenericParameterConstraints(this Type generic
             var specialConstraints = genericArg.GenericParameterAttributes;
 
             if ((specialConstraints & GenericParameterAttributes.DefaultConstructorConstraint)
-                != GenericParameterAttributes.None)
+                != GenericParameterAttributes.None &&
+                !parameter.IsValueType && parameter.GetDeclaredPublicConstructors().All(c => c.GetParameters().Length > 0))
             {
-                if (!parameter.IsValueType && parameter.GetDeclaredPublicConstructors().All(c => c.GetParameters().Length > 0))
-                {
-                    return false;
-                }
+                return false;
             }
 
             if ((specialConstraints & GenericParameterAttributes.ReferenceTypeConstraint)
-                != GenericParameterAttributes.None)
+                != GenericParameterAttributes.None &&
+                parameter.IsValueType)
             {
-                if (parameter.IsValueType)
-                {
-                    return false;
-                }
+                return false;
             }
 
             if ((specialConstraints & GenericParameterAttributes.NotNullableValueTypeConstraint)
-                != GenericParameterAttributes.None)
+                != GenericParameterAttributes.None &&
+                (!parameter.IsValueType ||
+                    (parameter.IsGenericType && IsGenericTypeDefinedBy(parameter, typeof(Nullable<>)))))
             {
-                if (!parameter.IsValueType ||
-                    (parameter.IsGenericType && IsGenericTypeDefinedBy(parameter, typeof(Nullable<>))))
-                {
-                    return false;
-                }
+                return false;
             }
         }