Merge pull request #14 from mono/fix-warnings

Fix build warnings
mono · Jun 5, 2018 · dd094e7 · dd094e7
2 parents 1306b0d + b3afede
commit dd094e7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/framework/GuiUnit_NET_4_5.csproj b/src/framework/GuiUnit_NET_4_5.csproj
@@ -46,6 +46,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>..\..\bin\Debug\net-4.5\nunitlite.xml</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <NoWarn>1574;1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -57,6 +58,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>..\..\bin\Release\net-4.5\nunitlite.xml</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <NoWarn>1574;1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>guiunit.snk</AssemblyOriginatorKeyFile>

diff --git a/src/framework/Internal/AssemblyHelper.cs b/src/framework/Internal/AssemblyHelper.cs
@@ -38,7 +38,7 @@ public class AssemblyHelper
         /// <summary>
         /// Gets the path from which the assembly defining a Type was loaded.
         /// </summary>
-        /// <param name="assembly">The Type.</param>
+        /// <param name="type">The Type.</param>
         /// <returns>The path.</returns>
         public static string GetAssemblyPath(Type type)
         {
@@ -102,7 +102,7 @@ public static AssemblyName GetAssemblyName(Assembly assembly)
 #if !NETCF
         private static bool IsFileUri(string uri)
         {
-            return uri.ToLower().StartsWith(Uri.UriSchemeFile);
+            return uri.StartsWith(Uri.UriSchemeFile, StringComparison.OrdinalIgnoreCase);
         }
 
         // Public for testing purposes

diff --git a/src/framework/Internal/AsyncInvocationRegion.cs b/src/framework/Internal/AsyncInvocationRegion.cs
@@ -78,16 +78,8 @@ public override void Dispose()
 
             public override object WaitForPendingOperationsToComplete(object invocationResult)
             {
-                try
-                {
-                    _currentContext.WaitForPendingOperationsToComplete();
-                    return invocationResult;
-                }
-                catch (Exception e)
-                {
-                    //PreserveStackTrace(e);
-                    throw;
-                }
+                _currentContext.WaitForPendingOperationsToComplete();
+                return invocationResult;
             }
         }
 

diff --git a/src/framework/Internal/ThreadUtility.cs b/src/framework/Internal/ThreadUtility.cs
@@ -61,7 +61,9 @@ public static void Kill(Thread thread, object stateInfo)
                 // Although obsolete, this use of Resume() takes care of
                 // the odd case where a ThreadStateException is received
                 // so we continue to use it.
+                #pragma warning disable CS0618 // obsolete
                 thread.Resume();
+                #pragma warning restore CS0618
             }
 
             if ( (thread.ThreadState & ThreadState.WaitSleepJoin) != 0 )