From d5ea087a5ecdd9a957f99e420151dbba2dde5d04 Mon Sep 17 00:00:00 2001
From: Charles Stoner <10732005+cston@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:03:07 -0700
Subject: [PATCH 1/2] Change nativeaot attribute types to public

---
 .../nativeaot/Runtime.Base/src/System/AttributeTargets.cs       | 2 +-
 .../Runtime.Base/src/System/AttributeUsageAttribute.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/AttributeTargets.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/AttributeTargets.cs
index 37f5d151709e85..7b46cbf3f0783a 100644
--- a/src/coreclr/nativeaot/Runtime.Base/src/System/AttributeTargets.cs
+++ b/src/coreclr/nativeaot/Runtime.Base/src/System/AttributeTargets.cs
@@ -6,7 +6,7 @@ namespace System
     // Enum used to indicate all the elements of the
     // VOS it is valid to attach this element to.
 
-    internal enum AttributeTargets
+    public enum AttributeTargets
     {
         Assembly = 0x0001,
         Module = 0x0002,
diff --git a/src/coreclr/nativeaot/Runtime.Base/src/System/AttributeUsageAttribute.cs b/src/coreclr/nativeaot/Runtime.Base/src/System/AttributeUsageAttribute.cs
index 7c2ac82d779c4d..63e45d4a4753d8 100644
--- a/src/coreclr/nativeaot/Runtime.Base/src/System/AttributeUsageAttribute.cs
+++ b/src/coreclr/nativeaot/Runtime.Base/src/System/AttributeUsageAttribute.cs
@@ -14,7 +14,7 @@ namespace System
 {
     /* By default, attributes are inherited and multiple attributes are not allowed */
     [AttributeUsage(AttributeTargets.Class, Inherited = true)]
-    internal sealed class AttributeUsageAttribute : Attribute
+    public sealed class AttributeUsageAttribute : Attribute
     {
         //Constructors
         public AttributeUsageAttribute(AttributeTargets validOn)

From 93b846ae414a7bfb36a9cb76782ea41570ad7ef5 Mon Sep 17 00:00:00 2001
From: Charles Stoner <10732005+cston@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:11:06 -0700
Subject: [PATCH 2/2] Remove noRefSafetyRulesAttribute

---
 .../ILCompiler.Compiler.Tests.Assets.csproj                      | 1 -
 .../ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.Assets/ILCompiler.Compiler.Tests.Assets.csproj b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.Assets/ILCompiler.Compiler.Tests.Assets.csproj
index 605d407443da2a..ea167e092b0318 100644
--- a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.Assets/ILCompiler.Compiler.Tests.Assets.csproj
+++ b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.Assets/ILCompiler.Compiler.Tests.Assets.csproj
@@ -8,7 +8,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <!-- Don't add references to the netstandard platform since this is a core assembly -->
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <Features>noRefSafetyRulesAttribute=true</Features>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj
index b09ef313126615..5967b093841b15 100644
--- a/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj
+++ b/src/coreclr/tools/aot/ILCompiler.Compiler.Tests/ILCompiler.Compiler.Tests.csproj
@@ -14,7 +14,6 @@
     <Platforms>x86;x64</Platforms>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Features>noRefSafetyRulesAttribute=true</Features>
   </PropertyGroup>
 
   <ItemGroup>