* Removed use of using LlvmBindingsGenerator.CppSharpExtensions namespace for consistency

* Major re-work of type printer support to take full control of the mapping to managed code
    - Bypassed all the default conversion to CIL types that CppSharp would do during a parse so that only the real native types are in place and ToString() shows the underlying source type.
* Code analysis cleanup
* Bumped default range of VS to include VS2022 if available

Author: cibuild-telliam

Build-All.ps1

@@ -23,7 +23,7 @@
 
 .DESCRIPTION
     This script is used by the automated build to perform the actual build. The Ubiquity.NET
-    family of projects all a PowerShell driven build that is generally divorced from the
+    family of projects all employ a PowerShell driven build that is generally divorced from the
     automated build infrastructure used. This is done for several reasons, but the most
     important ones are the ability to reproduce the build locally for inner development and
     for flexibility in selecting the actual back end. The back ends have changed a few times

Packages.props

@@ -2,15 +2,15 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
         <GlobalPackageReference Include="CSemVer.Build.Tasks" Version="2.0.5" />
-        <GlobalPackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3"  Condition="'$(NoCommonAnalyzers)'!='true'" />
+        <GlobalPackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0"  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="16.5.0" />
-        <PackageReference Update="System.CodeDom" Version="5.0.0" />
+        <PackageReference Update="System.CodeDom" Version="6.0.0" />
         <PackageReference Update="System.Collections.Immutable" Version="1.7.0" />
         <PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
         <PackageReference Update="System.Memory" Version="4.5.4" />

PsModules/CommonBuild/CommonBuild.psm1

@@ -219,7 +219,7 @@ function Invoke-NuGet
     }
 }
 
