Skip to content

Create a schema for the LinkAttribute XML files #2500

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
jtschuster merged 19 commits into from
Jan 22, 2022
Merged

Create a schema for the LinkAttribute XML files #2500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8cc539b
Initial Schema work
jtschuster Jan 12, 2022
abac411
Finalize schema so all test xml is valid
jtschuster Jan 12, 2022
5f3bdad
Add restrictions on some attributes and change uses of "nothing" to
jtschuster Jan 12, 2022
79ae2c2
Initial Schema work
jtschuster Jan 12, 2022
ed7b9e9
Finalize schema so all test xml is valid
jtschuster Jan 12, 2022
f837645
Add restrictions on some attributes and change uses of "nothing" to
jtschuster Jan 12, 2022
437f5cd
Remove schema reference in generated file expectation
jtschuster Jan 12, 2022
3ebd1fb
merge with main
jtschuster Jan 13, 2022
b142870
Adds a more restrictive schema for LinkAttributes and updates paths for
jtschuster Jan 13, 2022
8f200b1
Update docs to use 'none' instead of 'nothing'
jtschuster Jan 13, 2022
6838288
remove schema from xml expectation file
jtschuster Jan 13, 2022
6f5eb8f
remove namespace from xml schema location
jtschuster Jan 13, 2022
a1c1033
rename 'typechild' and allow multiple nested types
jtschuster Jan 13, 2022
c8e9f4b
remove <type> option from <linker> in LinkAttributes
jtschuster Jan 13, 2022
4c0cb95
Remove ILLink.xsd
jtschuster Jan 19, 2022
f70da3d
Add more restraints on xml schema
jtschuster Jan 19, 2022
fe36b38
Rename "none" to "nothing" in CreateRuntimeRootILLinkDescriptorFile
jtschuster Jan 19, 2022
9637260
change docs back to using preserve='nothing'
jtschuster Jan 19, 2022
504e4a2
Merge branch 'main' into XmlSchema
jtschuster Jan 20, 2022
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
124 changes: 124 additions & 0 deletions src/ILLink.Shared/ILLink.LinkAttributes.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<xsd:schema attributeFormDefault="unqualified"
elementFormDefault="unqualified"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">

<xsd:complexType name="membertype">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="attribute" type="attribute" />
</xsd:choice>
<xsd:attribute name="feature" />
<xsd:attribute name="featurevalue" type="xsd:boolean" />
<xsd:attribute name="featuredefault" type="xsd:boolean" />
<xsd:attribute name="name" />
<xsd:attribute name="signature" />
</xsd:complexType>

<xsd:complexType name="method">
<xsd:complexContent>
<xsd:extension base="membertype">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="parameter">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="attribute" type="attribute" />
</xsd:choice>
<xsd:attribute name="name" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
<xsd:choice maxOccurs="1" minOccurs="0">
<xsd:element name="return">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="attribute" type="attribute" />
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="argument" mixed="true">
<xsd:choice minOccurs="0" maxOccurs="1">
<xsd:element name="argument">
<xsd:complexType>
<xsd:simpleContent>
<xsd:extension base="xsd:string">
<xsd:attribute name="type" />
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
</xsd:choice>
<xsd:attribute name="type" />
</xsd:complexType>

<xsd:complexType name="attribute">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="argument" type="argument" />
<xsd:element name="property">
<xsd:complexType mixed="true">
<xsd:attribute name="name" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
<xsd:attribute name="internal" />
<xsd:attribute name="fullname" />
<xsd:attribute name="assembly" />
</xsd:complexType>

<xsd:complexType name="assembly">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="attribute" type="attribute" />
<xsd:element name="type" type="type" />
</xsd:choice>
<xsd:attribute name="fullname" use="required" />
<xsd:attribute name="feature" />
<xsd:attribute name="featurevalue" type="xsd:boolean" />
<xsd:attribute name="featuredefault" type="xsd:boolean" />
</xsd:complexType>

<xsd:complexType name ="nestedtype">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element name="event" type="membertype" />
<xsd:element name="method" type="method" />
<xsd:element name="field" type="membertype" />
<xsd:element name="property" type="membertype" />
<xsd:element name="attribute" type="attribute" />
<xsd:element name="type" type="nestedtype" />
</xsd:choice>
<xsd:attribute name="name" use="required"/>
<xsd:attribute name="feature" />
<xsd:attribute name="featurevalue" type="xsd:boolean" />
<xsd:attribute name="featuredefault" type="xsd:boolean" />
</xsd:complexType>

