From 67b98ca99f8b818f5c9095e2299371e6b8f2b7b8 Mon Sep 17 00:00:00 2001
From: Orace <pierre.lando@gmail.com>
Date: Mon, 12 Dec 2022 12:14:44 +0100
Subject: [PATCH 1/3] Add net7 target

---
 src/CommandLine/CommandLine.csproj               | 2 +-
 src/CommandLine/Core/TokenPartitioner.cs         | 2 --
 tests/CommandLine.Tests/CommandLine.Tests.csproj | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/CommandLine/CommandLine.csproj b/src/CommandLine/CommandLine.csproj
index 04496eb8..7330ba26 100644
--- a/src/CommandLine/CommandLine.csproj
+++ b/src/CommandLine/CommandLine.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<AssemblyName>CommandLine</AssemblyName>
 		<OutputType>Library</OutputType>
-		<TargetFrameworks>netstandard2.0;net40;net45;net461</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net40;net45;net461;net7</TargetFrameworks>
 		<DefineConstants>$(DefineConstants);CSX_EITHER_INTERNAL;CSX_REM_EITHER_BEYOND_2;CSX_ENUM_INTERNAL;ERRH_INTERNAL;CSX_MAYBE_INTERNAL;CSX_REM_EITHER_FUNC;CSX_REM_CRYPTORAND;ERRH_ADD_MAYBE_METHODS</DefineConstants>
 		<DefineConstants Condition="'$(BuildTarget)' != 'fsharp'">$(DefineConstants);SKIP_FSHARP</DefineConstants>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/CommandLine/Core/TokenPartitioner.cs b/src/CommandLine/Core/TokenPartitioner.cs
index 4dc25f7f..eee5b538 100644
--- a/src/CommandLine/Core/TokenPartitioner.cs
+++ b/src/CommandLine/Core/TokenPartitioner.cs
@@ -15,8 +15,6 @@ Tuple<IEnumerable<KeyValuePair<string, IEnumerable<string>>>, IEnumerable<string
                 IEnumerable<Token> tokens,
                 Func<string, Maybe<TypeDescriptor>> typeLookup)
         {
-            IEqualityComparer<Token> tokenComparer = ReferenceEqualityComparer.Default;
-
             var tokenList = tokens.Memoize();
             var partitioned = PartitionTokensByType(tokenList, typeLookup);
             var switches = partitioned.Item1;
diff --git a/tests/CommandLine.Tests/CommandLine.Tests.csproj b/tests/CommandLine.Tests/CommandLine.Tests.csproj
index d4dbcab0..dc373b67 100644
--- a/tests/CommandLine.Tests/CommandLine.Tests.csproj
+++ b/tests/CommandLine.Tests/CommandLine.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net461;net7;netcoreapp3.1</TargetFrameworks>
     <DefineConstants Condition="'$(BuildTarget)' != 'fsharp'">$(DefineConstants);SKIP_FSHARP</DefineConstants>
     <AssemblyOriginatorKeyFile>..\..\CommandLine.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

From bc2659da76d724a02df463c5c67816065831588c Mon Sep 17 00:00:00 2001
From: Orace <pierre.lando@gmail.com>
Date: Mon, 12 Dec 2022 11:55:45 +0100
Subject: [PATCH 2/3] Issue862. Add failing test.

---
 tests/CommandLine.Tests/Unit/Issue862Tests.cs | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 tests/CommandLine.Tests/Unit/Issue862Tests.cs

diff --git a/tests/CommandLine.Tests/Unit/Issue862Tests.cs b/tests/CommandLine.Tests/Unit/Issue862Tests.cs
new file mode 100644
index 00000000..9dcd574d
--- /dev/null
+++ b/tests/CommandLine.Tests/Unit/Issue862Tests.cs
@@ -0,0 +1,29 @@
+using System;
+using FluentAssertions;
+using Xunit;
+
+namespace CommandLine.Tests.Unit
+{
+    #if NET7_0_OR_GREATER
+    public class Issue862Tests
+    {
+
+        [Fact]
+        public void Properties_with_required_modifier_are_required()
+        {
+            var arguments = Array.Empty<string>();
+            var result = new Parser().ParseArguments<Options>(arguments);
+
+            result.Errors.Should().ContainSingle(e => e.Tag == ErrorType.MissingRequiredOptionError);
+            result.Tag.Should().Be(ParserResultType.NotParsed);
+        }
+
+        private class Options
+        {
+            [Option("cols")]
+            public required int Cols { get; set; }
+        }
+    }
+
+    #endif
+}

From c2cab0ca7f5848bb6324daaa89b8e46b788be7f1 Mon Sep 17 00:00:00 2001
From: Orace <pierre.lando@gmail.com>
Date: Mon, 12 Dec 2022 12:23:37 +0100
Subject: [PATCH 3/3] Issue862. Fix implementation.

---
 src/CommandLine/Core/Specification.cs | 30 ++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/CommandLine/Core/Specification.cs b/src/CommandLine/Core/Specification.cs
index b95b998c..8a093b94 100644
--- a/src/CommandLine/Core/Specification.cs
+++ b/src/CommandLine/Core/Specification.cs
@@ -4,6 +4,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using CommandLine.Infrastructure;
 using CSharpx;
 
@@ -54,7 +56,7 @@ protected Specification(SpecificationType tag, bool required, Maybe<int> min, Ma
             this.hidden = hidden;
         }
 
-        public SpecificationType Tag 
+        public SpecificationType Tag
         {
             get { return tag; }
         }
@@ -110,28 +112,40 @@ public bool Hidden
         }
 
         public static Specification FromProperty(PropertyInfo property)
-        {       
+        {
             var attrs = property.GetCustomAttributes(true);
+
+#if NET7_0_OR_GREATER
+            var isRequired = attrs.OfType<RequiredMemberAttribute>().Any();
+#else
+            var isRequired = false;
+#endif
+
             var oa = attrs.OfType<OptionAttribute>();
             if (oa.Count() == 1)
             {
-                var spec = OptionSpecification.FromAttribute(oa.Single(), property.PropertyType,
-                    ReflectionHelper.GetNamesOfEnum(property.PropertyType)); 
+                var optionAttribute = oa.Single();
+                optionAttribute.Required |= isRequired;
+                var spec = OptionSpecification.FromAttribute(optionAttribute, property.PropertyType,
+                                                             ReflectionHelper.GetNamesOfEnum(property.PropertyType));
 
                 if (spec.ShortName.Length == 0 && spec.LongName.Length == 0)
                 {
                     return spec.WithLongName(property.Name.ToLowerInvariant());
                 }
+
                 return spec;
             }
 
             var va = attrs.OfType<ValueAttribute>();
             if (va.Count() == 1)
             {
-                return ValueSpecification.FromAttribute(va.Single(), property.PropertyType,
-                    property.PropertyType.GetTypeInfo().IsEnum
-                        ? Enum.GetNames(property.PropertyType)
-                        : Enumerable.Empty<string>());
+                var valueAttribute = va.Single();
+                valueAttribute.Required |= isRequired;
+                return ValueSpecification.FromAttribute(valueAttribute, property.PropertyType,
+                                                        property.PropertyType.GetTypeInfo().IsEnum
+                                                            ? Enum.GetNames(property.PropertyType)
+                                                            : Enumerable.Empty<string>());
             }
 
             throw new InvalidOperationException();