Merge pull request #618 from Washi1337/development

6.0.0-beta.3

Author: Washi1337

.github/actions/get-dotnet-path/action.yml

@@ -33,9 +33,9 @@ runs:
       run: |
         if ('${{runner.os == 'Windows'}}' -eq 'true') {
           if ('${{inputs.architecture == 'x86'}}' -eq 'true') {
-            $dotnet = "${{steps.get-program-files-x86.outputs.path}}/dotnet/dotnet.exe";
+            $dotnet = "${{steps.get-program-files-x86.outputs.path}}\dotnet\dotnet.exe";
           } else {
-            $dotnet = "${{steps.get-program-files-x64.outputs.path}}/dotnet/dotnet.exe";
+            $dotnet = "${{steps.get-program-files-x64.outputs.path}}\dotnet\dotnet.exe";
           }
         } elseif ('${{inputs.image == 'macos-14'}}' -eq 'true') {
           if ('${{inputs.architecture == 'x64'}}' -eq 'true') {

.github/actions/setup-dotnet-windows/action.yml

@@ -42,6 +42,7 @@ runs:
 
     - name: Setup .NET ${{inputs.architecture}} ${{steps.get_channels.outputs.channels_multiline}}
       uses: actions/setup-dotnet@v4
+      if: ${{inputs.architecture != 'x86'}}
       with:
         dotnet-version: |
           ${{steps.get_channels.outputs.channel}}

.github/dependabot.yml

@@ -10,6 +10,12 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    groups:
+      ms-dependencies:
+        patterns:
+          - "System*"
+          - "Microsoft*"
+          - "xunit*"
 
   - package-ecosystem: "github-actions"
     target-branch: "development"

.github/workflows/test-and-publish.yml

@@ -106,8 +106,8 @@ jobs:
       architecture: ${{matrix.runner.arch}}
       dotnet_target_frameworks: ${{needs.variables.outputs.DOTNET_TARGET_FRAMEWORKS}}
       build_configuration: ${{matrix.build_configuration}}
-      # Ignore MacOS test results since support is yet lacking
-      is_experimental: ${{matrix.runner.image != 'windows-2022' && matrix.runner.image != 'ubuntu-22.04'}}
+      # TODO: Fully support tests on non-x64 and MacOS.
+      is_experimental: ${{matrix.runner.arch != 'x64' || (matrix.runner.image != 'windows-2022' && matrix.runner.image != 'ubuntu-22.04')}}
       skip_experimental: ${{ needs.variables.outputs.EXPERIMENTAL != 'true' }}
 
   publish:

AsmResolver.sln

@@ -26,6 +26,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestBinaries", "TestBinaries", "{7919C544-023E-4617-A41C-27A69DB397DE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DotNet", "DotNet", "{B3AF102B-ABE1-41B2-AE48-C40702F45AB0}"
+	ProjectSection(SolutionItems) = preProject
+		test\TestBinaries\DotNet\Directory.Build.props = test\TestBinaries\DotNet\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld", "test\TestBinaries\DotNet\HelloWorld\HelloWorld.csproj", "{856EEF27-8430-4360-9E4C-F923AF142D23}"
 EndProject

Directory.Build.props

@@ -6,9 +6,9 @@
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-        <LangVersion>10</LangVersion>
+        <LangVersion>12</LangVersion>
         <VersionPrefix>6.0.0</VersionPrefix>
-        <VersionSuffix>beta.2</VersionSuffix>
+        <VersionSuffix>beta.3</VersionSuffix>
         <Deterministic>true</Deterministic>
         <UseArtifactsOutput>true</UseArtifactsOutput>
     </PropertyGroup>

src/AsmResolver.DotNet.Dynamic/DynamicTypeSignatureReader.cs

@@ -1,6 +1,8 @@
 using System;
+#if !NET8_0_OR_GREATER
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
+#endif
 using AsmResolver.DotNet.Signatures;
 
 namespace AsmResolver.DotNet.Dynamic
@@ -12,18 +14,15 @@ namespace AsmResolver.DotNet.Dynamic
     /// </summary>
     public class DynamicTypeSignatureResolver : PhysicalTypeSignatureResolver
     {
-        private static readonly MethodInfo? GetTypeFromHandleUnsafeMethod;
-
-        static DynamicTypeSignatureResolver()
-        {
-            // We need to use reflection for this to stay compatible with .netstandard 2.0.
-            GetTypeFromHandleUnsafeMethod = typeof(Type)
+#if !NET8_0_OR_GREATER
+        // We need to use reflection for this to stay compatible with .netstandard 2.0.
+        private static readonly MethodInfo? GetTypeFromHandleUnsafeMethod = typeof(Type)
                 .GetMethod("GetTypeFromHandleUnsafe",
                     (BindingFlags) (-1),
                     null,
                     new[] {typeof(IntPtr)},
                     null);
-        }
+#endif
 
         /// <summary>
         /// Gets the singleton instance of the <see cref="DynamicTypeSignatureResolver"/> class.
@@ -36,17 +35,25 @@ static DynamicTypeSignatureResolver()
         /// <summary>
         /// Gets a value indicating whether dynamic resolution of method tables is supported.
         /// </summary>
+#if NET8_0_OR_GREATER
+        public static bool IsSupported => true;
+#else
         [MemberNotNullWhen(true, nameof(GetTypeFromHandleUnsafeMethod))]
         public static bool IsSupported => GetTypeFromHandleUnsafeMethod is not null;
+#endif
 
         /// <inheritdoc />
         public override TypeSignature ResolveRuntimeType(ref BlobReaderContext context, nint address)
         {
+#if NET8_0_OR_GREATER
+            var clrType = Type.GetTypeFromHandle(RuntimeTypeHandle.FromIntPtr(address));
+#else
             if (!IsSupported)
                 throw new PlatformNotSupportedException("The current platform does not support the translation of raw type handles to System.Type instances.");
 
             // Let the runtime translate the address to a type and import it.
             var clrType = (Type?) GetTypeFromHandleUnsafeMethod.Invoke(null, new object[] { address });
+#endif
 
             var type = clrType is not null
                 ? new ReferenceImporter(context.ReaderContext.ParentModule).ImportType(clrType)

src/AsmResolver.DotNet/Code/Cil/CilInstructionCollection.cs

@@ -12,7 +12,7 @@ namespace AsmResolver.DotNet.Code.Cil
     /// Represents a collection of CIL instructions found in a method body.
     /// </summary>
     [DebuggerDisplay("Count = {" + nameof(Count) + "}")]
-    public partial class CilInstructionCollection : IList<CilInstruction>
+    public partial class CilInstructionCollection : IList<CilInstruction>, IReadOnlyList<CilInstruction>
     {
         private readonly List<CilInstruction> _items = new();
         private ICilLabel? _endLabel;
@@ -34,7 +34,7 @@ public CilMethodBody Owner
             get;
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc cref="ICollection{T}.Count" />
         public int Count => _items.Count;
 
         /// <inheritdoc />
@@ -45,7 +45,7 @@ public CilMethodBody Owner
         /// </summary>
         public int Size => _items.Sum(x => x.Size);
 
-        /// <inheritdoc />
+        /// <inheritdoc cref="IList{T}.this" />
         public CilInstruction this[int index]
         {
             get => _items[index];

src/AsmResolver.DotNet/Signatures/Parsing/ParsedTypeFullName.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace AsmResolver.DotNet.Signatures.Parsing;
+
+internal sealed class ParsedTypeFullName(TypeName name)
+{
+    public TypeName Name { get; } = name;
+
+    public IList<TypeAnnotation> Annotations { get; } = new List<TypeAnnotation>();
+
+    public IResolutionScope? Scope { get; set; }
+
+    public TypeSignature ToTypeSignature(ModuleDefinition contextModule)
+    {
+        var baseTypeDefOrRef = Name.ToTypeDefOrRef(contextModule, Scope);
+
+        // The first annotation may be a generic instantiation, of which the root typesig is represented by
+        // GenericInstanceTypeSignature.
+        int startIndex = 0;
+        TypeSignature signature;
+        if (Annotations.Count > 0 && Annotations[0] is {Kind: TypeAnnotationType.GenericInstance} first)
+        {
+            var arguments = new TypeSignature[first.TypeArguments.Count];
+            for (int i = 0; i < first.TypeArguments.Count; i++)
+                arguments[i] = first.TypeArguments[i].ToTypeSignature(contextModule);
+
+            signature = baseTypeDefOrRef.MakeGenericInstanceType(arguments);
+            startIndex++;
+        }
+        else
+        {
+            signature = baseTypeDefOrRef.ToTypeSignature();
+        }
+
+        // Go over all type annotations and annotate the type signature accordingly.
+        for (int i = startIndex; i < Annotations.Count; i++)
+        {
+            signature = Annotations[i].Kind switch
+            {
+                TypeAnnotationType.ByReference => signature.MakeByReferenceType(),
+                TypeAnnotationType.Pointer => signature.MakePointerType(),
+                TypeAnnotationType.SzArray => signature.MakeSzArrayType(),
+                TypeAnnotationType.Array => signature.MakeArrayType(Annotations[i].Dimensions.ToArray()),
+                TypeAnnotationType.GenericInstance => throw new FormatException("Cannot instantiate a non-generic type."),
+                _ => throw new ArgumentOutOfRangeException()
+            };
+        }
+
+        return signature;
+    }
+}

src/AsmResolver.DotNet/Signatures/Parsing/TypeAnnotation.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace AsmResolver.DotNet.Signatures.Parsing;
+
+internal readonly struct TypeAnnotation
+{
+    private readonly object? _data;
+
+    public TypeAnnotation(TypeAnnotationType kind)
+    {
+        Kind = kind;
+        _data = null;
+    }
+
+    public TypeAnnotation(IList<ArrayDimension> dimensions)
+    {
+        Kind = TypeAnnotationType.Array;
+        _data = dimensions;
+    }
+
+    public TypeAnnotation(IList<ParsedTypeFullName> typeArguments)
+    {
+        Kind = TypeAnnotationType.GenericInstance;
+        _data = typeArguments;
+    }
+
+    public TypeAnnotationType Kind { get; }
+
+    public IList<ArrayDimension> Dimensions => (IList<ArrayDimension>) _data!;
+
+    public IList<ParsedTypeFullName> TypeArguments => (IList<ParsedTypeFullName>) _data!;
+}