Refactor PropertyBuilder

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/PropertyBuilder.cs

@@ -21,11 +21,11 @@ namespace System.Reflection.Emit
     // A PropertyBuilder is always associated with a TypeBuilder.  The TypeBuilder.DefineProperty
     // method will return a new PropertyBuilder to a client.
     //
-    public sealed class PropertyBuilder : PropertyInfo
+    internal sealed class RuntimePropertyBuilder : PropertyBuilder
     {
         // Constructs a PropertyBuilder.
         //
-        internal PropertyBuilder(
+        internal RuntimePropertyBuilder(
             RuntimeModuleBuilder mod, // the module containing this PropertyBuilder
             string name, // property name
             PropertyAttributes attr, // property attribute such as DefaultProperty, Bindable, DisplayBind, etc
@@ -48,7 +48,7 @@ internal PropertyBuilder(
         /// <summary>
         /// Set the default value of the Property
         /// </summary>
-        public void SetConstant(object? defaultValue)
+        public override void SetConstant(object? defaultValue)
         {
             m_containingType.ThrowIfCreated();
 
@@ -79,26 +79,26 @@ private void SetMethodSemantics(MethodBuilder mdBuilder, MethodSemanticsAttribut
                 mdBuilder.MetadataToken);
         }
 
-        public void SetGetMethod(MethodBuilder mdBuilder)
+        public override void SetGetMethod(MethodBuilder mdBuilder)
         {
             SetMethodSemantics(mdBuilder, MethodSemanticsAttributes.Getter);
             m_getMethod = mdBuilder;
         }
 
-        public void SetSetMethod(MethodBuilder mdBuilder)
+        public override void SetSetMethod(MethodBuilder mdBuilder)
         {
             SetMethodSemantics(mdBuilder, MethodSemanticsAttributes.Setter);
             m_setMethod = mdBuilder;
         }
 
-        public void AddOtherMethod(MethodBuilder mdBuilder)
+        public override void AddOtherMethod(MethodBuilder mdBuilder)
         {
             SetMethodSemantics(mdBuilder, MethodSemanticsAttributes.Other);
         }
 
         // Use this function if client decides to form the custom attribute blob themselves
 
-        public void SetCustomAttribute(ConstructorInfo con, byte[] binaryAttribute)
+        public override void SetCustomAttribute(ConstructorInfo con, byte[] binaryAttribute)
         {
             ArgumentNullException.ThrowIfNull(con);
             ArgumentNullException.ThrowIfNull(binaryAttribute);
@@ -112,7 +112,7 @@ public void SetCustomAttribute(ConstructorInfo con, byte[] binaryAttribute)
         }
 
         // Use this function if client wishes to build CustomAttribute using CustomAttributeBuilder
-        public void SetCustomAttribute(CustomAttributeBuilder customBuilder)
+        public override void SetCustomAttribute(CustomAttributeBuilder customBuilder)
         {
             ArgumentNullException.ThrowIfNull(customBuilder);
 

src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/TypeBuilder.cs

@@ -1654,7 +1654,7 @@ private PropertyBuilder DefinePropertyNoLock(string name, PropertyAttributes att
                 sigLength);
 
             // create the property builder now.
-            return new PropertyBuilder(
+            return new RuntimePropertyBuilder(
                     m_module,
                     name,
                     attributes,

src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj

@@ -136,7 +136,6 @@
     <Compile Include="System\Reflection\Emit\LocalBuilder.cs" />
     <Compile Include="System\Reflection\Emit\MethodBuilder.cs" />
     <Compile Include="System\Reflection\Emit\ParameterBuilder.cs" />
-    <Compile Include="System\Reflection\Emit\PropertyBuilder.cs" />
     <Compile Include="System\Reflection\Emit\ReflectionEmitThrower.cs" />
     <Compile Include="System\Reflection\Emit\SignatureHelper.cs" />
     <Compile Include="System\Reflection\EnumInfo.cs" />

src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

@@ -604,6 +604,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\OperandType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\PackingSize.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\PEFileKinds.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\PropertyBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\StackBehaviour.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\TypeBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Emit\TypeNameBuilder.cs" />

src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/PropertyBuilder.cs

@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Reflection.Emit
+{
+    public abstract class PropertyBuilder : PropertyInfo
+    {
+        protected PropertyBuilder()
+        {
+        }
+
+        public virtual void AddOtherMethod(MethodBuilder mdBuilder)
+            => AddOtherMethod(mdBuilder);
+
+        public virtual void SetConstant(object defaultValue)
+            => SetConstant(defaultValue);
+
+        public virtual void SetCustomAttribute(ConstructorInfo con, byte[] binaryAttribute)
+            => SetCustomAttribute(con, binaryAttribute);
+
+        public virtual void SetCustomAttribute(CustomAttributeBuilder customBuilder)
+            => SetCustomAttribute(customBuilder);
+
+        public virtual void SetGetMethod(MethodBuilder mdBuilder)
+            => SetGetMethod(mdBuilder);
+
+        public virtual void SetSetMethod(MethodBuilder mdBuilder)
+            => SetSetMethod(mdBuilder);
+    }
+}