address warnings, cleanup

markolbert · markolbert · commit 2d8261ae9332 · 2020-06-30T11:27:44.000-07:00
diff --git a/FancyConsole/FancyConsole.cs b/FancyConsole/FancyConsole.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Text;
 using Alba.CsConsoleFormat;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine.Tests/EnumTests.cs b/J4JCommandLine.Tests/EnumTests.cs
@@ -1,6 +1,5 @@
 ﻿using FluentAssertions;
 using J4JSoftware.CommandLine;
-using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
 namespace J4JCommandLine.Tests
diff --git a/J4JCommandLine.Tests/HelpErrorTests.cs b/J4JCommandLine.Tests/HelpErrorTests.cs
@@ -5,6 +5,7 @@
 using J4JSoftware.CommandLine;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
+#pragma warning disable 8618
 
 namespace J4JCommandLine.Tests
 {
diff --git a/J4JCommandLine.Tests/ListPropertyTest.cs b/J4JCommandLine.Tests/ListPropertyTest.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using FluentAssertions;
+﻿using FluentAssertions;
 using J4JSoftware.CommandLine;
 using Xunit;
 
diff --git a/J4JCommandLine.Tests/SimplePropertyTest.cs b/J4JCommandLine.Tests/SimplePropertyTest.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using FluentAssertions;
+﻿using FluentAssertions;
 using J4JSoftware.CommandLine;
 using Xunit;
 
diff --git a/J4JCommandLine.Tests/SwitchPropertyTest.cs b/J4JCommandLine.Tests/SwitchPropertyTest.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using FluentAssertions;
+﻿using FluentAssertions;
 using J4JSoftware.CommandLine;
 using Xunit;
 
diff --git a/J4JCommandLine.Tests/support/AutoBindProperties.cs b/J4JCommandLine.Tests/support/AutoBindProperties.cs
@@ -1,6 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.ComponentModel;
 using J4JSoftware.CommandLine;
+#pragma warning disable 8618
 
 namespace J4JCommandLine.Tests
 {
diff --git a/J4JCommandLine.Tests/support/AutoBindPropertiesBroken.cs b/J4JCommandLine.Tests/support/AutoBindPropertiesBroken.cs
@@ -1,6 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.ComponentModel;
 using J4JSoftware.CommandLine;
+#pragma warning disable 8618
 
 namespace J4JCommandLine.Tests
 {
diff --git a/J4JCommandLine.Tests/support/ParameteredConstructorParent.cs b/J4JCommandLine.Tests/support/ParameteredConstructorParent.cs
@@ -1,4 +1,6 @@
-﻿namespace J4JCommandLine.Tests
+﻿#pragma warning disable 8618
+
+namespace J4JCommandLine.Tests
 {
     public class ParameteredConstructorParent
     {
diff --git a/J4JCommandLine.Tests/support/ParameterlessConstructorParent.cs b/J4JCommandLine.Tests/support/ParameterlessConstructorParent.cs
@@ -1,4 +1,6 @@
-﻿namespace J4JCommandLine.Tests
+﻿#pragma warning disable 8618
+
+namespace J4JCommandLine.Tests
 {
     public class ParameterlessConstructorParent
     {
diff --git a/J4JCommandLine.Tests/support/TestProperties.cs b/J4JCommandLine.Tests/support/TestProperties.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections.Generic;
+#pragma warning disable 8618
 
 namespace J4JCommandLine.Tests
 {
diff --git a/J4JCommandLine/allocating/Allocations.cs b/J4JCommandLine/allocating/Allocations.cs
@@ -17,7 +17,7 @@ public Allocations( StringComparison keyComp )
 
         protected override string GetKeyForItem( IAllocation item )
         {
-            return item.Key;
+            return item.Key!;
         }
     }
 }
diff --git a/J4JCommandLine/allocating/Allocator.cs b/J4JCommandLine/allocating/Allocator.cs
@@ -4,6 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine/allocating/ElementTerminator.cs b/J4JCommandLine/allocating/ElementTerminator.cs
@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine/allocating/IAllocation.cs b/J4JCommandLine/allocating/IAllocation.cs
@@ -14,7 +14,7 @@ public interface IAllocation
         
         // the key defining which option is referenced by the result. If null
         // the IAllocation refers to the unkeyed/non-optioned parameters
-        string? Key { get; }
+        string Key { get; }
         
         // the number of parameters in the result (e.g., 2 for "-x param1 param2")
         int NumParameters { get; }
diff --git a/J4JCommandLine/allocating/KeyPrefixer.cs b/J4JCommandLine/allocating/KeyPrefixer.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Linq;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine/error/CommandLineLogger.cs b/J4JCommandLine/error/CommandLineLogger.cs
@@ -1,9 +1,7 @@
 ﻿using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Linq;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine/option/MappableOption.cs b/J4JCommandLine/option/MappableOption.cs
@@ -70,7 +70,7 @@ bool isKeyed
                 ? "true"
                 : allocation.Parameters[ 0 ];
 
-            var retVal = Convert( allocation.Key, text );
+            var retVal = Convert( allocation.Key!, text );
 
             if( retVal != null )
                 return retVal;
@@ -93,7 +93,7 @@ bool isKeyed
 
             for( var idx = 0; idx < allocation.NumParameters; idx++ )
             {
-                var item = Convert( allocation.Key, allocation.Parameters[ idx ] );
+                var item = Convert( allocation.Key!, allocation.Parameters[ idx ] );
 
                 if( item == null )
                 {
diff --git a/J4JCommandLine/option/Option.cs b/J4JCommandLine/option/Option.cs
@@ -38,7 +38,7 @@ CommandLineLogger logger
         public ITargetableType TargetableType { get; }
 
         // an optional description of the Option, used in displaying help or error information
-        public string Description { get; internal set; }
+        public string Description { get; internal set; } = string.Empty;
         
         // the first key defined for an option, sorted alphabetically (Options can define multiple keys
         // but they must be unique within the scope of all Options)
@@ -60,7 +60,7 @@ CommandLineLogger logger
         public OptionStyle OptionStyle { get; internal set; }
 
         // the validator for the Option
-        public IOptionValidator Validator { get; internal set; }
+        public IOptionValidator? Validator { get; internal set; }
         
         // the optional default value assigned to the Option
         public object? DefaultValue
diff --git a/J4JCommandLine/target/BindingTarget.cs b/J4JCommandLine/target/BindingTarget.cs
@@ -1,11 +1,10 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Security.Cryptography;
 using System.Text;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine/target/BindingTargetBuilder.Configuration.cs b/J4JCommandLine/target/BindingTargetBuilder.Configuration.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine/target/BindingTargetBuilder.cs b/J4JCommandLine/target/BindingTargetBuilder.cs
@@ -1,10 +1,8 @@
 ﻿using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Linq;
-using System.Security.Cryptography;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine/target/IBindingTarget.cs b/J4JCommandLine/target/IBindingTarget.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq.Expressions;
 
 namespace J4JSoftware.CommandLine
diff --git a/J4JCommandLine/target/OptionKeysAttribute.cs b/J4JCommandLine/target/OptionKeysAttribute.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine/validator/OptionInRange.cs b/J4JCommandLine/validator/OptionInRange.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Text;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/J4JCommandLine/validator/OptionNotInRange.cs b/J4JCommandLine/validator/OptionNotInRange.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Text;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine
 {
diff --git a/examples/AutoBindExample/Program.cs b/examples/AutoBindExample/Program.cs
@@ -4,6 +4,7 @@
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine.Examples
 {
diff --git a/examples/InstancePropertyExample/Configuration.cs b/examples/InstancePropertyExample/Configuration.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections.Generic;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine.Examples
 {
diff --git a/examples/StaticPropertyExample/Program.cs b/examples/StaticPropertyExample/Program.cs
@@ -3,6 +3,7 @@
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
+#pragma warning disable 8618
 
 namespace J4JSoftware.CommandLine.Examples
 {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using System.Text;`
`4`	`3`	`using Alba.CsConsoleFormat;`
	`4`	`+#pragma warning disable 8618`
`5`	`5`
`6`	`6`	`namespace J4JSoftware.CommandLine`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using J4JSoftware.CommandLine;`
`6`	`6`	`using Microsoft.Extensions.DependencyInjection;`
`7`	`7`	`using Xunit;`
	`8`	`+#pragma warning disable 8618`
`8`	`9`
`9`	`10`	`namespace J4JCommandLine.Tests`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.ComponentModel;`
`3`	`3`	`using J4JSoftware.CommandLine;`
	`4`	`+#pragma warning disable 8618`
`4`	`5`
`5`	`6`	`namespace J4JCommandLine.Tests`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace J4JCommandLine.Tests`
	`1`	`+#pragma warning disable 8618`
	`2`	`+`
	`3`	`+namespace J4JCommandLine.Tests`
`2`	`4`	`{`
`3`	`5`	`public class ParameteredConstructorParent`
`4`	`6`	`{`