RAF Attribute unification (#2156)

Bump sdk version in global.json
Fix new analyzer recommendations about AsSpan and Contains(char)
Disable ImplicitNamespaceImports
Update Microsoft.NetCore.App.Ref used by analyzer to take new Runtime attribute changes
Update analyzer to not use Message as a property in RequiresAssemblyFilesAttribute
Update cecil to use Microsoft.NETFramework.ReferenceAssemblies.net40 1.0.2 along with taking other cecil updates

Author: tlakollo

Directory.Build.props

@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <IsReferenceAssembly Condition="'$(IsReferenceAssembly)' == '' and '$([System.IO.Path]::GetFileName($(MSBuildProjectDirectory)))' == 'ref'">true</IsReferenceAssembly>
+    <DisableImplicitNamespaceImports_DotNet>true</DisableImplicitNamespaceImports_DotNet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(IsReferenceAssembly)' == 'true' ">
     <!-- Since .NET 5 reference assemblies are always produced -->

external/cecil

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.100-preview.5.21225.11",
+    "dotnet": "6.0.100-preview.7.21369.8",
     "runtimes": {
       "dotnet": [
         "5.0.0"

global.json

@@ -36,7 +36,7 @@ protected override SyntaxNode[] GetAttributeArguments (SemanticModel semanticMod
 			if (string.IsNullOrEmpty (name) || HasPublicAccessibility (containingSymbol!)) {
 				return Array.Empty<SyntaxNode> ();
 			} else {
-				return new[] { generator.AttributeArgument ("Message", generator.LiteralExpression ($"Calls {name}")) };
+				return new[] { generator.AttributeArgument (generator.LiteralExpression ($"Calls {name}")) };
 			}
 		}
 	}

src/ILLink.CodeFix/RequiresAssemblyFilesCodeFixProvider.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using ILLink.Shared;
 using Microsoft.CodeAnalysis;
@@ -116,7 +117,7 @@ void CheckStaticConstructors (OperationAnalysisContext operationContext,
 					ImmutableArray<IMethodSymbol> staticConstructors)
 				{
 					foreach (var staticConstructor in staticConstructors) {
-						if (staticConstructor.HasAttribute (RequiresAttributeName) && TryGetRequiresAttribute (staticConstructor, out AttributeData? requiresAttribute))
+						if (staticConstructor.HasAttribute (RequiresAttributeName) && TryGetRequiresAttribute (staticConstructor, out var requiresAttribute))
 							ReportRequiresDiagnostic (operationContext, staticConstructor, requiresAttribute);
 					}
 				}
@@ -149,7 +150,7 @@ void CheckCalledMember (
 					while (member is IMethodSymbol method && method.OverriddenMethod != null && SymbolEqualityComparer.Default.Equals (method.ReturnType, method.OverriddenMethod.ReturnType))
 						member = method.OverriddenMethod;
 
-					if (TryGetRequiresAttribute (member, out AttributeData? requiresAttribute)) {
+					if (TryGetRequiresAttribute (member, out var requiresAttribute)) {
 						ReportRequiresDiagnostic (operationContext, member, requiresAttribute);
 					}
 				}
@@ -227,7 +228,7 @@ private static ISymbol FindContainingSymbol (OperationAnalysisContext operationC
 		/// <param name="operationContext">Analyzer operation context to be able to report the diagnostic.</param>
 		/// <param name="member">Information about the member that generated the diagnostic.</param>
 		/// <param name="requiresAttribute">Requires attribute data to print attribute arguments.</param>
-		private void ReportRequiresDiagnostic (OperationAnalysisContext operationContext, ISymbol member, AttributeData? requiresAttribute)
+		private void ReportRequiresDiagnostic (OperationAnalysisContext operationContext, ISymbol member, AttributeData requiresAttribute)
 		{
 			var message = GetMessageFromAttribute (requiresAttribute);
 			var url = GetUrlFromAttribute (requiresAttribute);
@@ -250,7 +251,7 @@ private void ReportMismatchInAttributesDiagnostic (SymbolAnalysisContext symbolA
 
 		private bool HasMismatchingAttributes (ISymbol member1, ISymbol member2) => member1.HasAttribute (RequiresAttributeName) ^ member2.HasAttribute (RequiresAttributeName);
 
-		protected abstract string GetMessageFromAttribute (AttributeData? requiresAttribute);
+		protected abstract string GetMessageFromAttribute (AttributeData requiresAttribute);
 
 		private string GetUrlFromAttribute (AttributeData? requiresAttribute)
 		{
@@ -264,7 +265,7 @@ private string GetUrlFromAttribute (AttributeData? requiresAttribute)
 		/// <param name="member">Symbol of the member to search attribute.</param>
 		/// <param name="requiresAttribute">Output variable in case of matching Requires attribute.</param>
 		/// <returns>True if the member contains a Requires attribute; otherwise, returns false.</returns>
-		private bool TryGetRequiresAttribute (ISymbol member, out AttributeData? requiresAttribute)
+		private bool TryGetRequiresAttribute (ISymbol member, [NotNullWhen (returnValue: true)] out AttributeData? requiresAttribute)
 		{
 			requiresAttribute = null;
 			foreach (var _attribute in member.GetAttributes ()) {

src/ILLink.RoslynAnalyzer/RequiresAnalyzerBase.cs

@@ -123,15 +123,18 @@ protected override bool ReportSpecialIncompatibleMembersDiagnostic (OperationAna
 			return false;
 		}
 
-		protected override bool VerifyAttributeArguments (AttributeData attribute) => attribute.ConstructorArguments.Length == 0;
+		protected override bool VerifyAttributeArguments (AttributeData attribute) => attribute.ConstructorArguments.Length == 0 ||
+			attribute.ConstructorArguments.Length >= 1 && attribute.ConstructorArguments[0] is { Type: { SpecialType: SpecialType.System_String } } ctorArg;
 
-		protected override string GetMessageFromAttribute (AttributeData? requiresAttribute)
+		protected override string GetMessageFromAttribute (AttributeData requiresAttribute)
 		{
-			var message = requiresAttribute?.NamedArguments.FirstOrDefault (na => na.Key == "Message").Value.Value?.ToString ();
-			if (!string.IsNullOrEmpty (message))
-				message = $" {message}{(message!.TrimEnd ().EndsWith (".") ? "" : ".")}";
-
-			return message!;
+			string message = "";
+			if (requiresAttribute.ConstructorArguments.Length >= 1) {
+				message = requiresAttribute.ConstructorArguments[0].Value?.ToString () ?? "";
+				if (!string.IsNullOrEmpty (message))
+					message = $" {message}{(message!.TrimEnd ().EndsWith (".") ? "" : ".")}";
+			}
+			return message;
 		}
 	}
 }

src/ILLink.RoslynAnalyzer/RequiresAssemblyFilesAnalyzer.cs

@@ -1052,7 +1052,7 @@ bool MarkDependencyMethod (TypeDefinition type, string name, string[] signature,
 			bool marked = false;
 
 			int arity_marker = name.IndexOf ('`');
-			if (arity_marker < 1 || !int.TryParse (name.Substring (arity_marker + 1), out int arity)) {
+			if (arity_marker < 1 || !int.TryParse (name.AsSpan (arity_marker + 1), out int arity)) {
 				arity = 0;
 			} else {
 				name = name.Substring (0, arity_marker);
@@ -2035,7 +2035,7 @@ void MarkTypeWithDebuggerDisplayAttribute (TypeDefinition type, CustomAttribute
 						//
 						// We could implement support for this at some point, but for now it's important to make sure at least we don't crash trying to find some
 						// method on the current type when it exists on some other type
-						if (methodName.Contains ("."))
+						if (methodName.Contains ('.'))
 							continue;
 
 						MethodDefinition method = GetMethodWithNoParameters (type, methodName);

src/linker/Linker.Steps/MarkStep.cs

@@ -805,7 +805,7 @@ string Unquote (string arg)
 			string[] values = value.Split (new char[] { ',', ';', ' ' }, StringSplitOptions.RemoveEmptyEntries);
 			foreach (string v in values) {
 				var id = v.Trim ();
-				if (!id.StartsWith ("IL", StringComparison.Ordinal) || !ushort.TryParse (id.Substring (2), out ushort code))
+				if (!id.StartsWith ("IL", StringComparison.Ordinal) || !ushort.TryParse (id.AsSpan (2), out ushort code))
 					continue;
 
 				yield return code;
@@ -884,7 +884,7 @@ protected bool AddCustomStep (Pipeline pipeline, string arg)
 			string customStepName;
 			string targetName = null;
 			bool before = false;
-			if (!arg.Contains (":")) {
+			if (!arg.Contains (':')) {
 				customStepName = arg;
 			} else {
 				string[] parts = arg.Split (':');

src/linker/Linker/Driver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using Mono.Cecil;
 
 namespace Mono.Linker
@@ -16,7 +17,7 @@ public static string GetDisplayName (this MethodReference method)
 			var methodDefinition = method.Resolve ();
 			if (methodDefinition != null && (methodDefinition.IsSetter || methodDefinition.IsGetter)) {
 				// Append property name
-				string name = methodDefinition.IsSetter ? methodDefinition.Name.Substring (4) + ".set" : methodDefinition.Name.Substring (4) + ".get";
+				string name = methodDefinition.IsSetter ? string.Concat (methodDefinition.Name.AsSpan (4), ".set") : string.Concat (methodDefinition.Name.AsSpan (4), ".get");
 				sb.Append (name);
 				// Insert declaring type name and namespace
 				sb.Insert (0, '.').Insert (0, method.DeclaringType.GetDisplayName ());

src/linker/Linker/MethodReferenceExtensions.cs

@@ -100,7 +100,7 @@ void parseArrayDimensions (ArrayType at)
 				sb.Append (']');
 			}
 
-			sb.Append (arrayType.Name.Substring (0, arrayType.Name.IndexOf ('[')));
+			sb.Append (arrayType.Name.AsSpan (0, arrayType.Name.IndexOf ('[')));
 			parseArrayDimensions (arrayType);
 			var element = arrayType.ElementType as ArrayType;
 			while (element != null) {