More issues that were not flagged during compilation

randylevy · randylevy · commit 4cd92e227d51 · 2014-04-15T13:53:17.000-04:00
diff --git a/source/Unity/Src/RegistrationByConvention/AllClasses.NetCore.cs b/source/Unity/Src/RegistrationByConvention/AllClasses.NetCore.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.Practices.Unity
 {
-    partial class AllClasses
+    public partial class AllClasses
     {
         /// <summary>
         /// Returns all visible, non-abstract classes from all assemblies located where the application is installed.
diff --git a/source/Unity/Src/RegistrationByConvention/Resources.NetCore.cs b/source/Unity/Src/RegistrationByConvention/Resources.NetCore.cs
@@ -1,10 +1,8 @@
-﻿
-// This output was generated based on a format similar to the one used by resx resource generation.
+﻿// This output was generated based on a format similar to the one used by resx resource generation.
 namespace Microsoft.Practices.Unity
 {
     using System;
 
-
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -13,15 +11,14 @@ namespace Microsoft.Practices.Unity
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.Security.SecuritySafeCriticalAttribute()]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute]
+    [global::System.Security.SecuritySafeCriticalAttribute]
     internal class Resources
     {
-
         private static global::Windows.ApplicationModel.Resources.ResourceLoader resourceMan;
 
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Using resx generated code as template")]
         internal Resources()
         {
         }
@@ -42,28 +39,27 @@ internal Resources()
                 return resourceMan;
             }
         }
-		
-		/// <summary>
-		/// An attempt to override an existing mapping was detected for type {1} wit...
-		/// </summary>
+
+        /// <summary>
+        /// An attempt to override an existing mapping was detected for type {1} wit...
+        /// </summary>
         internal static string DuplicateTypeMappingException
         {
             get
             {
                 return ResourceManager.GetString("DuplicateTypeMappingException");
             }
         }
-	
-		/// <summary>
-		/// The set of assemblies contains a null element.
-		/// </summary>
+
+        /// <summary>
+        /// The set of assemblies contains a null element.
+        /// </summary>
         internal static string ExceptionNullAssembly
         {
             get
             {
                 return ResourceManager.GetString("ExceptionNullAssembly");
             }
         }
-	}
-}
-
+    }
+}
diff --git a/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/ContainerControlledLifetimeThreadingFixture.NetCore.cs b/source/Unity/Tests/Unity.NetCore.Tests/Unity.Tests/ContainerControlledLifetimeThreadingFixture.NetCore.cs
@@ -97,12 +97,12 @@ private class DelayStrategy : BuilderStrategy
 
             public override void PreBuildUp(IBuilderContext context)
             {
-                lock (@lock)
+                lock (DelayStrategy.@lock)
                 {
-                    SpinWait.SpinUntil(() => false, delayMS);
+                    SpinWait.SpinUntil(() => false, this.delayMS);
                 }
 
-                delayMS = delayMS == 0 ? 500 : 0;
+                this.delayMS = this.delayMS == 0 ? 500 : 0;
             }
         }
 
@@ -114,9 +114,9 @@ private class ThrowingStrategy : BuilderStrategy
 
             public override void PreBuildUp(IBuilderContext context)
             {
-                if (shouldThrow)
+                if (this.shouldThrow)
                 {
-                    shouldThrow = false;
+                    this.shouldThrow = false;
                     throw new Exception("Throwing from buildup chain");
                 }
             }
diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/App.xaml.cs b/source/Unity/Tests/Unity.Tests.WindowsPhone/App.xaml.cs
@@ -24,16 +24,16 @@ public partial class App : Application
         public App()
         {
             // Global handler for uncaught exceptions.
-            UnhandledException += Application_UnhandledException;
+            this.UnhandledException += this.Application_UnhandledException;
 
             // Standard XAML initialization
-            InitializeComponent();
+            this.InitializeComponent();
 
             // Phone-specific initialization
-            InitializePhoneApplication();
+            this.InitializePhoneApplication();
 
             // Language display initialization
-            InitializeLanguage();
+            this.InitializeLanguage();
 
             // Show graphics profiling information while debugging.
             if (Debugger.IsAttached)
@@ -108,37 +108,37 @@ private void Application_UnhandledException(object sender, ApplicationUnhandledE
         // Do not add any additional code to this method
         private void InitializePhoneApplication()
         {
-            if (phoneApplicationInitialized)
+            if (this.phoneApplicationInitialized)
             {
                 return;
             }
 
             // Create the frame but don't set it as RootVisual yet; this allows the splash
             // screen to remain active until the application is ready to render.
             RootFrame = new PhoneApplicationFrame();
-            RootFrame.Navigated += CompleteInitializePhoneApplication;
+            RootFrame.Navigated += this.CompleteInitializePhoneApplication;
 
             // Handle navigation failures
-            RootFrame.NavigationFailed += RootFrame_NavigationFailed;
+            RootFrame.NavigationFailed += this.RootFrame_NavigationFailed;
 
             // Handle reset requests for clearing the backstack
-            RootFrame.Navigated += CheckForResetNavigation;
+            RootFrame.Navigated += this.CheckForResetNavigation;
 
             // Ensure we don't initialize again
-            phoneApplicationInitialized = true;
+            this.phoneApplicationInitialized = true;
         }
 
         // Do not add any additional code to this method
         private void CompleteInitializePhoneApplication(object sender, NavigationEventArgs e)
         {
             // Set the root visual to allow the application to render
-            if (RootVisual != RootFrame)
+            if (this.RootVisual != RootFrame)
             {
-                RootVisual = RootFrame;
+                this.RootVisual = RootFrame;
             }
 
             // Remove this handler since it is no longer needed
-            RootFrame.Navigated -= CompleteInitializePhoneApplication;
+            RootFrame.Navigated -= this.CompleteInitializePhoneApplication;
         }
 
         private void CheckForResetNavigation(object sender, NavigationEventArgs e)
@@ -147,14 +147,14 @@ private void CheckForResetNavigation(object sender, NavigationEventArgs e)
             // on the next navigation to see if the page stack should be reset
             if (e.NavigationMode == NavigationMode.Reset)
             {
-                RootFrame.Navigated += ClearBackStackAfterReset;
+                RootFrame.Navigated += this.ClearBackStackAfterReset;
             }
         }
 
         private void ClearBackStackAfterReset(object sender, NavigationEventArgs e)
         {
             // Unregister the event so it doesn't get called again
-            RootFrame.Navigated -= ClearBackStackAfterReset;
+            RootFrame.Navigated -= this.ClearBackStackAfterReset;
 
             // Only clear the stack for 'new' (forward) and 'refresh' navigations
             if (e.NavigationMode != NavigationMode.New && e.NavigationMode != NavigationMode.Refresh)
diff --git a/source/Unity/Tests/Unity.Tests.WindowsPhone/MainPage.xaml.cs b/source/Unity/Tests/Unity.Tests.WindowsPhone/MainPage.xaml.cs
@@ -21,7 +21,7 @@ public partial class MainPage : PhoneApplicationPage
         // Constructor
         public MainPage()
         {
-            InitializeComponent();
+            this.InitializeComponent();
 
             var wrapper = new TestExecutorServiceWrapper();
             new Thread(new ServiceMain((param0, param1) => wrapper.SendMessage((ContractName)param0, param1)).Run).Start();
diff --git a/source/Unity/Tests/Unity.Tests/PerThreadLifetimeManagerFixture.cs b/source/Unity/Tests/Unity.Tests/PerThreadLifetimeManagerFixture.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
 
 // Duplicate using statements to avoid ordering using warning SA1210. 
-// module SuppressMessage not working for integrated build but was working for manual StyleCop invocation
+// ifdefs seem to be confusing stylecop
 #if NETFX_CORE
 #if !WINDOWS_PHONE
 using System;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Microsoft.Practices.Unity`
`13`	`13`	`{`
`14`		`- partial class AllClasses`
	`14`	`+ public partial class AllClasses`
`15`	`15`	`{`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// Returns all visible, non-abstract classes from all assemblies located where the application is installed.`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`		`-`
`2`		`-// This output was generated based on a format similar to the one used by resx resource generation.`
	`1`	`+// This output was generated based on a format similar to the one used by resx resource generation.`
`3`	`2`	`namespace Microsoft.Practices.Unity`
`4`	`3`	`{`
`5`	`4`	`using System;`
`6`	`5`
`7`		`-`
`8`	`6`	`/// <summary>`
`9`	`7`	`/// A strongly-typed resource class, for looking up localized strings, etc.`
`10`	`8`	`/// </summary>`
`@@ -13,15 +11,14 @@ namespace Microsoft.Practices.Unity`
`13`	`11`	`// To add or remove a member, edit your .ResX file then rerun ResGen`
`14`	`12`	`// with the /str option, or rebuild your VS project.`
`15`	`13`	`[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]`
`16`		`- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]`
`17`		`- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]`
`18`		`- [global::System.Security.SecuritySafeCriticalAttribute()]`
	`14`	`+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]`
	`15`	`+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute]`
	`16`	`+ [global::System.Security.SecuritySafeCriticalAttribute]`
`19`	`17`	`internal class Resources`
`20`	`18`	`{`
`21`		`-`
`22`	`19`	`private static global::Windows.ApplicationModel.Resources.ResourceLoader resourceMan;`
`23`	`20`
`24`		`- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]`
	`21`	`+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Using resx generated code as template")]`
`25`	`22`	`internal Resources()`
`26`	`23`	`{`
`27`	`24`	`}`
`@@ -42,28 +39,27 @@ internal Resources()`
`42`	`39`	`return resourceMan;`
`43`	`40`	`}`
`44`	`41`	`}`
`45`		`-`
`46`		`- /// <summary>`
`47`		`- /// An attempt to override an existing mapping was detected for type {1} wit...`
`48`		`- /// </summary>`
	`42`	`+`
	`43`	`+ /// <summary>`
	`44`	`+ /// An attempt to override an existing mapping was detected for type {1} wit...`
	`45`	`+ /// </summary>`
`49`	`46`	`internal static string DuplicateTypeMappingException`
`50`	`47`	`{`
`51`	`48`	`get`
`52`	`49`	`{`
`53`	`50`	`return ResourceManager.GetString("DuplicateTypeMappingException");`
`54`	`51`	`}`
`55`	`52`	`}`
`56`		`-`
`57`		`- /// <summary>`
`58`		`- /// The set of assemblies contains a null element.`
`59`		`- /// </summary>`
	`53`	`+`
	`54`	`+ /// <summary>`
	`55`	`+ /// The set of assemblies contains a null element.`
	`56`	`+ /// </summary>`
`60`	`57`	`internal static string ExceptionNullAssembly`
`61`	`58`	`{`
`62`	`59`	`get`
`63`	`60`	`{`
`64`	`61`	`return ResourceManager.GetString("ExceptionNullAssembly");`
`65`	`62`	`}`
`66`	`63`	`}`
`67`		`- }`
`68`		`-}`
`69`		`-`
	`64`	`+ }`
	`65`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,12 @@ private class DelayStrategy : BuilderStrategy`
`97`	`97`
`98`	`98`	`public override void PreBuildUp(IBuilderContext context)`
`99`	`99`	`{`
`100`		`- lock (@lock)`
	`100`	`+ lock (DelayStrategy.@lock)`
`101`	`101`	`{`
`102`		`- SpinWait.SpinUntil(() => false, delayMS);`
	`102`	`+ SpinWait.SpinUntil(() => false, this.delayMS);`
`103`	`103`	`}`
`104`	`104`
`105`		`- delayMS = delayMS == 0 ? 500 : 0;`
	`105`	`+ this.delayMS = this.delayMS == 0 ? 500 : 0;`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`@@ -114,9 +114,9 @@ private class ThrowingStrategy : BuilderStrategy`
`114`	`114`
`115`	`115`	`public override void PreBuildUp(IBuilderContext context)`
`116`	`116`	`{`
`117`		`- if (shouldThrow)`
	`117`	`+ if (this.shouldThrow)`
`118`	`118`	`{`
`119`		`- shouldThrow = false;`
	`119`	`+ this.shouldThrow = false;`
`120`	`120`	`throw new Exception("Throwing from buildup chain");`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,16 @@ public partial class App : Application`
`24`	`24`	`public App()`
`25`	`25`	`{`
`26`	`26`	`// Global handler for uncaught exceptions.`
`27`		`- UnhandledException += Application_UnhandledException;`
	`27`	`+ this.UnhandledException += this.Application_UnhandledException;`
`28`	`28`
`29`	`29`	`// Standard XAML initialization`
`30`		`- InitializeComponent();`
	`30`	`+ this.InitializeComponent();`
`31`	`31`
`32`	`32`	`// Phone-specific initialization`
`33`		`- InitializePhoneApplication();`
	`33`	`+ this.InitializePhoneApplication();`
`34`	`34`
`35`	`35`	`// Language display initialization`
`36`		`- InitializeLanguage();`
	`36`	`+ this.InitializeLanguage();`
`37`	`37`
`38`	`38`	`// Show graphics profiling information while debugging.`
`39`	`39`	`if (Debugger.IsAttached)`
`@@ -108,37 +108,37 @@ private void Application_UnhandledException(object sender, ApplicationUnhandledE`
`108`	`108`	`// Do not add any additional code to this method`
`109`	`109`	`private void InitializePhoneApplication()`
`110`	`110`	`{`
`111`		`- if (phoneApplicationInitialized)`
	`111`	`+ if (this.phoneApplicationInitialized)`
`112`	`112`	`{`
`113`	`113`	`return;`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`// Create the frame but don't set it as RootVisual yet; this allows the splash`
`117`	`117`	`// screen to remain active until the application is ready to render.`
`118`	`118`	`RootFrame = new PhoneApplicationFrame();`
`119`		`- RootFrame.Navigated += CompleteInitializePhoneApplication;`
	`119`	`+ RootFrame.Navigated += this.CompleteInitializePhoneApplication;`
`120`	`120`
`121`	`121`	`// Handle navigation failures`
`122`		`- RootFrame.NavigationFailed += RootFrame_NavigationFailed;`
	`122`	`+ RootFrame.NavigationFailed += this.RootFrame_NavigationFailed;`
`123`	`123`
`124`	`124`	`// Handle reset requests for clearing the backstack`
`125`		`- RootFrame.Navigated += CheckForResetNavigation;`
	`125`	`+ RootFrame.Navigated += this.CheckForResetNavigation;`
`126`	`126`
`127`	`127`	`// Ensure we don't initialize again`
`128`		`- phoneApplicationInitialized = true;`
	`128`	`+ this.phoneApplicationInitialized = true;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// Do not add any additional code to this method`
`132`	`132`	`private void CompleteInitializePhoneApplication(object sender, NavigationEventArgs e)`
`133`	`133`	`{`
`134`	`134`	`// Set the root visual to allow the application to render`
`135`		`- if (RootVisual != RootFrame)`
	`135`	`+ if (this.RootVisual != RootFrame)`
`136`	`136`	`{`
`137`		`- RootVisual = RootFrame;`
	`137`	`+ this.RootVisual = RootFrame;`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`// Remove this handler since it is no longer needed`
`141`		`- RootFrame.Navigated -= CompleteInitializePhoneApplication;`
	`141`	`+ RootFrame.Navigated -= this.CompleteInitializePhoneApplication;`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private void CheckForResetNavigation(object sender, NavigationEventArgs e)`
`@@ -147,14 +147,14 @@ private void CheckForResetNavigation(object sender, NavigationEventArgs e)`
`147`	`147`	`// on the next navigation to see if the page stack should be reset`
`148`	`148`	`if (e.NavigationMode == NavigationMode.Reset)`
`149`	`149`	`{`
`150`		`- RootFrame.Navigated += ClearBackStackAfterReset;`
	`150`	`+ RootFrame.Navigated += this.ClearBackStackAfterReset;`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`private void ClearBackStackAfterReset(object sender, NavigationEventArgs e)`
`155`	`155`	`{`
`156`	`156`	`// Unregister the event so it doesn't get called again`
`157`		`- RootFrame.Navigated -= ClearBackStackAfterReset;`
	`157`	`+ RootFrame.Navigated -= this.ClearBackStackAfterReset;`
`158`	`158`
`159`	`159`	`// Only clear the stack for 'new' (forward) and 'refresh' navigations`
`160`	`160`	`if (e.NavigationMode != NavigationMode.New && e.NavigationMode != NavigationMode.Refresh)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public partial class MainPage : PhoneApplicationPage`
`21`	`21`	`// Constructor`
`22`	`22`	`public MainPage()`
`23`	`23`	`{`
`24`		`- InitializeComponent();`
	`24`	`+ this.InitializeComponent();`
`25`	`25`
`26`	`26`	`var wrapper = new TestExecutorServiceWrapper();`
`27`	`27`	`new Thread(new ServiceMain((param0, param1) => wrapper.SendMessage((ContractName)param0, param1)).Run).Start();`