Merge pull request #437 from moh-hassan/master-revert

Resolving the build error in the master branch
commandlineparser · Apr 26, 2019 · 61a2c41 · 61a2c41
2 parents 030eb8d + 28d1376
commit 61a2c41
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 49 deletions.
diff --git a/CommandLine.snk b/CommandLine.snk
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 #version should be only changed with RELEASE eminent, see RELEASE.md
-version: 2.4.{build}
+version: 2.5.{build}
 
 image: Visual Studio 2017
 

diff --git a/src/CommandLine/CommandLine.csproj b/src/CommandLine/CommandLine.csproj
@@ -8,6 +8,7 @@
     <DefineConstants Condition="'$(BuildTarget)' != 'fsharp'">$(DefineConstants);SKIP_FSHARP</DefineConstants>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>..\..\CommandLine.snk</AssemblyOriginatorKeyFile>
+
     <SignAssembly>true</SignAssembly>
     <PackageId Condition="'$(BuildTarget)' != 'fsharp'">CommandLineParser</PackageId>
     <PackageId Condition="'$(BuildTarget)' == 'fsharp'">CommandLineParser.FSharp</PackageId>

diff --git a/src/CommandLine/Core/ReflectionExtensions.cs b/src/CommandLine/Core/ReflectionExtensions.cs
@@ -14,8 +14,6 @@ namespace CommandLine.Core
 {
     static class ReflectionExtensions
     {
-        public const string CannotSetValueToTargetInstance = "Cannot set value to target instance.";
-
         public static IEnumerable<T> GetSpecifications<T>(this Type type, Func<PropertyInfo, T> selector)
         {
             return from pi in type.FlattenHierarchy().SelectMany(x => x.GetTypeInfo().GetProperties())
@@ -93,10 +91,6 @@ public static TargetType ToTargetType(this Type type)
 
         private static IEnumerable<Error> SetValue<T>(this SpecificationProperty specProp, T instance, object value)
         {
-            Action<Exception> fail = inner => {
-                throw new InvalidOperationException(CannotSetValueToTargetInstance, inner);
-            };
-
             try
             {
                 specProp.Property.SetValue(instance, value, null);
@@ -110,13 +104,6 @@ private static IEnumerable<Error> SetValue<T>(this SpecificationProperty specPro
             {
                  return new[] { new SetValueExceptionError(specProp.Specification.FromSpecification(), e, value) };
             }
-            catch(ArgumentException e)
-            {
-                var argEx = new ArgumentException(InvalidAttributeConfigurationError.ErrorMessage, e);
-                fail(argEx);
-            }
-
-            return instance;
         }
 
         public static object CreateEmptyArray(this Type type)

diff --git a/src/CommandLine/Error.cs b/src/CommandLine/Error.cs
@@ -64,13 +64,7 @@ public enum ErrorType
         /// <summary>
         /// Value of <see cref="CommandLine.SetValueExceptionError"/> type.
         /// </summary>
-        SetValueExceptionError,
-
-        VersionRequestedError,
-        /// <summary>
-        /// Value of <see cref="CommandLine.InvalidAttributeConfigurationError"/> type.
-        /// </summary>
-        InvalidAttributeConfigurationError
+        SetValueExceptionError
     }
 
     /// <summary>

diff --git a/src/CommandLine/Properties/AssemblyInfo.cs b/src/CommandLine/Properties/AssemblyInfo.cs
@@ -2,4 +2,4 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("CommandLine.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015eb7571d696c075627830f9468969103bc35764467bdbccfc0850f2fbe6913ee233d5d7cf3bbcb870fd42e6a8cc846d706b5cef35389e5b90051991ee8b6ed73ee1e19f108e409be69af6219b2e31862405f4b8ba101662fbbb54ba92a35d97664fe65c90c2bebd07aef530b01b709be5ed01b7e4d67a6b01c8643e42a20fb4")]
+[assembly: InternalsVisibleTo("CommandLine.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010009ab24ef889cd26bf46f7eaeda28e0fa5c04c50c93c6e121337b154bca0a1fd58ac6cb86195b709c2120f482730ced04a0e167a5758e56d3464bfabafe022b31510c39a61968fde795480dd60f6a396015c5f69a942074a3f4654b6dd66d0c63608bea78bdf96b35b1b48bb75741c2caad1f70579f286f1dbc2c560511c648d2")]
diff --git a/tests/CommandLine.Tests/Fakes/Options_With_InvalidDefaults.cs b/tests/CommandLine.Tests/Fakes/Options_With_InvalidDefaults.cs
diff --git a/tests/CommandLine.Tests/Unit/Core/InstanceBuilderTests.cs b/tests/CommandLine.Tests/Unit/Core/InstanceBuilderTests.cs
@@ -1133,21 +1133,6 @@ public void Parse_TimeSpan()
             // Teardown
         }
 
-        [Fact]
-        public void Build_DefaultBoolTypeString_ThrowsInvalidOperationException()
-        {
-            // Exercize system 
-            Action test = () => InvokeBuild<Options_With_InvalidDefaults>(
-                new string[] { });
-
-            // Verify outcome
-            test.ShouldThrow<InvalidOperationException>()
-                .WithMessage(ReflectionExtensions.CannotSetValueToTargetInstance)
-                .WithInnerException<ArgumentException>()
-                .WithInnerMessage(InvalidAttributeConfigurationError.ErrorMessage);
-        }
-
-
         [Fact]
         public void OptionClass_IsImmutable_HasNoCtor()
         {
@@ -1163,7 +1148,7 @@ private class ValueWithNoSetterOptions
         }
 
 
-        public static IEnumerable<object> RequiredValueStringData
+        public static IEnumerable<object[]> RequiredValueStringData
         {
             get
             {