Enabling NRTs

.editorconfig

@@ -454,3 +454,16 @@ csharp_using_directive_placement = outside_namespace:error
 [*.cs]
 dotnet_diagnostic.CA1401.severity = silent
 dotnet_diagnostic.SYSLIB1054.severity = silent
+
+###############################################################################
+# Set dotnet analyzer rules to:
+#    disable various SYSLIB analyzers
+# due to unexpected exceptions thrown in the IDE
+###############################################################################
+[*.cs]
+dotnet_diagnostic.SYSLIB1055.severity = silent
+dotnet_diagnostic.SYSLIB1056.severity = silent
+dotnet_diagnostic.SYSLIB1057.severity = silent
+dotnet_diagnostic.SYSLIB1058.severity = silent
+dotnet_diagnostic.SYSLIB1060.severity = silent
+dotnet_diagnostic.SYSLIB1061.severity = silent

Directory.Build.props

@@ -25,7 +25,7 @@
     <DebugType>embedded</DebugType>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <!-- <Nullable>enable</Nullable> -->
+    <Nullable>enable</Nullable>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <SignAssembly>true</SignAssembly>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>

Directory.Build.targets

@@ -12,7 +12,7 @@
 
   <!-- Settings that append the existing setting value -->
   <PropertyGroup>
-    <NoWarn>$(NoWarn)</NoWarn>
+    <NoWarn>$(NoWarn);AD0001</NoWarn>
   </PropertyGroup>
 
   <!-- Settings that are only set for CI builds -->

sources/ClangSharp.Interop/ClangSharp.Interop.csproj

@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
+    <Compile Remove="Shims/MemberNotNullWhenAttribute.cs" />
     <Compile Remove="Shims/SkipLocalsInitAttribute.cs" />
   </ItemGroup>
 

sources/ClangSharp.Interop/Extensions/CXClientData.cs

@@ -21,7 +21,7 @@ public CXClientData(IntPtr handle)
 
     public static bool operator !=(CXClientData left, CXClientData right) => left.Handle != right.Handle;
 
