moving to vs2015

ApprovalTests.MachineSpecific.Tests/Namer/ApprovalResultsTest.TestUniqueNames.ForMachine.LLEWELLYN-PC.approved.txt

@@ -1,3 +1,3 @@
-GetDotNetVersion => Net_v4.0.30319.18444
+GetDotNetVersion => Net_v4.0.30319.42000
 GetOsName => Windows_7
 GetUserName => ForUser.llewellyn

ApprovalTests.MachineSpecific.Tests/Reporters/GenericDiffReporterTest.TestLaunchesVisualStudio.ForMachine.LLEWELLYN-PC.ForMachine.LLEWELLYN-PC.approved.txt

@@ -1 +1 @@
-"C:\Program Files\Microsoft Visual Studio 12.0\Common7\IDE\devenv.exe" /diff "../../b.txt" "../../a.txt"
+"C:\Program Files\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" /diff "../../b.txt" "../../a.txt"

ApprovalTests.Tests/Async/AsyncTests.TestAsyncExceptionFromVoid.Windows_7.approved.txt

@@ -1,7 +1,7 @@
 Exceptions Thrown
 
 System.Exception: Throwing 0 times
-   at ApprovalTests.Tests.Async.AsyncTests.<ThrowBabyThrow>(Int32 i) in ...\AsyncTests.cs
+   at ApprovalTests.Tests.Async.AsyncTests.<>c.<ThrowBabyThrow>(Int32 i) in ...\AsyncTests.cs
    at System.Linq.Parallel.SelectQueryOperator`2.SelectQueryOperatorEnumerator`1.MoveNext(TOutput& currentElement, TKey& currentKey)
    at System.Linq.Parallel.IntSumAggregationOperator.IntSumAggregationOperatorEnumerator`1.MoveNextCore(Int32& currentElement)
    at System.Linq.Parallel.InlinedAggregationOperatorEnumerator`1.MoveNext(TIntermediate& currentElement, Int32& currentKey)
@@ -10,7 +10,7 @@ System.Exception: Throwing 0 times
    at System.Threading.Tasks.Task.InnerInvoke()
    at System.Threading.Tasks.Task.Execute()
 System.Exception: Throwing 1 times
-   at ApprovalTests.Tests.Async.AsyncTests.<ThrowBabyThrow>(Int32 i) in ...\AsyncTests.cs
+   at ApprovalTests.Tests.Async.AsyncTests.<>c.<ThrowBabyThrow>(Int32 i) in ...\AsyncTests.cs
    at System.Linq.Parallel.SelectQueryOperator`2.SelectQueryOperatorEnumerator`1.MoveNext(TOutput& currentElement, TKey& currentKey)
    at System.Linq.Parallel.IntSumAggregationOperator.IntSumAggregationOperatorEnumerator`1.MoveNextCore(Int32& currentElement)
    at System.Linq.Parallel.InlinedAggregationOperatorEnumerator`1.MoveNext(TIntermediate& currentElement, Int32& currentKey)
@@ -19,7 +19,7 @@ System.Exception: Throwing 1 times
    at System.Threading.Tasks.Task.InnerInvoke()
    at System.Threading.Tasks.Task.Execute()
 System.Exception: Throwing 2 times
-   at ApprovalTests.Tests.Async.AsyncTests.<ThrowBabyThrow>(Int32 i) in ...\AsyncTests.cs
+   at ApprovalTests.Tests.Async.AsyncTests.<>c.<ThrowBabyThrow>(Int32 i) in ...\AsyncTests.cs
    at System.Linq.Parallel.SelectQueryOperator`2.SelectQueryOperatorEnumerator`1.MoveNext(TOutput& currentElement, TKey& currentKey)
    at System.Linq.Parallel.IntSumAggregationOperator.IntSumAggregationOperatorEnumerator`1.MoveNextCore(Int32& currentElement)
    at System.Linq.Parallel.InlinedAggregationOperatorEnumerator`1.MoveNext(TIntermediate& currentElement, Int32& currentKey)

ApprovalTests.Tests/ExceptionTests.TestVerifyException.Windows_7.approved.txt

@@ -1,3 +1,3 @@
 System.Exception: Exception of type 'System.Exception' was thrown.
-   at ApprovalTests.Tests.ExceptionTests.<TestVerifyException>() in ...\ExceptionTests.cs
+   at ApprovalTests.Tests.ExceptionTests.<>c.<TestVerifyException>() in ...\ExceptionTests.cs
    at ApprovalUtilities.Utilities.ExceptionUtilities.GetException(Action action) in ...\ExceptionUtilities.cs

ApprovalTests.Tests/Reporters/GenericDiffReporterTest.TestMissingDots.Windows_7.approved.txt

@@ -1,5 +1,5 @@
 System.ArgumentException: The following extensions don't start with dots: [txt, asp]
    at ApprovalTests.Reporters.GenericDiffReporter.AssertDots(String[] extensionsWithDots) in ...\GenericDiffReporter.cs
    at ApprovalTests.Reporters.GenericDiffReporter.RegisterTextFileTypes(String[] extensionsWithDots) in ...\GenericDiffReporter.cs
