Merge pull request #802 from AArnott/AOTTestOn10

Test NativeAOT compat on .NET 10

Author: AArnott

.github/workflows/build.yml

@@ -62,17 +62,17 @@ jobs:
           (gci $Path).Length / 1024 / 1024
         }
 
-        $Path = './bin/AotNativeConsole/${{ env.BUILDCONFIGURATION }}/net9.0/${{ matrix.rid }}/publish/AotNativeConsole'
+        $Path = './bin/AotNativeConsole/${{ env.BUILDCONFIGURATION }}/net10.0/${{ matrix.rid }}/publish/AotNativeConsole'
         $ActualSize = GetSizeInMB($Path)
 
         # Allow variance of a small threshold of the expected value.
         # Fail even if it's smaller than anticipated so that the expected window can be shrunk in this file.
         if ($IsLinux) {
-          $ExpectedSize = 8.01
+          $ExpectedSize = 7.03
         } elseif ($IsMacOS) {
-          $ExpectedSize = 7.87
+          $ExpectedSize = 6.43
         } else {
-          $ExpectedSize = 6.79
+          $ExpectedSize = 6.83
         }
         $AllowedVariance = 0.2
         $SizeCheckPassed = [math]::Abs($ActualSize - $ExpectedSize) -le $AllowedVariance

src/Nerdbank.MessagePack/ConverterTypeCollection.cs

@@ -98,14 +98,22 @@ internal bool TryGetConverterType(Type dataType, [NotNullWhen(true), Dynamically
 	/// <summary>
 	/// A wrapper around <see cref="Type"/> that ensures a trimmed application will preserve the type's public default constructor.
 	/// </summary>
-	/// <param name="type">The wrapped type. A type that does not declare a public default constructor may still be wrapped, but may result in a runtime error later.</param>
-	public readonly struct TypeWithDefaultConstructor([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type type)
+	public readonly struct TypeWithDefaultConstructor
 	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="TypeWithDefaultConstructor"/> struct.
+		/// </summary>
+		/// <param name="type">The wrapped type. A type that does not declare a public default constructor may still be wrapped, but may result in a runtime error later.</param>
+		public TypeWithDefaultConstructor([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type type)
+		{
+			this.Type = type;
+		}
+
 		/// <summary>
 		/// Gets the wrapped type.
 		/// </summary>
 		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-		public Type Type => type;
+		public Type Type { get; }
 
 		/// <summary>
 		/// Implicitly converts a <see cref="Type"/> to a <see cref="TypeWithDefaultConstructor"/>.

src/Nerdbank.MessagePack/MessagePackConverterAttribute.cs

@@ -9,17 +9,25 @@ namespace Nerdbank.MessagePack;
 /// A class applied to a custom data type to prescribe a custom <see cref="MessagePackConverter{T}"/>
 /// implementation to use for serialization.
 /// </summary>
-/// <param name="converterType">
-/// A type that implements <see cref="MessagePackConverter{T}"/>
-/// where <c>T</c> is a type argument matching the type to which this attribute is applied.
-/// </param>
 [AttributeUsage(AttributeTargets.Interface | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false, Inherited = false)]
-[AssociatedTypeAttribute(nameof(converterType), TypeShapeRequirements.Constructor)]
-public class MessagePackConverterAttribute([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type converterType) : Attribute
+[AssociatedTypeAttribute("converterType", TypeShapeRequirements.Constructor)]
+public class MessagePackConverterAttribute : Attribute
 {
+	/// <summary>
+	/// Initializes a new instance of the <see cref="MessagePackConverterAttribute"/> class.
+	/// </summary>
+	/// <param name="converterType">
+	/// A type that implements <see cref="MessagePackConverter{T}"/>
+	/// where <c>T</c> is a type argument matching the type to which this attribute is applied.
+	/// </param>
+	public MessagePackConverterAttribute([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type converterType)
+	{
+		this.ConverterType = converterType;
+	}
+
 	/// <summary>
 	/// Gets the type that implements <see cref="MessagePackConverter{T}"/>.
 	/// </summary>
 	[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
-	public Type ConverterType => converterType;
+	public Type ConverterType { get; }
 }

test/AotCompatibilityTest/AotCompatibilityTest.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\AOT.props" />
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 

test/AotNativeConsole/AotNativeConsole.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\AOT.props" />
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>