Wholesale refactoring and update to .NET 9

* This is in preperation to make this repo fit the intended use and include all the standard support
* This is also to aid in updating to the latest docfx tool instead of the legacy and unsupported docfxconsole.

Author: smaillet

.editorconfig

@@ -0,0 +1,58 @@
+#Primary settings apply to all files unless overridden below
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+
+# match VS generated formatting for MSBuild project files
+[*.*proj,*.props,*.targets]
+indent_size = 2
+
+# match ISO standard requirement for C/C++
+[*.c,*.h,*.cpp]
+insert_final_newline = true
+
+[*.cs]
+csharp_style_conditional_delegate_call = true:warning
+csharp_style_expression_bodied_accessors = true:suggestion
+csharp_style_expression_bodied_indexers = true:suggestion
+csharp_style_expression_bodied_methods = true:suggestion
+csharp_style_expression_bodied_operators = true:suggestion
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_throw_expression = true:warning
+csharp_style_var_for_built_in_types = false:error
+csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_var_elsewhere = false:none
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+dotnet_sort_system_directives_first = true
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_explicit_tuple_names = true:warning
+dotnet_style_null_propagation = true:warning
+dotnet_style_qualification_for_event = false:error
+dotnet_style_qualification_for_field = false:error
+dotnet_style_qualification_for_property = false:error
+csharp_indent_block_contents = true
+csharp_indent_case_contents = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = false
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_keywords_in_control_flow_statements = false
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_around_declaration_statements = ignore
+csharp_space_between_method_call_parameter_list_parentheses = true
+csharp_space_between_square_brackets = true

CommandlineParsing.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+# Visual Studio Version 17
+VisualStudioVersion = 17.13.35828.75 d17.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ubiquity.CommandlineParsing", "Ubiquity.CommandlineParsing\Ubiquity.CommandlineParsing.csproj", "{068EAD73-EE70-4D5F-BFC8-5F13AB1BFE21}"
 EndProject
@@ -13,28 +13,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ubiquity.CommandlineParsing
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Repo Items", "Repo Items", "{2CC0C61E-2792-4E92-B72E-0DD1F72A7D05}"
 	ProjectSection(SolutionItems) = preProject
-		appveyor.yml = appveyor.yml
 		BuildVersion.xml = BuildVersion.xml
 		Clone-Docs.ps1 = Clone-Docs.ps1
 		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		global.json = global.json
 		GOVERNANCE.md = GOVERNANCE.md
 		LICENSE.md = LICENSE.md
 		nuget.config = nuget.config
+		Packages.props = Packages.props
 		Push-Docs.ps1 = Push-Docs.ps1
+		readme.md = readme.md
 		stylecop.json = stylecop.json