-function Find-VSInstance([switch]$PreRelease, $Version = '[15.0, 17.0)', [string[]]$requiredComponents = @('Microsoft.Component.MSBuild'))
+function Find-VSInstance([switch]$PreRelease, $Version = '[15.0, 18.0)', [string[]]$requiredComponents = @('Microsoft.Component.MSBuild'))
 {
 <#
 .SYNOPSIS
@@ -229,7 +229,7 @@ function Find-VSInstance([switch]$PreRelease, $Version = '[15.0, 17.0)', [string
     Indicates if the search should include pre-release versions of Visual Studio
 
 .PARAMETER version
-    The version range to search for. [Default is '[15.0, 17.0)']
+    The version range to search for. [Default is '[15.0, 18.0)']
 
 .PARAMETER requiredComponents
     The set of required components to search for. [Default is an empty array]

src/Interop/LlvmBindingsGenerator/Configuration/Yaml/YamlArrayMarshalInfo.cs

@@ -11,8 +11,6 @@
 
 using CppSharp.AST;
 
-using LlvmBindingsGenerator.CppSharpExtensions;
-
 namespace LlvmBindingsGenerator.Configuration
 {
     [SuppressMessage( "Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "De-serialized from YAML" )]

src/Interop/LlvmBindingsGenerator/Configuration/Yaml/YamlBindingTransform.cs

@@ -9,8 +9,6 @@
 
 using CppSharp.AST;
 
-using LlvmBindingsGenerator.CppSharpExtensions;
-
 using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 

src/Interop/LlvmBindingsGenerator/Configuration/Yaml/YamlConfiguration.cs

@@ -7,10 +7,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Runtime.Serialization;
 
 using LlvmBindingsGenerator.Templates;
 
@@ -19,7 +17,6 @@
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 using YamlDotNet.Serialization.NodeDeserializers;
-using YamlDotNet.Serialization.Utilities;
 
 namespace LlvmBindingsGenerator.Configuration
 {

src/Interop/LlvmBindingsGenerator/Configuration/Yaml/YamlStringMarshalInfo.cs

@@ -12,7 +12,6 @@
 
 using CppSharp.AST;
 
-using LlvmBindingsGenerator.CppSharpExtensions;
 using LlvmBindingsGenerator.Templates;
 
 namespace LlvmBindingsGenerator.Configuration

src/Interop/LlvmBindingsGenerator/CppSharpExtensions/ASTContextExtensions.cs

@@ -6,13 +6,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 
 using CppSharp.AST;
 
-using LlvmBindingsGenerator.CppSharpExtensions;
-
 namespace LlvmBindingsGenerator
 {
     internal static class ASTContextExtensions
@@ -86,10 +85,11 @@ public static bool IsOpaquHandleTypeDef( this TypedefNameDecl td )
             return td.Type is TagType tt2 && tt2.IsOpaqueStruct();
         }
 
+        [SuppressMessage( "Style", "IDE0046:Convert to conditional expression", Justification = "Result is anything but simplified!" )]
         public static bool IsCannonicalHandleTypeDef( this TypedefNameDecl td )
         {
             // Canonical form, declaration is a pointer to an opaque struct
-            if( !(td.Type is PointerType pt) )
+            if( td.Type is not PointerType pt )
             {
                 return false;
             }
@@ -108,15 +108,15 @@ public static string AsString( this CppSharp.AST.Attribute attr, bool useFullNam
                 bldr.Append( ": " );
             }
 
-            bldr.Append( useFullNamespace ? attr.Type.FullName : attr.Type.Name.Substring( 0, attr.Type.Name.Length - 9 /*Len(Attribute)*/ ) );
+            bldr.Append( useFullNamespace ? attr.Type.FullName : attr.Type.Name[ 0..^9 ] );
             if( !string.IsNullOrWhiteSpace( attr.Value ) )
             {
                 bldr.Append( "( " );
                 bldr.Append( attr.Value );
                 bldr.Append( " )" );
             }
 
-            bldr.Append( "]" );
+            bldr.Append( ']' );
             return bldr.ToString();
         }
 

src/Interop/LlvmBindingsGenerator/CppSharpExtensions/Driver.cs

@@ -52,16 +52,6 @@ public Driver( DriverOptions options )
 
         public BindingContext Context { get; private set; }
 
-        public ITypePrinter TypePrinter
-        {
-            get => InternalTypePrinter;
-            set
-            {
-                InternalTypePrinter = value;
-                CppSharp.AST.Type.TypePrinterDelegate = InternalTypePrinter.ToString;
-            }
-        }
-
         public void SetupTypeMaps() =>
             Context.TypeMaps = new TypeMapDatabase( Context );
 
@@ -86,7 +76,7 @@ public bool ParseCode()
 
             Context.ASTContext = ClangParser.ConvertASTContext( ParserOptions.ASTContext );
             ClangParser.SourcesParsed -= OnSourceFileParsed;
-            return !hasParsingErrors;
+            return !HasParsingErrors;
         }
 
         public void SortModulesByDependencies()
@@ -222,6 +212,11 @@ public static void Run( ILibrary library )
 
             library.Preprocess( driver.Context.ASTContext );
 
+            if( CppSharp.AST.Type.TypePrinterDelegate is null)
+            {
+                throw new InvalidOperationException("Type.TypePrinterDelegate is null; Library must configure it to a non-null value to prevent null reference crashes");
+            }
+
             driver.ProcessCode();
             library.Postprocess( driver.Context.ASTContext );
 
@@ -302,38 +297,38 @@ private void OnFileParsed( IEnumerable<string> files, CppSharp.Parser.ParserResu
         {
             switch( result.Kind )
             {
-            case CppSharp.Parser.ParserResultKind.Success:
+            case ParserResultKind.Success:
                 if( !Options.Quiet )
                 {
                     Diagnostics.Message( "Parsed '{0}'", string.Join( ", ", files ) );
                 }
 
                 break;
 
-            case CppSharp.Parser.ParserResultKind.Error:
+            case ParserResultKind.Error:
                 Diagnostics.Error( "Error parsing '{0}'", string.Join( ", ", files ) );
-                hasParsingErrors = true;
+                HasParsingErrors = true;
                 break;
 
-            case CppSharp.Parser.ParserResultKind.FileNotFound:
+            case ParserResultKind.FileNotFound:
                 Diagnostics.Error( "File{0} not found: '{1}'"
                                  , ( files.Count() > 1 ) ? "s" : string.Empty
                                  , string.Join( ",", files )
                                  );
-                hasParsingErrors = true;
+                HasParsingErrors = true;
                 break;
             }
 
             for( uint i = 0; i < result.DiagnosticsCount; ++i )
             {
                 var diag = result.GetDiagnostics( i );
 
-                if( diag.Level == CppSharp.Parser.ParserDiagnosticLevel.Warning && !Options.Verbose )
+                if( diag.Level == ParserDiagnosticLevel.Warning && !Options.Verbose )
                 {
                     continue;
                 }
 
-                if( diag.Level == CppSharp.Parser.ParserDiagnosticLevel.Note )
+                if( diag.Level == ParserDiagnosticLevel.Note )
                 {
                     continue;
                 }
@@ -348,7 +343,6 @@ private void OnFileParsed( IEnumerable<string> files, CppSharp.Parser.ParserResu
             }
         }
 
-        private ITypePrinter InternalTypePrinter;
-        private bool hasParsingErrors;
+        private bool HasParsingErrors;
     }
 }

src/Interop/LlvmBindingsGenerator/ErrorTrackingDiagnostics.cs renamed to src/Interop/LlvmBindingsGenerator/CppSharpExtensions/ErrorTrackingDiagnostics.cs

@@ -7,7 +7,6 @@
 using System;
 
 using CppSharp;
-using CppSharp.AST;
 using CppSharp.Generators;
 using CppSharp.Parser;
 using CppSharp.Passes;
@@ -22,8 +21,6 @@ internal interface IDriver
         ParserOptions ParserOptions { get; }
 
         BindingContext Context { get; }
-
-        ITypePrinter TypePrinter { get; set; }
     }
 
     internal static class DriverExtensions

src/Interop/LlvmBindingsGenerator/CppSharpExtensions/IDriver.cs

@@ -0,0 +1,22 @@
+// -----------------------------------------------------------------------
+// <copyright file="ITypePrinter2.cs" company="Ubiquity.NET Contributors">
+// Copyright (c) Ubiquity.NET Contributors. All rights reserved.
+// </copyright>
+// -----------------------------------------------------------------------
+
+using CppSharp.AST;
+
+namespace LlvmBindingsGenerator
+{
+    internal enum TypeNameKind
+    {
+        Native,
+        Managed,
+    }
+
+    internal interface ITypePrinter2
+        : ITypePrinter
+    {
+        string GetName( CppSharp.AST.Type t, TypeNameKind kind = TypeNameKind.Native );
+    }
+}