-   at ApprovalTests.Tests.Reporters.GenericDiffReporterTest.<TestMissingDots>() in ...\GenericDiffReporterTest.cs
+   at ApprovalTests.Tests.Reporters.GenericDiffReporterTest.<>c.<TestMissingDots>() in ...\GenericDiffReporterTest.cs
    at ApprovalUtilities.Utilities.ExceptionUtilities.GetException(Action action) in ...\ExceptionUtilities.cs

ApprovalTests/Reporters/AssertReporter.cs

@@ -26,8 +26,12 @@ public virtual void Report(string approved, string received)
 
         public virtual bool IsWorkingInThisEnvironment(string forFile)
         {
-            return GenericDiffReporter.IsTextFile(forFile) &&
-                   AttributeStackTraceParser.GetFirstFrameForAttribute(Approvals.CurrentCaller, frameworkAttribute) !=
+            return GenericDiffReporter.IsTextFile(forFile) && IsFrameworkUsed();
+        }
+
+        public bool IsFrameworkUsed()
+        {
+            return AttributeStackTraceParser.GetFirstFrameForAttribute(Approvals.CurrentCaller, frameworkAttribute) !=
                    null;
         }
 

ApprovalUtilities.Tests/Reflection/ReflectionUtilitiesTest.GetInheritedNonPublicStaticFields.approved.txt

@@ -1,4 +1,4 @@
-For Net_v4.0.30319.18444
+For Net_v4.0.30319.42000
 
 [0] = System.Object EVENT_CHECKEDCHANGED
 [1] = System.Object EVENT_CHECKSTATECHANGED
@@ -184,16 +184,17 @@
 [181] = Int32 STATE2_UICUES
 [182] = Int32 STATE2_ISACTIVEX
 [183] = Int32 STATE2_USEPREFERREDSIZECACHE
-[184] = Int16 PaintLayerBackground
-[185] = Int16 PaintLayerForeground
-[186] = Byte RequiredScalingEnabledMask
-[187] = Byte RequiredScalingMask
-[188] = Int32 UISTATE_FOCUS_CUES_MASK
-[189] = Int32 UISTATE_FOCUS_CUES_HIDDEN
-[190] = Int32 UISTATE_FOCUS_CUES_SHOW
-[191] = Int32 UISTATE_KEYBOARD_CUES_MASK
-[192] = Int32 UISTATE_KEYBOARD_CUES_HIDDEN
-[193] = Int32 UISTATE_KEYBOARD_CUES_SHOW
-[194] = Int32 ImeCharsToIgnoreDisabled
-[195] = Int32 ImeCharsToIgnoreEnabled
-[196] = System.Object EventDisposed
+[184] = Int32 STATE2_TOPMDIWINDOWCLOSING
+[185] = Int16 PaintLayerBackground
+[186] = Int16 PaintLayerForeground
+[187] = Byte RequiredScalingEnabledMask
+[188] = Byte RequiredScalingMask
+[189] = Int32 UISTATE_FOCUS_CUES_MASK
+[190] = Int32 UISTATE_FOCUS_CUES_HIDDEN
+[191] = Int32 UISTATE_FOCUS_CUES_SHOW
+[192] = Int32 UISTATE_KEYBOARD_CUES_MASK
+[193] = Int32 UISTATE_KEYBOARD_CUES_HIDDEN
+[194] = Int32 UISTATE_KEYBOARD_CUES_SHOW
+[195] = Int32 ImeCharsToIgnoreDisabled
+[196] = Int32 ImeCharsToIgnoreEnabled
+[197] = System.Object EventDisposed

ApprovalUtilities.Tests/Reflection/ReflectionUtilitiesTest.GetNonPublicInstanceProperties.approved.txt

@@ -21,52 +21,53 @@
 [20] = Boolean CaptureInternal
 [21] = Boolean CacheTextInternal
 [22] = Boolean ValidationCancelled