-    public override bool Equals(object obj) => (obj is CXClientData other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXClientData other) && Equals(other);
 
     public bool Equals(CXClientData other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXCompilationDatabase.cs

@@ -42,7 +42,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXCompilationDatabase other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXCompilationDatabase other) && Equals(other);
 
     public bool Equals(CXCompilationDatabase other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXCompileCommand.cs

@@ -29,7 +29,7 @@ public CXCompileCommand(IntPtr handle)
 
     public static bool operator !=(CXCompileCommand left, CXCompileCommand right) => left.Handle != right.Handle;
 
-    public override bool Equals(object obj) => (obj is CXCompileCommand other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXCompileCommand other) && Equals(other);
 
     public bool Equals(CXCompileCommand other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXCompileCommands.cs

@@ -38,7 +38,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXCompileCommands other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXCompileCommands other) && Equals(other);
 
     public bool Equals(CXCompileCommands other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXCompletionString.cs

@@ -31,7 +31,7 @@ public CXCompletionString(IntPtr handle)
 
     public static bool operator !=(CXCompletionString left, CXCompletionString right) => left.Handle != right.Handle;
 
-    public override bool Equals(object obj) => (obj is CXCompletionString other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXCompletionString other) && Equals(other);
 
     public bool Equals(CXCompletionString other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXCursor.cs

@@ -1611,7 +1611,7 @@ public static void DisposeOverriddenCursors(ReadOnlySpan<CXCursor> overridden)
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXCursor other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXCursor other) && Equals(other);
 
     public bool Equals(CXCursor other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXCursorSet.cs

@@ -34,7 +34,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXCursorSet other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXCursorSet other) && Equals(other);
 
     public bool Equals(CXCursorSet other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXDiagnostic.cs

@@ -48,7 +48,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXDiagnostic other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXDiagnostic other) && Equals(other);
 
     public bool Equals(CXDiagnostic other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXDiagnosticSet.cs

@@ -49,7 +49,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXDiagnosticSet other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXDiagnosticSet other) && Equals(other);
 
     public bool Equals(CXDiagnosticSet other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXEvalResult.cs

@@ -58,7 +58,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXEvalResult other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXEvalResult other) && Equals(other);
 
     public bool Equals(CXEvalResult other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXFile.cs

@@ -25,7 +25,7 @@ public CXFile(IntPtr handle)
 
     public static bool operator !=(CXFile left, CXFile right) => clang.File_isEqual(left, right) == 0;
 
-    public override bool Equals(object obj) => (obj is CXFile other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXFile other) && Equals(other);
 
     public bool Equals(CXFile other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXIdxClientASTFile.cs

@@ -21,7 +21,7 @@ public CXIdxClientASTFile(IntPtr handle)
 
     public static bool operator !=(CXIdxClientASTFile left, CXIdxClientASTFile right) => left.Handle != right.Handle;
 
-    public override bool Equals(object obj) => (obj is CXIdxClientASTFile other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXIdxClientASTFile other) && Equals(other);
 
     public bool Equals(CXIdxClientASTFile other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXIdxClientContainer.cs

@@ -21,7 +21,7 @@ public CXIdxClientContainer(IntPtr handle)
 
     public static bool operator !=(CXIdxClientContainer left, CXIdxClientContainer right) => left.Handle != right.Handle;
 
-    public override bool Equals(object obj) => (obj is CXIdxClientContainer other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXIdxClientContainer other) && Equals(other);
 
     public bool Equals(CXIdxClientContainer other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXIdxClientEntity.cs

@@ -21,7 +21,7 @@ public CXIdxClientEntity(IntPtr handle)
 
     public static bool operator !=(CXIdxClientEntity left, CXIdxClientEntity right) => left.Handle != right.Handle;
 
-    public override bool Equals(object obj) => (obj is CXIdxClientEntity other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXIdxClientEntity other) && Equals(other);
 
     public bool Equals(CXIdxClientEntity other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXIdxClientFile.cs

@@ -21,7 +21,7 @@ public CXIdxClientFile(IntPtr handle)
 
     public static bool operator !=(CXIdxClientFile left, CXIdxClientFile right) => left.Handle != right.Handle;
 
-    public override bool Equals(object obj) => (obj is CXIdxClientFile other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXIdxClientFile other) && Equals(other);
 
     public bool Equals(CXIdxClientFile other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXIndex.cs

@@ -38,7 +38,7 @@ public CXGlobalOptFlags GlobalOptions
 
     public void Dispose() => clang.disposeIndex(this);
 
-    public override bool Equals(object obj) => (obj is CXIndex other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXIndex other) && Equals(other);
 
     public bool Equals(CXIndex other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXIndexAction.cs

@@ -32,7 +32,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXIndexAction other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXIndexAction other) && Equals(other);
 
     public bool Equals(CXIndexAction other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXModule.cs

@@ -31,7 +31,7 @@ public CXModule(IntPtr handle)
 
     public static bool operator !=(CXModule left, CXModule right) => left.Handle != right.Handle;
 
-    public override bool Equals(object obj) => (obj is CXModule other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXModule other) && Equals(other);
 
     public bool Equals(CXModule other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXModuleMapDescriptor.cs

@@ -32,7 +32,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXModuleMapDescriptor other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXModuleMapDescriptor other) && Equals(other);
 
     public bool Equals(CXModuleMapDescriptor other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXPrintingPolicy.cs

@@ -30,7 +30,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXPrintingPolicy other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXPrintingPolicy other) && Equals(other);
 
     public bool Equals(CXPrintingPolicy other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXRemapping.cs

@@ -47,7 +47,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXRemapping other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXRemapping other) && Equals(other);
 
     public bool Equals(CXRemapping other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXSourceLocation.cs

@@ -16,7 +16,7 @@ public unsafe partial struct CXSourceLocation : IEquatable<CXSourceLocation>
 
     public static bool operator !=(CXSourceLocation left, CXSourceLocation right) => clang.equalLocations(left, right) == 0;
 
-    public override bool Equals(object obj) => (obj is CXSourceLocation other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXSourceLocation other) && Equals(other);
 
     public bool Equals(CXSourceLocation other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXSourceRange.cs

@@ -22,7 +22,7 @@ public partial struct CXSourceRange : IEquatable<CXSourceRange>
 
     public static CXSourceRange Create(CXSourceLocation begin, CXSourceLocation end) => clang.getRange(begin, end);
 
-    public override bool Equals(object obj) => (obj is CXSourceRange other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXSourceRange other) && Equals(other);
 
     public bool Equals(CXSourceRange other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXTargetInfo.cs

@@ -34,7 +34,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXTargetInfo other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXTargetInfo other) && Equals(other);
 
     public bool Equals(CXTargetInfo other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXToken.cs

@@ -26,7 +26,7 @@ public unsafe partial struct CXToken : IEquatable<CXToken>
                (left.ptr_data != right.ptr_data);
     }
 
-    public override bool Equals(object obj) => (obj is CXSourceRange other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXSourceRange other) && Equals(other);
 
     public bool Equals(CXToken other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXTranslationUnit.cs

@@ -148,7 +148,7 @@ public void DisposeTokens(ReadOnlySpan<CXToken> tokens)
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXTranslationUnit other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXTranslationUnit other) && Equals(other);
 
     public bool Equals(CXTranslationUnit other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXType.cs

@@ -220,7 +220,7 @@ public string TypeClassSpelling
 
     public static bool operator !=(CXType left, CXType right) => clang.equalTypes(left, right) == 0;
 
-    public override bool Equals(object obj) => (obj is CXType other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXType other) && Equals(other);
 
     public bool Equals(CXType other) => this == other;
 

sources/ClangSharp.Interop/Extensions/CXVirtualFileOverlay.cs

@@ -23,7 +23,7 @@ public CXVirtualFileOverlay(IntPtr handle)
 
     public static CXVirtualFileOverlay Create(uint options) => clang.VirtualFileOverlay_create(options);
 
-    public CXErrorCode AddFileMapping(string virtualPath, string realPath)
+    public CXErrorCode AddFileMapping(string? virtualPath, string? realPath)
     {
         using var marshaledVirtualPath = new MarshaledString(virtualPath);
         using var marshaledRealPath = new MarshaledString(realPath);
@@ -39,7 +39,7 @@ public void Dispose()
         }
     }
 
-    public override bool Equals(object obj) => (obj is CXVirtualFileOverlay other) && Equals(other);
+    public override bool Equals(object? obj) => (obj is CXVirtualFileOverlay other) && Equals(other);
 
     public bool Equals(CXVirtualFileOverlay other) => this == other;
 

sources/ClangSharp.Interop/Extensions/clang.ResolveLibrary.cs

@@ -9,7 +9,7 @@ namespace ClangSharp.Interop;
 
 public static unsafe partial class @clang
 {
-    public static event DllImportResolver ResolveLibrary;
+    public static event DllImportResolver? ResolveLibrary;
 
     static @clang()
     {

sources/ClangSharp.Interop/Internals/MarshaledString.cs

@@ -8,7 +8,7 @@ namespace ClangSharp.Interop;
 
 public unsafe struct MarshaledString : IDisposable
 {
-    public MarshaledString(string input)
+    public MarshaledString(string? input)
     {
         int length;
         IntPtr value;

sources/ClangSharp.Interop/Internals/MarshaledStringArray.cs

@@ -6,7 +6,7 @@ namespace ClangSharp.Interop;
 
 public unsafe ref struct MarshaledStringArray
 {
-    private MarshaledString[] _values;
+    private MarshaledString[]? _values;
 
     public MarshaledStringArray(ReadOnlySpan<string> inputs)
     {

sources/ClangSharp.Interop/Shims/MemberNotNullWhenAttribute.cs

@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation and Contributors. All Rights Reserved. Licensed under the MIT License (MIT). See License.md in the repository root for more information.
+
+namespace System.Diagnostics.CodeAnalysis;
+
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+internal sealed class MemberNotNullWhenAttribute : Attribute
+{
+    public MemberNotNullWhenAttribute(bool returnValue, string member)
+    {
+        ReturnValue = returnValue;
+        Members = new[] { member };
+    }
+
+    public MemberNotNullWhenAttribute(bool returnValue, params string[] members)
+    {
+        ReturnValue = returnValue;
+        Members = members;
+    }
+
+    public bool ReturnValue { get; }
+
+    public string[] Members { get; }
+}

sources/ClangSharp.PInvokeGenerator/Abstractions/FieldDesc.cs

@@ -8,7 +8,7 @@ namespace ClangSharp.Abstractions;
 internal struct FieldDesc
 {
     public AccessSpecifier AccessSpecifier { get; set; }
-    public string NativeTypeName { get; set; }
+    public string? NativeTypeName { get; set; }
     public string EscapedName { get; set; }
     public string ParentName { get; set; }
     public int? Offset { get; set; }

sources/ClangSharp.PInvokeGenerator/Abstractions/FunctionOrDelegateDesc.cs

@@ -13,7 +13,7 @@ internal struct FunctionOrDelegateDesc
     public string EscapedName { get; set; }
     public string EntryPoint { get; set; }
     public string ParentName { get; set; }
-    public string LibraryPath { get; set; }
+    public string? LibraryPath { get; set; }
     public string ReturnType { get; set; }
     public CallingConvention CallingConvention { get; set; }
     public FunctionOrDelegateFlags Flags { get; set; }

sources/ClangSharp.PInvokeGenerator/Abstractions/IOutputBuilder.Visit.cs

@@ -9,7 +9,7 @@ internal partial interface IOutputBuilder
     void WriteDivider(bool force = false);
     void SuppressDivider();
 
-    void WriteCustomAttribute(string attribute, Action callback = null);
+    void WriteCustomAttribute(string attribute, Action? callback = null);
     void WriteIid(string name, Guid value);
     void EmitUsingDirective(string directive);
 }

sources/ClangSharp.PInvokeGenerator/Abstractions/IOutputBuilder.VisitDecl.cs

@@ -48,7 +48,7 @@ internal partial interface IOutputBuilder
     void EndFunctionOrDelegate(in FunctionOrDelegateDesc info);
 
     void BeginStruct(in StructDesc info);
-    void BeginMarkerInterface(string[] baseTypeNames);
+    void BeginMarkerInterface(string[]? baseTypeNames);
     void EndMarkerInterface();
     void BeginExplicitVtbl();
     void EndExplicitVtbl();

sources/ClangSharp.PInvokeGenerator/Abstractions/ParameterDesc.cs

@@ -11,7 +11,7 @@ internal struct ParameterDesc
     public string Type { get; set; }
     public string Name { get; set; }
     public string NativeTypeName { get; set; }
-    public IEnumerable<string> CppAttributes { get; set; }
+    public IEnumerable<string>? CppAttributes { get; set; }
     public Action<object> WriteCustomAttrs { get; set; }
     public object CustomAttrGeneratorData { get; set; }
     public CXSourceLocation? Location { get; set; }