Skip to content

Rename RequiresUnreferencedCode to Requires #2301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2021
Merged

Rename RequiresUnreferencedCode to Requires #2301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...RequiresUnreferencedCodeInCopyAssembly.cs → ...ty/Dependencies/RequiresInCopyAssembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

namespace Mono.Linker.Tests.Cases.RequiresCapability.Dependencies
{
public class RequiresUnreferencedCodeInCopyAssembly
public class RequiresInCopyAssembly
{
public RequiresUnreferencedCodeInCopyAssembly ()
public RequiresInCopyAssembly ()
{
}

Expand Down
4 changes: 2 additions & 2 deletions ...referencedCodeOnAttributeCtorAttribute.cs → ...ncies/RequiresOnAttributeCtorAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

namespace Mono.Linker.Tests.Cases.RequiresCapability.Dependencies
{
public class RequiresUnreferencedCodeOnAttributeCtorAttribute : Attribute
public class RequiresOnAttributeCtorAttribute : Attribute
{
[RequiresUnreferencedCode ("Message from attribute's ctor.")]
public RequiresUnreferencedCodeOnAttributeCtorAttribute ()
public RequiresOnAttributeCtorAttribute ()
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...UnreferencedCodeCapability.attributes.xml → ...ability/RequiresCapability.attributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<linker>
<assembly fullname="test, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="Mono.Linker.Tests.Cases.RequiresCapability.RequiresUnreferencedCodeCapability">
<type fullname="Mono.Linker.Tests.Cases.RequiresCapability.RequiresCapability">
<method name="MethodWithDuplicateRequiresAttribute">
<attribute fullname="System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute">
<argument>Message for MethodWithDuplicateRequiresAttribute from link attributes XML</argument>
Expand Down
605 changes: 301 additions & 304 deletions ...ity/RequiresUnreferencedCodeCapability.cs → .../RequiresCapability/RequiresCapability.cs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...UnreferencedCodeCapability.descriptor.xml → ...ability/RequiresCapability.descriptor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<linker>
<assembly fullname="test, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="Mono.Linker.Tests.Cases.RequiresCapability.RequiresUnreferencedCodeCapability">
<method name="RequiresUnreferencedCodeOnlyViaDescriptor" />
<type fullname="Mono.Linker.Tests.Cases.RequiresCapability.RequiresCapability">
<method name="RequiresOnlyViaDescriptor" />
</type>
</assembly>
</linker>
6 changes: 3 additions & 3 deletions ...rencedCodeCapabilityFromCopiedAssembly.cs → ...y/RequiresCapabilityFromCopiedAssembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
namespace Mono.Linker.Tests.Cases.RequiresCapability
{
[SetupLinkerAction ("copy", "lib")]
[SetupCompileBefore ("lib.dll", new[] { "Dependencies/RequiresUnreferencedCodeInCopyAssembly.cs" })]
[SetupCompileBefore ("lib.dll", new[] { "Dependencies/RequiresInCopyAssembly.cs" })]
[KeptAllTypesAndMembersInAssembly ("lib.dll")]
[LogDoesNotContain ("IL2026")]
[LogDoesNotContain ("IL2027")]
public class RequiresUnreferencedCodeCapabilityFromCopiedAssembly
public class RequiresCapabilityFromCopiedAssembly
{
public static void Main ()
{
Expand All @@ -23,7 +23,7 @@ public static void Main ()
[Kept]
static void Test ()
{
var x = new RequiresUnreferencedCodeInCopyAssembly ();
var x = new RequiresInCopyAssembly ();
}
}
}
30 changes: 15 additions & 15 deletions ...odeCapabilityReflectionAnalysisEnabled.cs → ...resCapabilityReflectionAnalysisEnabled.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@

namespace Mono.Linker.Tests.Cases.RequiresCapability
{
public class RequiresUnreferencedCodeCapabilityReflectionAnalysisEnabled
public class RequiresCapabilityReflectionAnalysisEnabled
{
[LogContains ("-- DynamicallyAccessedMembersEnabled --")]
[LogContains ("-- ReflectionPattern --")]
[LogContains ("-- DynamicallyAccessedMembersOnGenericsEnabled --")]
public static void Main ()
{
TestRequiresUnreferencedCodeAttributeWithDynamicallyAccessedMembersEnabled ();
TestRequiresUnreferencedCodeAttributeWithReflectionPattern ();
TestRequiresUnreferencedCodeAttributeWithDynamicallyAccessedMembersOnGenericsEnabled ();
TestRequiresUnreferencedCodeAndDynamicallyAccessedMembers.Test ();
TestRequiresAttributeWithDynamicallyAccessedMembersEnabled ();
TestRequiresAttributeWithReflectionPattern ();
TestRequiresAttributeWithDynamicallyAccessedMembersOnGenericsEnabled ();
TestRequiresAndDynamicallyAccessedMembers.Test ();
}

[Kept]
[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
[RequiresUnreferencedCode ("-- DynamicallyAccessedMembersEnabled --")]
[RecognizedReflectionAccessPattern]
static void TestRequiresUnreferencedCodeAttributeWithDynamicallyAccessedMembersEnabled ()
static void TestRequiresAttributeWithDynamicallyAccessedMembersEnabled ()
{
typeof (TypeWithPublicFieldsAccessed).RequiresPublicFields ();
}
Expand All @@ -43,7 +43,7 @@ class TypeWithPublicFieldsAccessed
[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
[RequiresUnreferencedCode ("-- ReflectionPattern --")]
[RecognizedReflectionAccessPattern]
static void TestRequiresUnreferencedCodeAttributeWithReflectionPattern ()
static void TestRequiresAttributeWithReflectionPattern ()
{
typeof (TypeWithMethodAccessed).GetMethod ("PublicMethod");
}
Expand All @@ -61,7 +61,7 @@ public void PublicMethod2 () { }
[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
[RequiresUnreferencedCode ("-- DynamicallyAccessedMembersOnGenericsEnabled --")]
[RecognizedReflectionAccessPattern]
static void TestRequiresUnreferencedCodeAttributeWithDynamicallyAccessedMembersOnGenericsEnabled ()
static void TestRequiresAttributeWithDynamicallyAccessedMembersOnGenericsEnabled ()
{
TypeRequiresPublicFields<TypeWithPublicFieldsForGenericType>.Method ();
MethodRequiresPublicFields<TypeWithPublicFieldsForGenericMethod> ();
Expand Down Expand Up @@ -105,22 +105,22 @@ class TypeWithPublicFieldsForGenericMethod

[Kept]
[ExpectedNoWarnings]
class TestRequiresUnreferencedCodeAndDynamicallyAccessedMembers
class TestRequiresAndDynamicallyAccessedMembers
{
[Kept]
[KeptAttributeAttribute (typeof (RequiresUnreferencedCodeAttribute))]
[RequiresUnreferencedCode ("--- RequiresUnreferencedCodeAndPublicMethods ---")]
[RequiresUnreferencedCode ("--- RequiresAndPublicMethods ---")]
[RecognizedReflectionAccessPattern]
static void RequiresUnreferencedCodeAndPublicMethods (
static void RequiresAndPublicMethods (
[KeptAttributeAttribute(typeof(DynamicallyAccessedMembersAttribute))]
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)]
Type type)
{
// This should not produce a warning since the method is annotated with RequiresUnreferencedCode
// This should not produce a warning since the method is annotated with Requires
type.RequiresPublicFields ();

// This will still "work" in that it will apply the PublicFields requirement onto the specified type
typeof (TestRequiresUnreferencedCodeAndDynamicallyAccessedMembers).RequiresPublicFields ();
typeof (TestRequiresAndDynamicallyAccessedMembers).RequiresPublicFields ();
}

[Kept]
Expand All @@ -137,10 +137,10 @@ static void PrivateInstanceMethod () { }
static int PrivateStaticField;

[Kept]
[ExpectedWarning ("IL2026", "--- RequiresUnreferencedCodeAndPublicMethods ---")]
[ExpectedWarning ("IL2026", "--- RequiresAndPublicMethods ---")]
public static void Test ()
{
RequiresUnreferencedCodeAndPublicMethods (typeof (TestRequiresUnreferencedCodeAndDynamicallyAccessedMembers));
RequiresAndPublicMethods (typeof (TestRequiresAndDynamicallyAccessedMembers));
}
}
}
Expand Down
Loading