-[23] = Int32 CreateThreadId
-[24] = System.Windows.Forms.Cursor DefaultCursor
-[25] = System.Windows.Forms.Padding DefaultMargin
-[26] = System.Drawing.Size DefaultMaximumSize
-[27] = System.Drawing.Size DefaultMinimumSize
-[28] = System.Windows.Forms.Padding DefaultPadding
-[29] = System.Drawing.Color DisabledColor
-[30] = Boolean DoubleBuffered
-[31] = IntPtr FontHandle
-[32] = Int32 FontHeight
-[33] = IntPtr HandleInternal
-[34] = Boolean HasMenu
-[35] = Boolean HostedInWin32DialogManager
-[36] = Boolean IsLayoutSuspended
-[37] = Boolean IsWindowObscured
-[38] = IntPtr InternalHandle
-[39] = Boolean IsActiveX
-[40] = Boolean IsContainerControl
-[41] = Boolean IsIEParent
-[42] = System.Windows.Forms.Control ParentInternal
-[43] = System.Windows.Forms.PropertyStore Properties
-[44] = System.Drawing.Color RawBackColor
-[45] = Boolean RenderRightToLeft
-[46] = Boolean RenderTransparent
-[47] = Boolean RenderTransparencyWithVisualStyles
-[48] = System.Windows.Forms.BoundsSpecified RequiredScaling
-[49] = Boolean RequiredScalingEnabled
-[50] = Boolean ResizeRedraw
-[51] = Boolean ScaleChildren
-[52] = Boolean TabStopInternal
-[53] = System.Windows.Forms.Control TopLevelControlInternal
-[54] = System.Windows.Forms.Control TopMostParent
-[55] = Boolean ShowKeyboardCues
-[56] = Boolean ShowFocusCues
-[57] = Int32 ShowParams
-[58] = Boolean UseCompatibleTextRenderingInt
-[59] = Int32 WindowStyle
-[60] = System.String WindowText
-[61] = System.Windows.Forms.ContainerControl ParentContainerControl
-[62] = Boolean ShouldAutoValidate
-[63] = System.Windows.Forms.ImeMode CachedImeMode
-[64] = Boolean CanEnableIme
-[65] = System.Windows.Forms.ImeMode CurrentImeContextMode
-[66] = Int32 DisableImeModeChangedCount
-[67] = System.Windows.Forms.ImeMode ImeModeBase
-[68] = Int32 ImeWmCharsToIgnore
-[69] = Boolean CanRaiseEventsInternal
-[70] = System.ComponentModel.EventHandlerList Events
-[71] = Boolean DesignMode
+[23] = Boolean IsTopMdiWindowClosing
+[24] = Int32 CreateThreadId
+[25] = System.Windows.Forms.Cursor DefaultCursor
+[26] = System.Windows.Forms.Padding DefaultMargin
+[27] = System.Drawing.Size DefaultMaximumSize
+[28] = System.Drawing.Size DefaultMinimumSize
+[29] = System.Windows.Forms.Padding DefaultPadding
+[30] = System.Drawing.Color DisabledColor
+[31] = Boolean DoubleBuffered
+[32] = IntPtr FontHandle
+[33] = Int32 FontHeight
+[34] = IntPtr HandleInternal
+[35] = Boolean HasMenu
+[36] = Boolean HostedInWin32DialogManager
+[37] = Boolean IsLayoutSuspended
+[38] = Boolean IsWindowObscured
+[39] = IntPtr InternalHandle
+[40] = Boolean IsActiveX
+[41] = Boolean IsContainerControl
+[42] = Boolean IsIEParent
+[43] = System.Windows.Forms.Control ParentInternal
+[44] = System.Windows.Forms.PropertyStore Properties
+[45] = System.Drawing.Color RawBackColor
+[46] = Boolean RenderRightToLeft
+[47] = Boolean RenderTransparent
+[48] = Boolean RenderTransparencyWithVisualStyles
+[49] = System.Windows.Forms.BoundsSpecified RequiredScaling
+[50] = Boolean RequiredScalingEnabled
+[51] = Boolean ResizeRedraw
+[52] = Boolean ScaleChildren
+[53] = Boolean TabStopInternal
+[54] = System.Windows.Forms.Control TopLevelControlInternal
+[55] = System.Windows.Forms.Control TopMostParent
+[56] = Boolean ShowKeyboardCues
+[57] = Boolean ShowFocusCues
+[58] = Int32 ShowParams
+[59] = Boolean UseCompatibleTextRenderingInt
+[60] = Int32 WindowStyle
+[61] = System.String WindowText
+[62] = System.Windows.Forms.ContainerControl ParentContainerControl
+[63] = Boolean ShouldAutoValidate
+[64] = System.Windows.Forms.ImeMode CachedImeMode
+[65] = Boolean CanEnableIme
+[66] = System.Windows.Forms.ImeMode CurrentImeContextMode
+[67] = Int32 DisableImeModeChangedCount
+[68] = System.Windows.Forms.ImeMode ImeModeBase
+[69] = Int32 ImeWmCharsToIgnore
+[70] = Boolean CanRaiseEventsInternal
+[71] = System.ComponentModel.EventHandlerList Events
+[72] = Boolean DesignMode

ApprovalUtilities.Tests/Reflection/ReflectionUtilitiesTest.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using System.Threading;
 using System.Windows.Forms;
 using ApprovalTests;
 using ApprovalTests.Namers;
@@ -44,11 +45,22 @@ public void GetControlNonPublicStaticFields()
         }
 
         [TestMethod]
+        [UseReporter(typeof(DiffReporter))]
         public void GetInheritedNonPublicStaticFields()
         {
+            try
+            {
+
+
             Approvals.VerifyAll("For " + ApprovalResults.GetDotNetVersion(), 
                 new CheckBox().NonPublicStaticFields(true),
                 string.Empty);
+            }
+            catch (Exception)
+            {
+                //Thread.Sleep(9000);
+                throw;
+            }
         }
 
         [TestMethod]