Clean up xUnit.net usage, standardizing around Microsoft.TestCommon

test/Common/DictionaryExtensionsTest.cs

@@ -4,9 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using Microsoft.TestCommon;
-using Xunit;
-using Xunit.Extensions;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace System.Web.Http
 {

test/Common/ErrorTest.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace System.Web.Http
 {

test/Common/HttpMethodHelperTest.cs

@@ -2,9 +2,6 @@
 
 using System.Net.Http;
 using Microsoft.TestCommon;
-using Xunit;
-using Xunit.Extensions;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace System.Web.Http
 {

test/Common/PrefixContainerTest.cs

@@ -2,9 +2,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Xunit;
-using Xunit.Extensions;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace System.Web
 {

test/Common/TaskHelpersExtensionsTest.cs

@@ -2,8 +2,6 @@
 
 using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 // There are several tests which need unreachable code (return after throw) to guarantee the correct lambda signature
 #pragma warning disable 0162

test/Common/TaskHelpersTest.cs

@@ -3,8 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.TestCommon;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace System.Threading.Tasks
 {

test/Common/UriQueryUtilityTest.cs

@@ -6,9 +6,6 @@ using System.Net.Http.Formatting;
 using System.Text;
 using System.Web.Http;
 using Microsoft.TestCommon;
-using Xunit;
-using Xunit.Extensions;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace System.Net.Http
 {

test/Microsoft.TestCommon/Assert.cs

@@ -1,15 +1,13 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-using Xunit;
-
 namespace Microsoft.TestCommon
 {
     // This extends xUnit.net's Assert class, and makes it partial so that we can
     // organize the extension points by logical functionality (rather than dumping them
     // all into this single file).
     //
-    // See files named XxxAssertions for root extensions to AssertEx.
-    public partial class AssertEx : Assert
+    // See files named XxxAssertions for root extensions to Assert.
+    public partial class Assert : Xunit.Assert
     {
         public static readonly ReflectionAssert Reflection = new ReflectionAssert();
 

test/Microsoft.TestCommon/CultureReplacer.cs

@@ -2,7 +2,7 @@
 
 using System.Globalization;
 using System.Threading;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace System.Web.TestUtil
 {

test/Microsoft.TestCommon/DataAttribute.cs

@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.TestCommon
+{
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public abstract class DataAttribute : Xunit.Extensions.DataAttribute
+    {
+    }
+}

test/Microsoft.TestCommon/EnumHelperTestBase.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace System.Net.Http.Formatting
 {

test/Microsoft.TestCommon/ExceptionAssertions.cs

@@ -8,7 +8,7 @@ using System.Web;
 
 namespace Microsoft.TestCommon
 {
-    public partial class AssertEx
+    public partial class Assert
     {
         /// <summary>
         /// Determines if your thread's current culture and current UI culture is English.
@@ -510,7 +510,7 @@ namespace Microsoft.TestCommon
 
             protected override bool ExcludeStackFrame(string stackFrame)
             {
-                if (stackFrame.StartsWith("at Microsoft.TestCommon.AssertEx.", StringComparison.OrdinalIgnoreCase))
+                if (stackFrame.StartsWith("at Microsoft.TestCommon.Assert.", StringComparison.OrdinalIgnoreCase))
                 {
                     return true;
                 }

test/Microsoft.TestCommon/FactAttribute.cs

@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-using Xunit;
 using Xunit.Sdk;
 
 namespace Microsoft.TestCommon
@@ -11,9 +10,9 @@ namespace Microsoft.TestCommon
     /// An override of <see cref="FactAttribute"/> that provides extended capabilities.
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public class WsrFactAttribute : FactAttribute
+    public class FactAttribute : Xunit.FactAttribute
     {
-        public WsrFactAttribute()
+        public FactAttribute()
         {
             Timeout = TimeoutConstant.DefaultTimeout;
             Platforms = Platform.All;

test/Microsoft.TestCommon/ForceGCAttribute.cs

@@ -2,11 +2,10 @@
 
 using System;
 using System.Reflection;
-using Xunit;
 
 namespace Microsoft.TestCommon
 {
-    public class ForceGCAttribute : BeforeAfterTestAttribute
+    public class ForceGCAttribute : Xunit.BeforeAfterTestAttribute
     {
         public override void After(MethodInfo methodUnderTest)
         {

test/Microsoft.TestCommon/InlineDataAttribute.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.TestCommon
+{
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public class InlineDataAttribute : Xunit.Extensions.InlineDataAttribute
+    {
+        public InlineDataAttribute(params object[] dataValues)
+            : base(dataValues)
+        {
+        }
+    }
+}

test/Microsoft.TestCommon/MemberHelper.cs

@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reflection;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace System.Web.TestUtil
 {

test/Microsoft.TestCommon/Microsoft.TestCommon.csproj

@@ -63,21 +63,24 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DataAttribute.cs" />
     <Compile Include="EnumHelperTestBase.cs" />
+    <Compile Include="InlineDataAttribute.cs" />
     <Compile Include="InstanceCreator.cs" />
     <Compile Include="MatrixTheoryDataSet.cs" />
     <Compile Include="PartialTrustRunner.cs" />
     <Compile Include="Platform.cs" />
     <Compile Include="PlatformInfo.cs" />
+    <Compile Include="PropertyDataAttribute.cs" />
     <Compile Include="ReplaceCultureAttribute.cs" />
     <Compile Include="RestoreThreadPrincipalAttribute.cs" />
     <Compile Include="AppDomainUtils.cs" />
-    <Compile Include="AssertEx.cs">
+    <Compile Include="Assert.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="CultureReplacer.cs" />
-    <Compile Include="WsrFactAttribute.cs" />
-    <Compile Include="WsrTheoryAttribute.cs" />
+    <Compile Include="FactAttribute.cs" />
+    <Compile Include="TheoryAttribute.cs" />
     <Compile Include="DictionaryEqualityComparer.cs" />
     <Compile Include="ExceptionAssertions.cs">
       <SubType>Code</SubType>
@@ -116,6 +119,7 @@
     <Compile Include="TestHelper.cs" />
     <Compile Include="TheoryDataSet.cs" />
     <Compile Include="ThreadPoolSyncContext.cs" />
+    <Compile Include="TraitAttribute.cs" />
     <Compile Include="WebUtils.cs" />
   </ItemGroup>
   <ItemGroup>

test/Microsoft.TestCommon/Microsoft/TestCommon/GenericTypeAssert.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Xunit;
 
 namespace Microsoft.TestCommon
 {

test/Microsoft.TestCommon/Microsoft/TestCommon/HttpAssert.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text.RegularExpressions;
-using Xunit;
 
 namespace Microsoft.TestCommon
 {

test/Microsoft.TestCommon/Microsoft/TestCommon/MediaTypeAssert.cs

@@ -2,7 +2,6 @@
 
 using System;
 using System.Net.Http.Headers;
-using Xunit;
 
 namespace Microsoft.TestCommon
 {

test/Microsoft.TestCommon/Microsoft/TestCommon/TaskAssert.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Reflection;
 using System.Threading.Tasks;
-using Xunit;
 
 namespace Microsoft.TestCommon
 {

test/Microsoft.TestCommon/Microsoft/TestCommon/TestDataSetAttribute.cs

@@ -5,7 +5,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Xunit.Extensions;
 
 namespace Microsoft.TestCommon
 {

test/Microsoft.TestCommon/Microsoft/TestCommon/TypeAssert.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.TestCommon
 {

test/Microsoft.TestCommon/Microsoft/TestCommon/XmlAssert.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Xml.Linq;
-using Xunit;
 
 namespace Microsoft.TestCommon
 {

test/Microsoft.TestCommon/PartialTrustRunner.cs

@@ -9,66 +9,73 @@ using System.Reflection;
 using System.Security;
 using System.Security.Permissions;
 using System.Web;
-using Xunit;
 using Xunit.Sdk;
 
 namespace Microsoft.TestCommon
 {
-    public class PartialTrustRunner : ITestClassCommand
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class PartialTrustRunnerAttribute : Xunit.RunWithAttribute
     {
-        private AppDomain sandbox;
-
-        // Delegate most of the work to the existing TestClassCommand class so that we
-        // can preserve any existing behavior (like supporting IUseFixture<T>).
-        private readonly TestClassCommand originalTestClassCommand = new TestClassCommand();
-
-        public int ChooseNextTest(ICollection<IMethodInfo> testsLeftToRun)
+        public PartialTrustRunnerAttribute()
+            : base(typeof(PartialTrustTestClassCommand))
         {
-            return this.originalTestClassCommand.ChooseNextTest(testsLeftToRun);
         }
 
-        public Exception ClassFinish()
+        private class PartialTrustTestClassCommand : ITestClassCommand
         {
-            Exception result = this.originalTestClassCommand.ClassFinish();
-            if (this.sandbox != null)
+            private AppDomain sandbox;
+
+            // Delegate most of the work to the existing TestClassCommand class so that we
+            // can preserve any existing behavior (like supporting IUseFixture<T>).
+            private readonly TestClassCommand originalTestClassCommand = new TestClassCommand();
+
+            public int ChooseNextTest(ICollection<IMethodInfo> testsLeftToRun)
             {
-                AppDomain.Unload(this.sandbox);
-                this.sandbox = null;
+                return this.originalTestClassCommand.ChooseNextTest(testsLeftToRun);
             }
 
-            return result;
-        }
+            public Exception ClassFinish()
+            {
+                Exception result = this.originalTestClassCommand.ClassFinish();
+                if (this.sandbox != null)
+                {
+                    AppDomain.Unload(this.sandbox);
+                    this.sandbox = null;
+                }
 
-        public Exception ClassStart()
-        {
-            this.GuardTypeUnderTest();
-            Assembly xunitAssembly = typeof(FactAttribute).Assembly;
-            this.sandbox = CreatePartialTrustAppDomain();
+                return result;
+            }
 
-            return this.originalTestClassCommand.ClassStart();
-        }
+            public Exception ClassStart()
+            {
+                this.GuardTypeUnderTest();
+                Assembly xunitAssembly = typeof(FactAttribute).Assembly;
+                this.sandbox = CreatePartialTrustAppDomain();
 
-        private static AppDomain CreatePartialTrustAppDomain()
-        {
-            PermissionSet permissions = new PermissionSet(PermissionState.None);
-            permissions.AddPermission(new AspNetHostingPermission(AspNetHostingPermissionLevel.Medium));
-            permissions.AddPermission(new DnsPermission(PermissionState.Unrestricted));
-            permissions.AddPermission(new EnvironmentPermission(EnvironmentPermissionAccess.Read, "TEMP;TMP;USERNAME;OS;COMPUTERNAME"));
-            permissions.AddPermission(new FileIOPermission(FileIOPermissionAccess.AllAccess, AppDomain.CurrentDomain.BaseDirectory));
-            permissions.AddPermission(new IsolatedStorageFilePermission(PermissionState.None) { UsageAllowed = IsolatedStorageContainment.AssemblyIsolationByUser, UserQuota = Int64.MaxValue });
-            permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));
-            permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlThread));
-            permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlPrincipal));
-            permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.RemotingConfiguration));
-            permissions.AddPermission(new SmtpPermission(SmtpAccess.Connect));
-            permissions.AddPermission(new SqlClientPermission(PermissionState.Unrestricted));
-            permissions.AddPermission(new TypeDescriptorPermission(PermissionState.Unrestricted));
-            permissions.AddPermission(new WebPermission(PermissionState.Unrestricted));
-            permissions.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.RestrictedMemberAccess));
+                return this.originalTestClassCommand.ClassStart();
+            }
 
-            AppDomainSetup setup = new AppDomainSetup() { ApplicationBase = AppDomain.CurrentDomain.BaseDirectory };
+            private static AppDomain CreatePartialTrustAppDomain()
+            {
+                PermissionSet permissions = new PermissionSet(PermissionState.None);
+                permissions.AddPermission(new AspNetHostingPermission(AspNetHostingPermissionLevel.Medium));
+                permissions.AddPermission(new DnsPermission(PermissionState.Unrestricted));
+                permissions.AddPermission(new EnvironmentPermission(EnvironmentPermissionAccess.Read, "TEMP;TMP;USERNAME;OS;COMPUTERNAME"));
+                permissions.AddPermission(new FileIOPermission(FileIOPermissionAccess.AllAccess, AppDomain.CurrentDomain.BaseDirectory));
+                permissions.AddPermission(new IsolatedStorageFilePermission(PermissionState.None) { UsageAllowed = IsolatedStorageContainment.AssemblyIsolationByUser, UserQuota = Int64.MaxValue });
+                permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));
+                permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlThread));
+                permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.ControlPrincipal));
+                permissions.AddPermission(new SecurityPermission(SecurityPermissionFlag.RemotingConfiguration));
+                permissions.AddPermission(new SmtpPermission(SmtpAccess.Connect));
+                permissions.AddPermission(new SqlClientPermission(PermissionState.Unrestricted));
+                permissions.AddPermission(new TypeDescriptorPermission(PermissionState.Unrestricted));
+                permissions.AddPermission(new WebPermission(PermissionState.Unrestricted));
+                permissions.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.RestrictedMemberAccess));
 
-            setup.PartialTrustVisibleAssemblies = new string[]
+                AppDomainSetup setup = new AppDomainSetup() { ApplicationBase = AppDomain.CurrentDomain.BaseDirectory };
+
+                setup.PartialTrustVisibleAssemblies = new string[]
             {
                 "System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293",
                 "System.Web.Extensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9",
@@ -81,54 +88,55 @@ namespace Microsoft.TestCommon
             };
 
 
-            return AppDomain.CreateDomain("Partial Trust Sandbox", null, setup, permissions);
-        }
-
-        public IEnumerable<ITestCommand> EnumerateTestCommands(IMethodInfo testMethod)
-        {
-            return this.originalTestClassCommand.EnumerateTestCommands(testMethod);
-        }
-
-        public IEnumerable<IMethodInfo> EnumerateTestMethods()
-        {
-            return this.originalTestClassCommand.EnumerateTestMethods();
-        }
-
-        public bool IsTestMethod(IMethodInfo testMethod)
-        {
-            return this.originalTestClassCommand.IsTestMethod(testMethod);
-        }
-
-        public object ObjectUnderTest
-        {
-            get
-            {
-                return sandbox.CreateInstanceAndUnwrap(this.TypeUnderTest.Type.Assembly.FullName, this.TypeUnderTest.Type.FullName);
+                return AppDomain.CreateDomain("Partial Trust Sandbox", null, setup, permissions);
             }
-        }
 
-        public ITypeInfo TypeUnderTest
-        {
-            get
+            public IEnumerable<ITestCommand> EnumerateTestCommands(IMethodInfo testMethod)
             {
-                return this.originalTestClassCommand.TypeUnderTest;
+                return this.originalTestClassCommand.EnumerateTestCommands(testMethod);
             }
-            set
+
+            public IEnumerable<IMethodInfo> EnumerateTestMethods()
             {
-                if (!typeof(MarshalByRefObject).IsAssignableFrom(value.Type))
+                return this.originalTestClassCommand.EnumerateTestMethods();
+            }
+
+            public bool IsTestMethod(IMethodInfo testMethod)
+            {
+                return this.originalTestClassCommand.IsTestMethod(testMethod);
+            }
+
+            public object ObjectUnderTest
+            {
+                get
                 {
-                    throw new InvalidOperationException("Test types to be run in PT must derive from MarshalByRefObject");
+                    return sandbox.CreateInstanceAndUnwrap(this.TypeUnderTest.Type.Assembly.FullName, this.TypeUnderTest.Type.FullName);
                 }
-
-                this.originalTestClassCommand.TypeUnderTest = value;
             }
-        }
 
-        private void GuardTypeUnderTest()
-        {
-            if (TypeUnderTest == null)
+            public ITypeInfo TypeUnderTest
             {
-                throw new InvalidOperationException("Forgot to set TypeUnderTest before calling ObjectUnderTest");
+                get
+                {
+                    return this.originalTestClassCommand.TypeUnderTest;
+                }
+                set
+                {
+                    if (!typeof(MarshalByRefObject).IsAssignableFrom(value.Type))
+                    {
+                        throw new InvalidOperationException("Test types to be run in PT must derive from MarshalByRefObject");
+                    }
+
+                    this.originalTestClassCommand.TypeUnderTest = value;
+                }
+            }
+
+            private void GuardTypeUnderTest()
+            {
+                if (TypeUnderTest == null)
+                {
+                    throw new InvalidOperationException("Forgot to set TypeUnderTest before calling ObjectUnderTest");
+                }
             }
         }
     }

test/Microsoft.TestCommon/Platform.cs

@@ -17,19 +17,19 @@ namespace Microsoft.TestCommon
 
         /// <summary>
         /// Indicates that the test wants to run on .NET 4 (when used with
-        /// <see cref="WsrFactAttribute.Platforms"/> and/or <see cref="WsrTheoryAttribute.Platforms"/>),
+        /// <see cref="FactAttribute.Platforms"/> and/or <see cref="TheoryAttribute.Platforms"/>),
         /// or that the current platform that the test is running on is .NET 4 (when used with the
-        /// <see cref="PlatformInfo.Platform"/>, <see cref="WsrFactAttribute.Platform"/>, and/or
-        /// <see cref="WsrTheoryAttribute.Platform"/>).
+        /// <see cref="PlatformInfo.Platform"/>, <see cref="FactAttribute.Platform"/>, and/or
+        /// <see cref="TheoryAttribute.Platform"/>).
         /// </summary>
         Net40 = 0x01,
 
         /// <summary>
         /// Indicates that the test wants to run on .NET 4.5 (when used with
-        /// <see cref="WsrFactAttribute.Platforms"/> and/or <see cref="WsrTheoryAttribute.Platforms"/>),
+        /// <see cref="FactAttribute.Platforms"/> and/or <see cref="TheoryAttribute.Platforms"/>),
         /// or that the current platform that the test is running on is .NET 4.5 (when used with the
-        /// <see cref="PlatformInfo.Platform"/>, <see cref="WsrFactAttribute.Platform"/>, and/or
-        /// <see cref="WsrTheoryAttribute.Platform"/>).
+        /// <see cref="PlatformInfo.Platform"/>, <see cref="FactAttribute.Platform"/>, and/or
+        /// <see cref="TheoryAttribute.Platform"/>).
         /// </summary>
         Net45 = 0x02,
     }

test/Microsoft.TestCommon/PreAppStartTestHelper.cs

@@ -2,7 +2,7 @@
 
 using System.ComponentModel;
 using System.Reflection;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace System.Web.WebPages.TestUtils
 {

test/Microsoft.TestCommon/PreserveSyncContextAttribute.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System.Threading;
-using Xunit;
 
 namespace Microsoft.TestCommon
 {
@@ -9,7 +8,7 @@ namespace Microsoft.TestCommon
     /// Preserves the current <see cref="SynchronizationContext"/>. Use this attribute on
     /// tests which modify the current <see cref="SynchronizationContext"/>.
     /// </summary>
-    public class PreserveSyncContextAttribute : BeforeAfterTestAttribute
+    public class PreserveSyncContextAttribute : Xunit.BeforeAfterTestAttribute
     {
         private SynchronizationContext _syncContext;
 

test/Microsoft.TestCommon/PropertyDataAttribute.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.TestCommon
+{
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+    public class PropertyDataAttribute : Xunit.Extensions.PropertyDataAttribute
+    {
+        public PropertyDataAttribute(string propertyName)
+            : base(propertyName)
+        {
+        }
+    }
+}

test/Microsoft.TestCommon/ReflectionAssert.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Linq.Expressions;
 using System.Reflection;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.TestCommon
 {

test/Microsoft.TestCommon/ReplaceCultureAttribute.cs

@@ -4,7 +4,6 @@ using System;
 using System.Globalization;
 using System.Reflection;
 using System.Threading;
-using Xunit;
 
 namespace Microsoft.TestCommon
 {
@@ -12,7 +11,7 @@ namespace Microsoft.TestCommon
     /// Replaces the current culture and UI culture for the test.
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]
-    public class ReplaceCultureAttribute : BeforeAfterTestAttribute
+    public class ReplaceCultureAttribute : Xunit.BeforeAfterTestAttribute
     {
         private CultureInfo _originalCulture;
         private CultureInfo _originalUICulture;

test/Microsoft.TestCommon/RestoreThreadPrincipalAttribute.cs

@@ -4,11 +4,10 @@ using System;
 using System.Reflection;
 using System.Security.Principal;
 using System.Threading;
-using Xunit;
 
 namespace Microsoft.TestCommon
 {
-    public class RestoreThreadPrincipalAttribute : BeforeAfterTestAttribute
+    public class RestoreThreadPrincipalAttribute : Xunit.BeforeAfterTestAttribute
     {
         private IPrincipal _originalPrincipal;
 

test/Microsoft.TestCommon/TaskExtensions.cs

@@ -2,7 +2,7 @@
 
 using System;
 using System.Threading.Tasks;
-using Xunit;
+using Microsoft.TestCommon;
 
 // No namespace so that these extensions are available for all test classes
 

test/Microsoft.TestCommon/TestFile.cs

@@ -2,7 +2,7 @@
 
 using System.IO;
 using System.Reflection;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace System.Web.WebPages.TestUtils
 {

test/Microsoft.TestCommon/TestHelper.cs

@@ -2,7 +2,7 @@
 
 using System.Globalization;
 using System.Linq;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace System.Web.TestUtil
 {

test/Microsoft.TestCommon/TheoryAttribute.cs

@@ -2,15 +2,14 @@
 
 using System;
 using System.Collections.Generic;
-using Xunit.Extensions;
 using Xunit.Sdk;
 
 namespace Microsoft.TestCommon
 {
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public class WsrTheoryAttribute : TheoryAttribute
+    public class TheoryAttribute : Xunit.Extensions.TheoryAttribute
     {
-        public WsrTheoryAttribute()
+        public TheoryAttribute()
         {
             Timeout = TimeoutConstant.DefaultTimeout;
             Platforms = Platform.All;

test/Microsoft.TestCommon/TraitAttribute.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.TestCommon
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
+    public class TraitAttribute : Xunit.TraitAttribute
+    {
+        public TraitAttribute(string name, string value)
+            : base(name, value)
+        {
+        }
+    }
+}

test/Microsoft.Web.Helpers.Test/AnalyticsTest.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System.Web.TestUtil;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/BingTest.cs

@@ -8,9 +8,8 @@ using System.Web;
 using System.Web.Helpers.Test;
 using System.Web.TestUtil;
 using System.Web.WebPages.Scope;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/FacebookTest.cs

@@ -6,8 +6,6 @@ using System.Web;
 using System.Web.TestUtil;
 using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/FileUploadTest.cs

@@ -4,9 +4,8 @@ using System.Collections;
 using System.Web;
 using System.Web.Helpers.Test;
 using System.Web.TestUtil;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/GamerCardTest.cs

@@ -3,8 +3,7 @@
 using System;
 using System.Web.Helpers.Test;
 using System.Web.TestUtil;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/GravatarTest.cs

@@ -2,8 +2,7 @@
 
 using System;
 using System.Web.Helpers.Test;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/LinkShareTest.cs

@@ -6,8 +6,7 @@ using System.Web;
 using System.Web.Helpers.Test;
 using System.Web.TestUtil;
 using System.Web.WebPages.Scope;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/MapsTest.cs

@@ -2,7 +2,7 @@
 
 using System;
 using System.Linq;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/PreAppStartCodeTest.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Web.WebPages.Razor;
 using System.Web.WebPages.TestUtils;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/ReCaptchaTest.cs

@@ -8,9 +8,8 @@ using System.Web;
 using System.Web.Helpers.Test;
 using System.Web.TestUtil;
 using System.Web.WebPages.Scope;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/ThemesTest.cs

@@ -4,9 +4,8 @@ using System;
 using System.Collections.Generic;
 using System.Web.Hosting;
 using System.Web.WebPages.Scope;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/TwitterTest.cs

@@ -4,8 +4,7 @@ using System.Web;
 using System.Web.Helpers;
 using System.Web.Helpers.Test;
 using System.Web.TestUtil;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/UrlBuilderTest.cs

@@ -8,8 +8,8 @@ using System.Text;
 using System.Web;
 using System.Web.UI;
 using System.Web.WebPages;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Helpers.Test/VideoTest.cs

@@ -4,9 +4,8 @@ using System;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Web;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Helpers.Test
 {

test/Microsoft.Web.Http.Data.Helpers.Test/UpshotExtensionsTests.cs

@@ -2,10 +2,9 @@
 
 using System.Text.RegularExpressions;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.Http.Data.Test;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Http.Data.Helpers.Test
 {

test/Microsoft.Web.Http.Data.Test/ChangeSetTests.cs

@@ -2,10 +2,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.TestCommon;
 using Microsoft.Web.Http.Data;
 using Microsoft.Web.Http.Data.Test.Models;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace System.ServiceModel.DomainServices.Server.Test
 {

test/Microsoft.Web.Http.Data.Test/DataControllerDescriptionTest.cs

@@ -9,11 +9,10 @@ using System.Threading.Tasks;
 using System.Web.Http;
 using System.Web.Http.Controllers;
 using System.Web.Http.Filters;
+using Microsoft.TestCommon;
 using Microsoft.Web.Http.Data.EntityFramework;
 using Microsoft.Web.Http.Data.EntityFramework.Metadata;
 using Microsoft.Web.Http.Data.Test.Models;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Http.Data.Test
 {

test/Microsoft.Web.Http.Data.Test/DataControllerSubmitTests.cs

@@ -15,10 +15,9 @@ using System.Web.Http.Controllers;
 using System.Web.Http.Dispatcher;
 using System.Web.Http.Filters;
 using System.Web.Http.Routing;
+using Microsoft.TestCommon;
 using Microsoft.Web.Http.Data.Test.Models;
 using Newtonsoft.Json;
-using Assert = Microsoft.TestCommon.AssertEx;
-using FactAttribute = Microsoft.TestCommon.WsrFactAttribute;
 
 namespace Microsoft.Web.Http.Data.Test
 {

test/Microsoft.Web.Http.Data.Test/MetadataExtensionsTests.cs

@@ -2,10 +2,10 @@
 
 using System;
 using System.ComponentModel.DataAnnotations;
+using Microsoft.TestCommon;
 using Microsoft.Web.Http.Data.Helpers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Xunit;
 
 namespace Microsoft.Web.Http.Data.Test
 {

test/Microsoft.Web.Mvc.Test/Controls/Test/DropDownListTest.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System.Web.Mvc;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.Controls.Test
 {

test/Microsoft.Web.Mvc.Test/Controls/Test/MvcControlTest.cs

@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Web.Mvc;
 using System.Web.UI;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.Controls.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderProviderTest.cs

@@ -2,8 +2,8 @@
 
 using System.Collections.Generic;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ArrayModelBinderTest.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BinaryDataModelBinderProviderTest.cs

@@ -2,8 +2,8 @@
 
 using System.Data.Linq;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/BindingBehaviorAttributeTest.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderProviderTest.cs

@@ -2,8 +2,8 @@
 
 using System.Collections.Generic;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderTest.cs

@@ -4,9 +4,9 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/CollectionModelBinderUtilTest.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Web.Mvc;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderProviderTest.cs

@@ -2,7 +2,7 @@
 
 using System;
 using System.Web.Mvc;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoModelBinderTest.cs

@@ -3,8 +3,8 @@
 using System;
 using System.Linq;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoResultTest.cs

@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System.Web.Mvc;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ComplexModelDtoTest.cs

@@ -2,8 +2,7 @@
 
 using System.Linq;
 using System.Web.Mvc;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderProviderTest.cs

@@ -2,8 +2,8 @@
 
 using System.Collections.Generic;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/DictionaryModelBinderTest.cs

@@ -2,9 +2,9 @@
 
 using System.Collections.Generic;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBinderAdapterTest.cs

@@ -3,10 +3,9 @@
 using System;
 using System.Collections.Generic;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ExtensibleModelBindingContextTest.cs

@@ -3,9 +3,8 @@
 using System;
 using System.Web.Mvc;
 using System.Web.TestUtil;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/GenericModelBinderProviderTest.cs

@@ -3,10 +3,9 @@
 using System;
 using System.Collections.Generic;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderProviderTest.cs

@@ -2,8 +2,8 @@
 
 using System.Collections.Generic;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderTest.cs

@@ -3,9 +3,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/KeyValuePairModelBinderUtilTest.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderConfigTest.cs

@@ -5,8 +5,8 @@ using System.Globalization;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.TestUtil;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProviderCollectionTest.cs

@@ -5,10 +5,9 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderProvidersTest.cs

@@ -2,7 +2,7 @@
 
 using System;
 using System.Linq;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelBinderUtilTest.cs

@@ -3,8 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Web.Mvc;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/ModelValidationNodeTest.cs

@@ -5,8 +5,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Web.Mvc;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderProviderTest.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/MutableObjectModelBinderTest.cs

@@ -6,9 +6,8 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/SimpleModelBinderProviderTest.cs

@@ -2,10 +2,9 @@
 
 using System;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderProviderTest.cs

@@ -2,8 +2,8 @@
 
 using System;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeConverterModelBinderTest.cs

@@ -4,8 +4,8 @@ using System;
 using System.ComponentModel;
 using System.Globalization;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderProviderTest.cs

@@ -3,8 +3,8 @@
 using System;
 using System.Linq;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/ModelBinding/Test/TypeMatchModelBinderTest.cs

@@ -2,8 +2,8 @@
 
 using System;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.ModelBinding.Test
 {

test/Microsoft.Web.Mvc.Test/Test/AjaxOnlyAttributeTest.cs

@@ -2,9 +2,8 @@
 
 using System.Collections.Specialized;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/AreaHelpersTest.cs

@@ -4,7 +4,7 @@ using System;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
-using Xunit;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/AsyncManagerExtensionsTest.cs

@@ -3,8 +3,7 @@
 using System;
 using System.Threading;
 using System.Web.Mvc.Async;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/ButtonTest.cs

@@ -2,9 +2,8 @@
 
 using System.Web.Mvc;
 using System.Web.Routing;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/ContentTypeAttributeTest.cs

@@ -3,9 +3,8 @@
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/ControllerExtensionsTest.cs

@@ -2,9 +2,8 @@
 
 using System;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/CookieTempDataProviderTest.cs

@@ -4,9 +4,8 @@ using System;
 using System.Collections.Generic;
 using System.Web;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/CookieValueProviderFactoryTest.cs

@@ -3,8 +3,8 @@
 using System.Globalization;
 using System.Web;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/CopyAsyncParametersAttributeTest.cs

@@ -3,8 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Web.Mvc;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
+using Microsoft.TestCommon;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/CreditCardAttributeTest.cs

@@ -2,8 +2,8 @@
 
 using System.Linq;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Moq;
-using Xunit;
 
 namespace Microsoft.Web.Mvc.Test
 {

test/Microsoft.Web.Mvc.Test/Test/CssExtensionsTests.cs

@@ -2,9 +2,8 @@
 
 using System;
 using System.Web.Mvc;
+using Microsoft.TestCommon;
 using Microsoft.Web.UnitTestUtil;
-using Xunit;
-using Assert = Microsoft.TestCommon.AssertEx;
 
 namespace Microsoft.Web.Mvc.Test
 {