<xsd:complexType name="type">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="attribute" type="attribute" />
<xsd:element name="event" type="membertype" />
<xsd:element name="method" type="method" />
<xsd:element name="field" type="membertype" />
<xsd:element name="property" type="membertype" />
<xsd:element name="type" type="nestedtype"/>
</xsd:choice>
<xsd:attribute name="feature" />
<xsd:attribute name="featurevalue" type="xsd:boolean" />
<xsd:attribute name="featuredefault" type="xsd:boolean" />
<xsd:attribute name="fullname" use="required"/>
</xsd:complexType>

<xsd:element name="linker">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element name="assembly" type="assembly" />
<xsd:element name="type" type="type" />
</xsd:choice>
</xsd:complexType>
</xsd:element>

</xsd:schema>
6 changes: 6 additions & 0 deletions src/ILLink.Shared/ILLink.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,10 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)ILLink.LinkAttributes.xsd">
<SubType>Designer</SubType>
</None>
<None Include="$(MSBuildThisFileDirectory)ILLink.xsd" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions test/Mono.Linker.Tests.Cases/Attributes.Debugger/DebuggerAttributesRemoved.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<linker>
<linker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../src/ILLink.Shared/ILLink.LinkAttributes.xsd">
<assembly fullname="*">
<type fullname="System.Diagnostics.DebuggerTypeProxyAttribute">
<attribute internal="RemoveAttributeInstances"/>
Expand All @@ -8,4 +8,4 @@
<attribute internal="RemoveAttributeInstances"/>
</type>
</assembly>
</linker>
</linker>
4 changes: 2 additions & 2 deletions ...o.Linker.Tests.Cases/Attributes/OnlyKeepUsed/UnusedAttributePreservedViaLinkXmlIsKept.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<linker>
<linker>
<assembly fullname="test, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="Mono.Linker.Tests.Cases.Attributes.OnlyKeepUsed.UnusedAttributePreservedViaLinkXmlIsKept/FooAttribute" preserve="all">
</type>
</assembly>
</linker>
</linker>
6 changes: 3 additions & 3 deletions test/Mono.Linker.Tests.Cases/DataFlow/SuppressWarningWithLinkAttributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<linker>
<?xml version="1.0" encoding="utf-8" ?>
<linker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../src/ILLink.Shared/ILLink.LinkAttributes.xsd">
<assembly fullname="Test">
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>Test</argument>
Expand All @@ -16,4 +16,4 @@
</field>
</type>
</assembly>
</linker>
</linker>
132 changes: 66 additions & 66 deletions test/Mono.Linker.Tests.Cases/DataFlow/XmlAnnotations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
<?xml version="1.0" encoding="utf-8" ?>
<linker>
<assembly fullname="Test">
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2067</argument>
<property name="Scope">member</property>
<property name="Target">M:Mono.Linker.Tests.Cases.DataFlow.XmlAnnotations.ReadFromInstanceField</property>
</attribute>
<type fullname="Mono.Linker.Tests.Cases.DataFlow.XmlAnnotations">
<field name="_typeWithPublicParameterlessConstructor">
<attribute fullname="System.DoesNotExistAttribute" assembly="Mono.Linker.Tests.Cases.Expectations">
<argument>0</argument>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</field>
<method signature="System.Void TwoAnnotatedParameters(System.Type,System.Type)">
<parameter name="type">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</parameter>
<parameter name="type2">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicConstructors</argument>
</attribute>
</parameter>
</method>
<method signature="SpacesBetweenParametersWrongArgument (System.Type, System.Boolean)">
<parameter name="type">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">0</argument>
</attribute>
</parameter>
</method>
<method signature="GenericMethod&lt;T&gt;(T,System.Type)">
<parameter name="type">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</parameter>
</method>
<method name="ReturnConstructorsFailure">
<return>
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</return>
</method>
<property name="PropertyWithPublicParameterlessConstructor">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</property>
<type name="NestedType">
<field name="_typeWithPublicParameterlessConstructor">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</field>
</type>
</type>
</assembly>
</linker>
<?xml version="1.0" encoding="utf-8"?>
<linker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../src/ILLink.Shared/ILLink.LinkAttributes.xsd">
<assembly fullname="Test">
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2067</argument>
<property name="Scope">member</property>
<property name="Target">M:Mono.Linker.Tests.Cases.DataFlow.XmlAnnotations.ReadFromInstanceField</property>
</attribute>
<type fullname="Mono.Linker.Tests.Cases.DataFlow.XmlAnnotations">
<field name="_typeWithPublicParameterlessConstructor">
<attribute fullname="System.DoesNotExistAttribute" assembly="Mono.Linker.Tests.Cases.Expectations">
<argument>0</argument>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</field>
<method signature="System.Void TwoAnnotatedParameters(System.Type,System.Type)">
<parameter name="type">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</parameter>
<parameter name="type2">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicConstructors</argument>
</attribute>
</parameter>
</method>
<method signature="SpacesBetweenParametersWrongArgument (System.Type, System.Boolean)">
<parameter name="type">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">0</argument>
</attribute>
</parameter>
</method>
<method signature="GenericMethod&lt;T&gt;(T,System.Type)">
<parameter name="type">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</parameter>
</method>
<method name="ReturnConstructorsFailure">
<return>
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</return>
</method>
<property name="PropertyWithPublicParameterlessConstructor">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</property>
<type name="NestedType">
<field name="_typeWithPublicParameterlessConstructor">
<attribute fullname="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute">
<argument type="System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes">PublicParameterlessConstructor</argument>
</attribute>
</field>
</type>
</type>
</assembly>
</linker>
4 changes: 2 additions & 2 deletions ...ynamicDependencies/Dependencies/DynamicDependencyMethodInNonReferencedAssemblyLibrary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<linker>
<linker>
<assembly fullname="DynamicDependencyMethodInNonReferencedAssemblyLibrary, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="Mono.Linker.Tests.Cases.DynamicDependencies.Dependencies.DynamicDependencyMethodInNonReferencedAssemblyLibrary" preserve="all" />
</assembly>
</linker>
</linker>
4 changes: 2 additions & 2 deletions ...ker.Tests.Cases/DynamicDependencies/DynamicDependencyFromAttributeXml.mono.Attributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?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.DynamicDependencies.DynamicDependencyFromAttributeXml">
Expand All @@ -15,4 +15,4 @@
</method>
</type>
</assembly>
</linker>
</linker>
6 changes: 3 additions & 3 deletions ....Tests.Cases/DynamicDependencies/DynamicDependencyFromAttributeXml.netcore.Attributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<linker>
<?xml version="1.0" encoding="utf-8" ?>
<linker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../src/ILLink.Shared/ILLink.LinkAttributes.xsd">
<assembly fullname="test, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="Mono.Linker.Tests.Cases.DynamicDependencies.DynamicDependencyFromAttributeXml">
<method name="DependencyToUnusedMethod">
Expand All @@ -15,4 +15,4 @@
</method>
</type>
</assembly>
</linker>
</linker>
4 changes: 2 additions & 2 deletions ...Dependencies/DynamicDependencyFromAttributeXmlOnNonReferencedAssembly.mono.Attributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?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.DynamicDependencies.DynamicDependencyFromAttributeXmlOnNonReferencedAssembly">
Expand All @@ -18,4 +18,4 @@
</field>
</type>
</assembly>
</linker>
</linker>
6 changes: 3 additions & 3 deletions ...endencies/DynamicDependencyFromAttributeXmlOnNonReferencedAssembly.netcore.Attributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<linker>
<?xml version="1.0" encoding="utf-8" ?>
<linker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../src/ILLink.Shared/ILLink.LinkAttributes.xsd">
<assembly fullname="test, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="Mono.Linker.Tests.Cases.DynamicDependencies.DynamicDependencyFromAttributeXmlOnNonReferencedAssembly">
<method name="MethodWithDependencyInXml">
Expand All @@ -18,4 +18,4 @@
</field>
</type>
</assembly>
</linker>
</linker>
2 changes: 1 addition & 1 deletion test/Mono.Linker.Tests.Cases/FeatureSettings/FeatureDescriptors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
<field name="DefaultConditionFalse" />
</type>
</assembly>
</linker>
</linker>
2 changes: 1 addition & 1 deletion test/Mono.Linker.Tests.Cases/FeatureSettings/FeatureDescriptorsGlobalFalse.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<field name="GlobalConditionFalse" />
</type>
</assembly>
</linker>
</linker>
2 changes: 1 addition & 1 deletion test/Mono.Linker.Tests.Cases/FeatureSettings/FeatureDescriptorsGlobalTrue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<field name="GlobalConditionTrue" />
</type>
</assembly>
</linker>
</linker>
Loading