[generator] More AttributeTargets on SupportedOSPlatformAttribute (#1054)

jpobst · web-flow · commit 2d8b6d24e471 · 2022-10-24T15:07:02.000-04:00
Context: 1720628 Context: dotnet/android#7478 Context: https://github.com/buyaa-n/runtime/blob/7a62a22db186fda42dad6cbd681cf056fcf6aee6/src/libraries/System.Private.CoreLib/src/System/Runtime/Versioning/PlatformAttributes.cs#L52-L62 In order to compile classic MonoAndroid bindings that contain the new .NET `[SupportedOSPlatform]` attributes, we have a dummy copy that we can compile against. However this copy does not allow `AttributeTargets.Field`, so compiling with 1720628 causes: /Users/builder/azdo/_work/1/s/xamarin-android/src/Mono.Android/obj/Release/monoandroid10/android-33/mcw/Dalvik.Bytecode.IOpcodes.cs(646,4): error CS0592: Attribute global::System.Runtime.Versioning.SupportedOSPlatformAttribute' is not valid on this declaration type. It is only valid on 'assembly, module, class, struct, constructor, method, property, indexer, event' declarations. Update our copy to have the same `AttributeTargets` as the .NET version so we can compile on classic.
diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Adapters/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Adapters/__NamespaceMapping__.cs
@@ -8,7 +8,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/__NamespaceMapping__.cs
@@ -8,7 +8,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Arrays/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Arrays/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/__NamespaceMapping__.cs
@@ -8,7 +8,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Constructors/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Constructors/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Core_ClassParse/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Core_ClassParse/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/__NamespaceMapping__.cs
@@ -9,7 +9,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/GenericArguments/__NamespaceMapping__.cs
@@ -9,7 +9,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/NestedTypes/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/NestedTypes/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/NonStaticFields/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/NonStaticFields/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/NormalMethods/__NamespaceMapping__.cs
@@ -13,7 +13,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/NormalProperties/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/NormalProperties/__NamespaceMapping__.cs
@@ -10,7 +10,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/ParameterXPath/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/ParameterXPath/__NamespaceMapping__.cs
@@ -7,7 +7,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/StaticFields/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/StaticFields/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/StaticMethods/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/StaticMethods/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/StaticProperties/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/StaticProperties/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/Streams/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/Streams/__NamespaceMapping__.cs
@@ -16,7 +16,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/TestInterface/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/TestInterface/__NamespaceMapping__.cs
@@ -12,7 +12,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/java.lang.Enum/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/java.lang.Enum/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tests/generator-Tests/expected.xaji/java.util.List/__NamespaceMapping__.cs b/tests/generator-Tests/expected.xaji/java.util.List/__NamespaceMapping__.cs
@@ -6,7 +6,7 @@
 #if !NET
 namespace System.Runtime.Versioning {
     [System.Diagnostics.Conditional("NEVER")]
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Interface | AttributeTargets.Method | AttributeTargets.Module | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]
     internal sealed class SupportedOSPlatformAttribute : Attribute {
         public SupportedOSPlatformAttribute (string platformName) { }
     }
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/NamespaceMapping.cs

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#if !NET`
`8`	`8`	`namespace System.Runtime.Versioning {`
`9`	`9`	`[System.Diagnostics.Conditional("NEVER")]`
`10`		`- [AttributeUsage(AttributeTargets.Assembly \| AttributeTargets.Class \| AttributeTargets.Constructor \| AttributeTargets.Event \| AttributeTargets.Method \| AttributeTargets.Module \| AttributeTargets.Property \| AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]`
	`10`	`+ [AttributeUsage(AttributeTargets.Assembly \| AttributeTargets.Class \| AttributeTargets.Constructor \| AttributeTargets.Enum \| AttributeTargets.Event \| AttributeTargets.Field \| AttributeTargets.Interface \| AttributeTargets.Method \| AttributeTargets.Module \| AttributeTargets.Property \| AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]`
`11`	`11`	`internal sealed class SupportedOSPlatformAttribute : Attribute {`
`12`	`12`	`public SupportedOSPlatformAttribute (string platformName) { }`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#if !NET`
`9`	`9`	`namespace System.Runtime.Versioning {`
`10`	`10`	`[System.Diagnostics.Conditional("NEVER")]`
`11`		`- [AttributeUsage(AttributeTargets.Assembly \| AttributeTargets.Class \| AttributeTargets.Constructor \| AttributeTargets.Event \| AttributeTargets.Method \| AttributeTargets.Module \| AttributeTargets.Property \| AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]`
	`11`	`+ [AttributeUsage(AttributeTargets.Assembly \| AttributeTargets.Class \| AttributeTargets.Constructor \| AttributeTargets.Enum \| AttributeTargets.Event \| AttributeTargets.Field \| AttributeTargets.Interface \| AttributeTargets.Method \| AttributeTargets.Module \| AttributeTargets.Property \| AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]`
`12`	`12`	`internal sealed class SupportedOSPlatformAttribute : Attribute {`
`13`	`13`	`public SupportedOSPlatformAttribute (string platformName) { }`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#if !NET`
`7`	`7`	`namespace System.Runtime.Versioning {`
`8`	`8`	`[System.Diagnostics.Conditional("NEVER")]`
`9`		`- [AttributeUsage(AttributeTargets.Assembly \| AttributeTargets.Class \| AttributeTargets.Constructor \| AttributeTargets.Event \| AttributeTargets.Method \| AttributeTargets.Module \| AttributeTargets.Property \| AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]`
	`9`	`+ [AttributeUsage(AttributeTargets.Assembly \| AttributeTargets.Class \| AttributeTargets.Constructor \| AttributeTargets.Enum \| AttributeTargets.Event \| AttributeTargets.Field \| AttributeTargets.Interface \| AttributeTargets.Method \| AttributeTargets.Module \| AttributeTargets.Property \| AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]`
`10`	`10`	`internal sealed class SupportedOSPlatformAttribute : Attribute {`
`11`	`11`	`public SupportedOSPlatformAttribute (string platformName) { }`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#if !NET`
`10`	`10`	`namespace System.Runtime.Versioning {`
`11`	`11`	`[System.Diagnostics.Conditional("NEVER")]`
`12`		`- [AttributeUsage(AttributeTargets.Assembly \| AttributeTargets.Class \| AttributeTargets.Constructor \| AttributeTargets.Event \| AttributeTargets.Method \| AttributeTargets.Module \| AttributeTargets.Property \| AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]`
	`12`	`+ [AttributeUsage(AttributeTargets.Assembly \| AttributeTargets.Class \| AttributeTargets.Constructor \| AttributeTargets.Enum \| AttributeTargets.Event \| AttributeTargets.Field \| AttributeTargets.Interface \| AttributeTargets.Method \| AttributeTargets.Module \| AttributeTargets.Property \| AttributeTargets.Struct, AllowMultiple = true, Inherited = false)]`
`13`	`13`	`internal sealed class SupportedOSPlatformAttribute : Attribute {`
`14`	`14`	`public SupportedOSPlatformAttribute (string platformName) { }`
`15`	`15`	`}`