Merge branch 'add-fxcop-rules' of https://git01.codeplex.com/forks/fsimonazzi/unitydevfork

Author: bennage

source/Unity.Configuration/Src/SectionExtensionContext.cs

@@ -28,7 +28,7 @@ public abstract class SectionExtensionContext
         /// </summary>
         /// <typeparam name="TAliased">Type the alias maps to.</typeparam>
         /// <param name="alias">The alias to use</param>
-        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
+        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public void AddAlias<TAliased>(string alias)
         {
             AddAlias(alias, typeof (TAliased));
@@ -46,7 +46,7 @@ public void AddAlias<TAliased>(string alias)
         /// </summary>
         /// <typeparam name="TElement">Type the tag maps to.</typeparam>
         /// <param name="tag">Tag name in the XML.</param>
-        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
+        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public void AddElement<TElement>(string tag)
             where TElement : DeserializableConfigurationElement
         {

source/Unity.Interception/Src/ContainerIntegration/Interception.cs

@@ -82,6 +82,7 @@ public Interception SetInterceptorFor(Type typeToIntercept, ITypeInterceptor int
         /// <param name="name">Name type is registered under.</param>
         /// <param name="interceptor">Interceptor object to use.</param>
         /// <returns>This extension object.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public Interception SetInterceptorFor<T>(string name, ITypeInterceptor interceptor)
         {
             return SetInterceptorFor(typeof(T), name, interceptor);
@@ -93,6 +94,7 @@ public Interception SetInterceptorFor<T>(string name, ITypeInterceptor intercept
         /// <typeparam name="T">Type to intercept</typeparam>
         /// <param name="interceptor">Interceptor object to use.</param>
         /// <returns>This extension object.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public Interception SetInterceptorFor<T>(ITypeInterceptor interceptor)
         {
             return SetInterceptorFor(typeof(T), null, interceptor);
@@ -152,6 +154,7 @@ public Interception SetDefaultInterceptorFor(Type typeToIntercept, ITypeIntercep
         /// <typeparam name="TTypeToIntercept">Type to intercept</typeparam>
         /// <param name="interceptor">Interceptor instance.</param>
         /// <returns>This extension object.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public Interception SetDefaultInterceptorFor<TTypeToIntercept>(ITypeInterceptor interceptor)
         {
             return SetDefaultInterceptorFor(typeof(TTypeToIntercept), interceptor);
@@ -175,6 +178,7 @@ public Interception SetInterceptorFor(Type typeToIntercept, IInstanceInterceptor
         /// <param name="name">Name type is registered under.</param>
         /// <param name="interceptor">Instance interceptor to use.</param>
         /// <returns>This extension object.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public Interception SetInterceptorFor<T>(string name, IInstanceInterceptor interceptor)
         {
             return SetInterceptorFor(typeof(T), name, interceptor);
@@ -186,6 +190,7 @@ public Interception SetInterceptorFor<T>(string name, IInstanceInterceptor inter
         /// <typeparam name="T">Type to intercept.</typeparam>
         /// <param name="interceptor">Instance interceptor to use.</param>
         /// <returns>This extension object.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public Interception SetInterceptorFor<T>(IInstanceInterceptor interceptor)
         {
             return SetInterceptorFor(typeof(T), null, interceptor);
@@ -219,6 +224,7 @@ public Interception SetDefaultInterceptorFor(Type typeToIntercept, IInstanceInte
         /// <typeparam name="TTypeToIntercept">Type the interception is being configured for.</typeparam>
         /// <param name="interceptor">The interceptor to use by default.</param>
         /// <returns>This extension object.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public Interception SetDefaultInterceptorFor<TTypeToIntercept>(IInstanceInterceptor interceptor)
         {
             return SetDefaultInterceptorFor(typeof(TTypeToIntercept), interceptor);

source/Unity.Interception/Src/ContainerIntegration/PolicyDefinition.cs

@@ -211,6 +211,7 @@ public PolicyDefinition AddMatchingRule(
         /// <returns>
         /// The <see cref="PolicyDefinition"/> than allows further configuration of the policy.
         /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public PolicyDefinition AddMatchingRule<TMatchingRule>(
             params InjectionMember[] injectionMembers)
             where TMatchingRule : IMatchingRule
@@ -233,6 +234,7 @@ public PolicyDefinition AddMatchingRule<TMatchingRule>(
         /// <returns>
         /// The <see cref="PolicyDefinition"/> than allows further configuration of the policy.
         /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public PolicyDefinition AddMatchingRule<TMatchingRule>(
             LifetimeManager lifetimeManager,
             params InjectionMember[] injectionMembers)
@@ -255,6 +257,7 @@ public PolicyDefinition AddMatchingRule<TMatchingRule>(
         /// <returns>
         /// The <see cref="PolicyDefinition"/> than allows further configuration of the policy.
         /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public PolicyDefinition AddMatchingRule<TMatchingRule>(
             string name,
             params InjectionMember[] injectionMembers)
@@ -280,6 +283,7 @@ public PolicyDefinition AddMatchingRule<TMatchingRule>(
         /// <returns>
         /// The <see cref="PolicyDefinition"/> than allows further configuration of the policy.
         /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public PolicyDefinition AddMatchingRule<TMatchingRule>(
             string name,
             LifetimeManager lifetimeManager,
@@ -425,6 +429,7 @@ public PolicyDefinition AddCallHandler(
         /// <returns>
         /// The <see cref="PolicyDefinition"/> than allows further configuration of the policy.
         /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public PolicyDefinition AddCallHandler<TCallHandler>(
             params InjectionMember[] injectionMembers)
             where TCallHandler : ICallHandler
@@ -447,6 +452,7 @@ public PolicyDefinition AddCallHandler<TCallHandler>(
         /// <returns>
         /// The <see cref="PolicyDefinition"/> than allows further configuration of the policy.
         /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public PolicyDefinition AddCallHandler<TCallHandler>(
             LifetimeManager lifetimeManager,
             params InjectionMember[] injectionMembers)
@@ -469,6 +475,7 @@ public PolicyDefinition AddCallHandler<TCallHandler>(
         /// <returns>
         /// The <see cref="PolicyDefinition"/> than allows further configuration of the policy.
         /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public PolicyDefinition AddCallHandler<TCallHandler>(
             string name,
             params InjectionMember[] injectionMembers)
@@ -494,6 +501,7 @@ public PolicyDefinition AddCallHandler<TCallHandler>(
         /// <returns>
         /// The <see cref="PolicyDefinition"/> than allows further configuration of the policy.
         /// </returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "As designed")]
         public PolicyDefinition AddCallHandler<TCallHandler>(
             string name,
             LifetimeManager lifetimeManager,

source/Unity.Interception/Src/Interceptors/TypeInterceptors/VirtualMethodInterception/VirtualMethodInterceptor.cs

@@ -51,10 +51,10 @@ public IEnumerable<MethodImplementationInfo> GetInterceptableMethods(Type interc
         {
             Guard.ArgumentNotNull(implementationType, "implementationType");
 
-            return DoGetInterceptableMethods(interceptedType, implementationType);
+            return DoGetInterceptableMethods(implementationType);
         }
 
-        private IEnumerable<MethodImplementationInfo> DoGetInterceptableMethods(Type interceptedType, Type implementationType)
+        private IEnumerable<MethodImplementationInfo> DoGetInterceptableMethods(Type implementationType)
         {
             var interceptableMethodsToInterfaceMap = new Dictionary<MethodInfo, MethodInfo>();
 

source/Unity.Mvc/Src/GlobalSuppressions.cs

@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Mvc", Justification = "Consistent with MVC spelling")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Mvc", Scope = "namespace", Target = "Microsoft.Practices.Unity.Mvc", Justification = "Consistent with MVC spelling")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Microsoft.Practices.Unity.Mvc", Justification = "Reviewed")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "Microsoft.Practices.Unity", Justification = "Reviewed")]

source/Unity.Mvc/Src/Unity.Mvc.csproj

@@ -74,6 +74,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="PerRequestLifetimeManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">

source/Unity.Mvc/Src/UnityPerRequestHttpModule.cs

@@ -2,9 +2,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Web;
 using Microsoft.Practices.Unity.Mvc.Properties;
+using Microsoft.Practices.Unity.Utility;
 
 namespace Microsoft.Practices.Unity.Mvc
 {
@@ -60,8 +62,10 @@ public void Dispose()
         /// </summary>
         /// <param name="context">An <see cref="HttpApplication"/> that provides access to the methods, properties,
         /// and events common to all application objects within an ASP.NET application.</param>
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Justification = "Validated with Guard class")]
         public void Init(HttpApplication context)
         {
+            Guard.ArgumentNotNull(context, "context");
             context.EndRequest += OnEndRequest;
         }
 

source/Unity.WebApi/Src/GlobalSuppressions.cs

@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Api", Justification = "Consistent with WebApi spelling")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Api", Scope = "namespace", Target = "Microsoft.Practices.Unity.WebApi", Justification = "Consistent with WebApi spelling")]

source/Unity.WebApi/Src/Unity.WebApi.csproj

@@ -56,6 +56,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="UnityHierarchicalDependencyResolver.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UnityDependencyResolver.cs" />

source/Unity.ruleset

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="Unity" ToolsVersion="11.0">
+  <Include Path="extendeddesignguidelinerules.ruleset" Action="Default" />
   <Include Path="globalizationrules.ruleset" Action="Default" />
   <Include Path="minimumrecommendedrules.ruleset" Action="Default" />
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">