Nullable annotations for projects using XamlX

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github"]
 	path = src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
 	url = https://github.com/kekekeks/XamlX.git
-[submodule "nukebuild/il-repack"]
-	path = nukebuild/il-repack
-	url = https://github.com/Gillibald/il-repack

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.101",
+    "version": "8.0.204",
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": {

nukebuild/Build.cs

@@ -40,7 +40,8 @@ partial class Build : NukeBuild
     [PackageExecutable("Microsoft.DotNet.GenAPI.Tool", "Microsoft.DotNet.GenAPI.Tool.dll", Framework = "net8.0")]
     Tool ApiGenTool;
 
-
+    [PackageExecutable("dotnet-ilrepack", "ILRepackTool.dll", Framework = "net8.0")]
+    Tool IlRepackTool;
 
     protected override void OnBuildInitialized()
     {
@@ -307,7 +308,8 @@ void DoMemoryTest()
         .Executes(() =>
         {
             BuildTasksPatcher.PatchBuildTasksInPackage(Parameters.NugetIntermediateRoot / "Avalonia.Build.Tasks." +
-                                                       Parameters.Version + ".nupkg");
+                                                       Parameters.Version + ".nupkg",
+                                                       IlRepackTool);
             var config = Numerge.MergeConfiguration.LoadFile(RootDirectory / "nukebuild" / "numerge.config");
             EnsureCleanDirectory(Parameters.NugetRoot);
             if(!Numerge.NugetPackageMerger.Merge(Parameters.NugetIntermediateRoot, Parameters.NugetRoot, config,

nukebuild/BuildTasksPatcher.cs

@@ -2,9 +2,9 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using ILRepacking;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using Nuke.Common.Tooling;
 
 public class BuildTasksPatcher
 {
@@ -56,7 +56,7 @@ private static string GetSourceLinkInfo(string path)
         return null;
     }
 
-    public static void PatchBuildTasksInPackage(string packagePath)
+    public static void PatchBuildTasksInPackage(string packagePath, Tool ilRepackTool)
     {
         using (var archive = new ZipArchive(File.Open(packagePath, FileMode.Open, FileAccess.ReadWrite),
             ZipArchiveMode.Update))
@@ -70,30 +70,23 @@ public static void PatchBuildTasksInPackage(string packagePath)
                     Directory.CreateDirectory(tempDir);
                     var temp = Path.Combine(tempDir, entry.Name);
                     var output = temp + ".output";
-                    File.Copy(typeof(Microsoft.Build.Framework.ITask).Assembly.GetModules()[0].FullyQualifiedName,
+                    File.Copy(GetAssemblyPath(typeof(Microsoft.Build.Framework.ITask)),
                         Path.Combine(tempDir, "Microsoft.Build.Framework.dll"));
                     var patched = new MemoryStream();
                     try
                     {
                         entry.ExtractToFile(temp, true);
                         // Get Original SourceLinkInfo Content
                         var sourceLinkInfoContent = GetSourceLinkInfo(temp);
-                        var repack = new ILRepacking.ILRepack(new RepackOptions()
-                        {
-                            Internalize = true,
-                            InputAssemblies = new[]
-                            {
-                                temp,
-                                typeof(Mono.Cecil.AssemblyDefinition).Assembly.GetModules()[0].FullyQualifiedName,
-                                typeof(Mono.Cecil.Rocks.MethodBodyRocks).Assembly.GetModules()[0].FullyQualifiedName,
-                                typeof(Mono.Cecil.Pdb.PdbReaderProvider).Assembly.GetModules()[0].FullyQualifiedName,
-                                typeof(Mono.Cecil.Mdb.MdbReaderProvider).Assembly.GetModules()[0].FullyQualifiedName,
-                            },
-                            SearchDirectories = Array.Empty<string>(),
-                            DebugInfo = true, // Allowed read debug info
-                            OutputFile = output
-                        });
-                        repack.Repack();
+
+                        var cecilAsm = GetAssemblyPath(typeof(Mono.Cecil.AssemblyDefinition));
+                        var cecilRocksAsm = GetAssemblyPath(typeof(Mono.Cecil.Rocks.MethodBodyRocks));
+                        var cecilPdbAsm = GetAssemblyPath(typeof(Mono.Cecil.Pdb.PdbReaderProvider));
+                        var cecilMdbAsm = GetAssemblyPath(typeof(Mono.Cecil.Mdb.MdbReaderProvider));
+
+                        ilRepackTool.Invoke(
+                            $"/internalize /out:\"{output}\" \"{temp}\" \"{cecilAsm}\" \"{cecilRocksAsm}\" \"{cecilPdbAsm}\" \"{cecilMdbAsm}\"",
+                            tempDir);
 
                         // 'hurr-durr assembly with the same name is already loaded' prevention
                         using (var asm = AssemblyDefinition.ReadAssembly(output,
@@ -161,4 +154,7 @@ public static void PatchBuildTasksInPackage(string packagePath)
             }
         }
     }
+
+    private static string GetAssemblyPath(Type typeInAssembly)
+        => typeInAssembly.Assembly.GetModules()[0].FullyQualifiedName;
 }

nukebuild/_build.csproj

@@ -20,7 +20,6 @@
     <PackageReference Include="MicroCom.CodeGenerator" Version="0.11.0" />
     <!-- Keep in sync with Avalonia.Build.Tasks -->
     <PackageReference Include="Mono.Cecil" Version="0.11.5" />
-    <PackageReference Include="Microsoft.Debugging.Tools.PdbStr" Version="20230731.1609.0" GeneratePathProperty="true" PrivateAssets="All"/>
     <PackageReference Include="Microsoft.Build.Framework" Version="17.3.2" PrivateAssets="All" />
     <PackageReference Include="xunit.runner.console" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
@@ -29,6 +28,7 @@
 
     <PackageDownload Include="Microsoft.DotNet.ApiCompat.Tool" Version="[8.0.200]" />
     <PackageDownload Include="Microsoft.DotNet.GenAPI.Tool" Version="[8.0.300-preview.24115.44]" />
+    <PackageDownload Include="dotnet-ilrepack" Version="[1.0.0]" />
   </ItemGroup>
 
   <ItemGroup>
@@ -38,9 +38,7 @@
     <!-- Common build related files -->
     <Compile Remove="Numerge/**/*.*" />
     <Compile Include="Numerge/Numerge/**/*.cs" Exclude="Numerge/Numerge/obj/**/*.cs" />
-    <EmbeddedResource Include="$(PkgMicrosoft_Debugging_Tools_PdbStr)/content/x86/pdbstr.exe" />
     <EmbeddedResource Include="../build/avalonia.snk" />
-    <Compile Remove="il-repack\ILRepack\Application.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Avalonia.Base/Metadata/NullableAttributes.cs → src/Avalonia.Base/Compatibility/NullableAttributes.cs

@@ -1,63 +1,30 @@
-#pragma warning disable MA0048 // File name must match type name
-#define INTERNAL_NULLABLE_ATTRIBUTES
-
-// https://github.com/dotnet/corefx/blob/48363ac826ccf66fbe31a5dcb1dc2aab9a7dd768/src/Common/src/CoreLib/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
+// https://raw.githubusercontent.com/dotnet/runtime/753648476b64946b8f5f4d25e1294adbabd3165b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
 
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 namespace System.Diagnostics.CodeAnalysis
 {
-#if NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
+#if !NET6_0_OR_GREATER
     /// <summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
     [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        sealed class AllowNullAttribute : Attribute
-    { }
+    internal sealed class AllowNullAttribute : Attribute { }
 
     /// <summary>Specifies that null is disallowed as an input even if the corresponding type allows it.</summary>
     [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        sealed class DisallowNullAttribute : Attribute
-    { }
+    internal sealed class DisallowNullAttribute : Attribute { }
 
     /// <summary>Specifies that an output may be null even if the corresponding type disallows it.</summary>
     [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        sealed class MaybeNullAttribute : Attribute
-    { }
+    internal sealed class MaybeNullAttribute : Attribute { }
 
-    /// <summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>
+    /// <summary>Specifies that an output will not be null even if the corresponding type allows it. Specifies that an input argument was not null when the call returns.</summary>
     [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        sealed class NotNullAttribute : Attribute
-    { }
+    internal sealed class NotNullAttribute : Attribute { }
 
     /// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter may be null even if the corresponding type disallows it.</summary>
     [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        sealed class MaybeNullWhenAttribute : Attribute
+    internal sealed class MaybeNullWhenAttribute : Attribute
     {
         /// <summary>Initializes the attribute with the specified return value condition.</summary>
         /// <param name="returnValue">
@@ -71,12 +38,7 @@ sealed class MaybeNullWhenAttribute : Attribute
 
     /// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
     [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        sealed class NotNullWhenAttribute : Attribute
+    internal sealed class NotNullWhenAttribute : Attribute
     {
         /// <summary>Initializes the attribute with the specified return value condition.</summary>
         /// <param name="returnValue">
@@ -90,12 +52,7 @@ sealed class NotNullWhenAttribute : Attribute
 
     /// <summary>Specifies that the output will be non-null if the named parameter is non-null.</summary>
     [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        sealed class NotNullIfNotNullAttribute : Attribute
+    internal sealed class NotNullIfNotNullAttribute : Attribute
     {
         /// <summary>Initializes the attribute with the associated parameter name.</summary>
         /// <param name="parameterName">
@@ -109,22 +66,11 @@ sealed class NotNullIfNotNullAttribute : Attribute
 
     /// <summary>Applied to a method that will never return under any circumstance.</summary>
     [AttributeUsage(AttributeTargets.Method, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        sealed class DoesNotReturnAttribute : Attribute
-    { }
+    internal sealed class DoesNotReturnAttribute : Attribute { }
 
     /// <summary>Specifies that the method will not return if the associated Boolean parameter is passed the specified value.</summary>
     [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-        sealed class DoesNotReturnIfAttribute : Attribute
+    internal sealed class DoesNotReturnIfAttribute : Attribute
     {
         /// <summary>Initializes the attribute with the specified parameter value.</summary>
         /// <param name="parameterValue">
@@ -136,82 +82,62 @@ sealed class DoesNotReturnIfAttribute : Attribute
         /// <summary>Gets the condition parameter value.</summary>
         public bool ParameterValue { get; }
     }
-#endif // NETSTANDARD2_0 attributes
 
-#if NETSTANDARD2_1 || NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NETCOREAPP3_1 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48
-    /// <summary>
-    /// Specifies that the method or property will ensure that the listed field and property members have
-    /// not-<see langword="null"/> values.
-    /// </summary>
+    /// <summary>Specifies that the method or property will ensure that the listed field and property members have not-null values.</summary>
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-    sealed class MemberNotNullAttribute : Attribute
+    internal sealed class MemberNotNullAttribute : Attribute
     {
-        /// <summary>Gets field or property member names.</summary>
-        public string[] Members { get; }
-
         /// <summary>Initializes the attribute with a field or property member.</summary>
-        /// <param name="member">The field or property member that is promised to be not-null.</param>
-        public MemberNotNullAttribute(string member)
-        {
-            Members = new[] { member };
-        }
+        /// <param name="member">
+        /// The field or property member that is promised to be not-null.
+        /// </param>
+        public MemberNotNullAttribute(string member) => Members = [member];
 
         /// <summary>Initializes the attribute with the list of field and property members.</summary>
-        /// <param name="members">The list of field and property members that are promised to be not-null.</param>
-        public MemberNotNullAttribute(params string[] members)
-        {
-            Members = members;
-        }
-    }
-
-    /// <summary>
-    /// Specifies that the method or property will ensure that the listed field and property members have
-    /// non-<see langword="null"/> values when returning with the specified return value condition.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
-#if INTERNAL_NULLABLE_ATTRIBUTES
-    internal
-#else
-    public
-#endif
-    sealed class MemberNotNullWhenAttribute : Attribute
-    {
-        /// <summary>Gets the return value condition.</summary>
-        public bool ReturnValue { get; }
+        /// <param name="members">
+        /// The list of field and property members that are promised to be not-null.
+        /// </param>
+        public MemberNotNullAttribute(params string[] members) => Members = members;
 
         /// <summary>Gets field or property member names.</summary>
         public string[] Members { get; }
+    }
 
+    /// <summary>Specifies that the method or property will ensure that the listed field and property members have not-null values when returning with the specified return value condition.</summary>
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+    internal sealed class MemberNotNullWhenAttribute : Attribute
+    {
         /// <summary>Initializes the attribute with the specified return value condition and a field or property member.</summary>
         /// <param name="returnValue">
-        /// The return value condition. If the method returns this value,
-        /// the associated parameter will not be <see langword="null"/>.
+        /// The return value condition. If the method returns this value, the associated parameter will not be null.
+        /// </param>
+        /// <param name="member">
+        /// The field or property member that is promised to be not-null.
         /// </param>
-        /// <param name="member">The field or property member that is promised to be not-<see langword="null"/>.</param>
         public MemberNotNullWhenAttribute(bool returnValue, string member)
         {
             ReturnValue = returnValue;
-            Members = new[] { member };
+            Members = [member];
         }
 
-        /// <summary>Initializes the attribute with the specified return value condition and list of field and property members.
-        /// </summary>
+        /// <summary>Initializes the attribute with the specified return value condition and list of field and property members.</summary>
         /// <param name="returnValue">
-        /// The return value condition. If the method returns this value,
-        /// the associated parameter will not be <see langword="null"/>.
+        /// The return value condition. If the method returns this value, the associated parameter will not be null.
+        /// </param>
+        /// <param name="members">
+        /// The list of field and property members that are promised to be not-null.
         /// </param>
-        /// <param name="members">The list of field and property members that are promised to be not-null.</param>
         public MemberNotNullWhenAttribute(bool returnValue, params string[] members)
         {
             ReturnValue = returnValue;
             Members = members;
         }
+
+        /// <summary>Gets the return value condition.</summary>
+        public bool ReturnValue { get; }
+
+        /// <summary>Gets field or property member names.</summary>
+        public string[] Members { get; }
     }
-#endif // NETSTANDARD2_1 attributes
+#endif
 }
-