+		Ubiquity.NET.ruleset = Ubiquity.NET.ruleset
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{D50F6965-5684-404D-A886-CD6E1A7A093E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleArgs", "SampleArgs\SampleArgs.csproj", "{694CC71C-BD60-4B94-BC64-391949BA269E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{83C217F8-0B68-4729-A201-F3D3B9CA784E}"
-	ProjectSection(SolutionItems) = preProject
-		readme.md = readme.md
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

Directory.Build.props

@@ -14,15 +14,15 @@
         other projects that might want to set the build outputs etc... into a different place.
     -->
     <PropertyGroup>
-        <!-- Default to x86/Win32 | Debug build if not otherwise specified -->
+        <!-- Default to x64/AnyCPU | Release build if not otherwise specified -->
         <Platform Condition="'$(Platform)'=='' AND '$(MSBuildProjectExtension)'!='.vcxproj'">AnyCPU</Platform>
-        <Platform Condition="'$(Platform)'=='' AND '$(MSBuildProjectExtension)'=='.vcxproj'">Win32</Platform>
+        <Platform Condition="'$(Platform)'=='' AND '$(MSBuildProjectExtension)'=='.vcxproj'">x64</Platform>
         <Platform Condition="$(Platform)=='x86' AND '$(MSBuildProjectExtension)'=='.vcxproj'">Win32</Platform>
         <UnifiedPlatformPathName Condition="'$(UnifiedPlatformPathName)'==''">$(Platform)</UnifiedPlatformPathName>
         <UnifiedPlatformPathName Condition="'$(UnifiedPlatformPathName)'=='Win32'">x86</UnifiedPlatformPathName>
-        <UnifiedPlatformPathName Condition="'$(UnifiedPlatformPathName)'=='AnyCPU'">x86</UnifiedPlatformPathName>
+        <UnifiedPlatformPathName Condition="'$(UnifiedPlatformPathName)'=='AnyCPU'">x64</UnifiedPlatformPathName>
 
-        <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
+        <Configuration Condition="'$(Configuration)'==''">Release</Configuration>
 
         <!-- Use the location of this file (at the top of the build tree) to define the root directory, if not already set -->
         <BuildRootDir Condition="'$(BuildRootDir)'==''">$(MSBuildThisFileDirectory)</BuildRootDir>
@@ -39,40 +39,29 @@
 
         <BuildOutputPackagesDir Condition="'$(BuildOutputPackagesDir)'==''">$(BaseBuildOutputPath)packages\</BuildOutputPackagesDir>
 
-        <BuildVersionXmlFile Condition="'$(BuildVersionXmlFile)'==''">$(MSBuildThisFileDirectory)BuildVersion.xml</BuildVersionXmlFile>
-        <IsAutomatedBuild Condition="'$(IsAutomatedBuild)'=='' AND '$(APPVEYOR)'!=''">true</IsAutomatedBuild>
+        <BuildVersionXml Condition="'$(BuildVersionXmlFile)'==''">$(MSBuildThisFileDirectory)BuildVersion.xml</BuildVersionXml>
+        <IsAutomatedBuild Condition="'$(IsAutomatedBuild)'=='' AND '$(CI)'!=''">true</IsAutomatedBuild>
         <IsAutomatedBuild Condition="'$(IsAutomatedBuild)'==''">false</IsAutomatedBuild>
 
         <IsPullRequestBuild Condition="'$(IsPullRequestBuild)'=='' AND '$(APPVEYOR_PULL_REQUEST_NUMBER)'!=''">true</IsPullRequestBuild>
         <IsPullRequestBuild Condition="'$(IsPullRequestBuild)'==''">false</IsPullRequestBuild>
 
-        <IsReleaseBuild Condition="'$(IsReleaseBuild)'=='' AND '$(APPVEYOR_REPO_TAG)'=='true' AND '$(APPVEYOR_PULL_REQUEST_NUMBER)'=='' AND '$(APPVEYOR_BRANCH)'=='master'">true</IsReleaseBuild>
+        <IsReleaseBuild Condition="'$(IsReleaseBuild)'=='' AND '$(APPVEYOR_REPO_TAG)'=='true' AND '$(APPVEYOR_PULL_REQUEST_NUMBER)'==''">true</IsReleaseBuild>
         <IsReleaseBuild Condition="'$(IsReleaseBuild)'==''">false</IsReleaseBuild>
-        <BuildVersionXml>$(MSBuildThisFileDirectory)BuildVersion.xml</BuildVersionXml>
-        <BuildTimeStamp Condition="'$(BuildTimeStamp)'=='' AND '$(APPVEYOR_REPO_COMMIT_TIMESTAMP)'!=''">$(APPVEYOR_REPO_COMMIT_TIMESTAMP)</BuildTimeStamp>
+        <BuildTime Condition="'$(BuildTime)'=='' AND '$(APPVEYOR_REPO_COMMIT_TIMESTAMP)'!=''">$(APPVEYOR_REPO_COMMIT_TIMESTAMP)</BuildTime>
+        <!--<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>-->
     </PropertyGroup>
     <Choose>
         <!-- Apply standard analyzers and rule sets for all C# projects -->
-        <When Condition="'$(MSBuildProjectExtension)'=='.csproj'">
+        <When Condition="'$(MSBuildProjectExtension)'=='.csproj' and '$(DisableDirProps)'!='true'">
             <PropertyGroup>
                 <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Ubiquity.NET.ruleset</CodeAnalysisRuleSet>
                 <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
                 <Determenistic>true</Determenistic>
                 <IsTestProject>$(MSBuildProjectName.Contains('UT'))</IsTestProject>
-                <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' == 'AnyCPU'">$(BaseOutputPath)$(Configuration)\</OutputPath>
-                <OutputPath Condition="'$(OutputPath)' == '' and '$(PlatformName)' != 'AnyCPU'">$(BaseOutputPath)$(PlatformName)\$(Configuration)\</OutputPath>
-                <OutputPath Condition="!HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath>
             </PropertyGroup>
-            <ItemGroup Condition="'$(NoCommonAnalyzers)'!='true' and '$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false'">
-                 <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
-            </ItemGroup>
             <ItemGroup Condition="'$(NoCommonAnalyzers)'!='true'">
-                <PackageReference Include="Microsoft.AnalyzerPowerPack" Version="1.1.0" PrivateAssets="All" />
-                <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="All" />
-                <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
                 <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
-            </ItemGroup>
-            <ItemGroup Condition="'$(NoCommonAnalyzers)'!='true'">
                 <None Include="$(MSBuildThisFileDirectory)Ubiquity.NET.ruleset" Link="Ubiquity.NET.ruleset" />
             </ItemGroup>
         </When>

GOVERNANCE.md

@@ -80,8 +80,8 @@ contributions enable the project team to ensure that they are satisfying the nee
 activities include (but are not limited to):
 
 * Evangelizing about the project
-* Informing developers of project strengths and weaknesses from a new user’s perspective
-* Providing moral support (a ‘thank you’ goes a long way)
+* Informing developers of project strengths and weaknesses from a new user's perspective
+* Providing moral support (a 'thank you' goes a long way)
 * Providing financial support
 
 Users who continue to engage with the project and its community will often find themselves becoming more and more
@@ -105,6 +105,6 @@ in our [roles in open source document](http://oss-watch.ac.uk/resources/rolesino
 
 ### Decision-making process
 
-The benevolent dictatorship model does not need a formal conflict resolution process, since the project lead’s word is
+The benevolent dictatorship model does not need a formal conflict resolution process, since the project lead's word is
 final. If the community chooses to question the wisdom of the actions of a committer, the project lead can review their
 decisions by checking the communication archives, and either uphold or reverse them.

Packages.props

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <GlobalPackageReference Include="CSemVer.Build.Tasks" Version="2.0.5" />
+        <GlobalPackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2" Condition="'$(NoCommonAnalyzers)'!='true'" />
+        <GlobalPackageReference Include="RefactoringEssentials" Version="5.6.0" Condition="'$(NoCommonAnalyzers)'!='true'" />
+        <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" Condition="'$(NoCommonAnalyzers)'!='true'" />
+        <GlobalPackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false'" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Update="Ubiquity.ArgValidators" Version="6.0.1" />
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Update="MSTest.TestFramework" Version="3.8.3" />
+        <PackageReference Update="MSTest.TestAdapter" Version="3.8.3" />
+        <PackageReference Update="Sprache" Version="2.3.1"  />
+        <PackageReference Update="docfx.console" Version="2.59.4" />
+        <PackageReference Update="memberpage" Version="2.59.4" />
+        <PackageReference Update="msdn.4.5.2" Version="0.1.0-alpha-1611021200" />
+    </ItemGroup>
+</Project>

SampleArgs/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+#pragma warning disable SA1636 // File header copyright text must match
+/* This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+*/
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage( "StyleCop.CSharp.DocumentationRules", "SA1652:Enable XML documentation output", Justification = "Sample Code" )]

SampleArgs/Program.cs

@@ -1,15 +1,12 @@
-// Copyright (c) Ubiquity.NET Contributors. All rights reserved.
+
+// Copyright (c) Ubiquity.NET Contributors. All rights reserved.
 // Licensed under the MIT license. See the LICENSE.md file in the project root for full license information.
 
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using Ubiquity.CommandlineParsing;
 
-// warning SA1652: Enable XML documentation output
-// This is a sample app and not a documented API
-#pragma warning disable SA1652
-
 namespace SampleArgs
 {
     public static class Program
@@ -30,7 +27,7 @@ public static void Main( string[] args )
                 Console.WriteLine( "Option1: {0}", options.Option1 );
                 Console.WriteLine( "Option2: {0}", options.Option2 );
                 Console.WriteLine( "PositionalArgs:" );
-                foreach( var positional in options.PositionalArgs )
+                foreach( string positional in options.PositionalArgs )
                 {
                     Console.WriteLine( positional );
                 }
@@ -45,7 +42,7 @@ public static void Main( string[] args )
         [DefaultProperty( "PositionalArgs" )]
         internal class Options
         {
-            public List<string> PositionalArgs { get; } = new List<string>( );
+            public List<string> PositionalArgs { get; } = [];
 
             [CommandlineArg( AllowSpaceDelimitedValue = true )]
             public string Option1 { get; set; }

SampleArgs/SampleArgs.csproj

@@ -1,10 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
+  <!--<PropertyGroup>
+    <NoWarn>1701;1702;SA0001</NoWarn>
+  </PropertyGroup>-->
+
   <ItemGroup>
     <ProjectReference Include="..\Ubiquity.CommandlineParsing.Monad\Ubiquity.CommandlineParsing.Monad.csproj" />
   </ItemGroup>

Ubiquity.CommandlineParsing.Monad.UT/BinderTests.cs

@@ -1,5 +1,8 @@
-// Copyright (c) Ubiquity.NET Contributors. All rights reserved.
-// Licensed under the MIT license. See the LICENSE.md file in the project root for full license information.
+// -----------------------------------------------------------------------
+// <copyright file="BinderTests.cs" company="Ubiquity.NET Contributors">
+// Copyright (c) Ubiquity.NET Contributors. All rights reserved.
+// </copyright>
+// -----------------------------------------------------------------------
 
 #pragma warning disable SA1649, SA1402, SA1202, SA1652
 
@@ -16,7 +19,7 @@ public enum Option3Values
         {
             Foo,
             Bar,
-            Baz
+            Baz,
         }
 
         public List<string> PositionalArgs { get; } = new List<string>( );
@@ -56,7 +59,7 @@ public class BinderTests
                 @"-m:multi3",
                 @"-o4",
                 @"positional2",
-                @"""positional 3\"""
+                @"""positional 3\""",
             };
 
         [TestMethod]

Ubiquity.CommandlineParsing.Monad.UT/GlobalSuppression.cs

@@ -1,6 +1,10 @@
-// Copyright (c) Ubiquity.NET Contributors. All rights reserved.
-// Licensed under the MIT license. See the LICENSE.md file in the project root for full license information.
+// -----------------------------------------------------------------------
+// <copyright file="GlobalSuppression.cs" company="Ubiquity.NET Contributors">
+// Copyright (c) Ubiquity.NET Contributors. All rights reserved.
+// </copyright>
+// -----------------------------------------------------------------------
 
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: SuppressMessage( "StyleCop.CSharp.DocumentationRules", "SA1652:Enable XML documentation output", Justification = "Unit Tests" )]
+[assembly: SuppressMessage( "StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Unit Tests" )]