Skip to content

Commit

Permalink
Added schema for missing ordinalvalue and solutionaction attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@TomProkop
TomProkop committed Mar 10, 2024
1 parent 677b52e commit 711de41
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 29 deletions.
38 changes: 17 additions & 21 deletions src/Dataverse/MSBuildTasks/ValidationSchema/Form.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,9 @@
<xs:attribute name="datafieldname" type="xs:string" />
<xs:attribute name="classid" type="FormGuidType" />
<xs:attribute name="relationship" type="xs:string" />

</xs:complexType>
</xs:element>
</xs:sequence>

</xs:complexType>
</xs:element>
<xs:element name="controlDescriptions" minOccurs="0" maxOccurs="1">
Expand All @@ -79,16 +77,14 @@
<xs:attribute name="formFactor" type="xs:integer" use="optional" />
<xs:attribute name="name" type="xs:string" use="optional" />
<xs:attribute name="version" type="xs:string" use="optional" />

</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="forControl" type="xs:string" use="required" />

<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>

</xs:complexType>
</xs:element>
<xs:element name="tabs" minOccurs="1" maxOccurs="1">
Expand Down Expand Up @@ -162,13 +158,14 @@
</xs:element>
</xs:sequence>
<xs:attribute name="addedby" type="xs:string" />

<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute name="width" type="FormPercentageType" use="required" />


<!-- not sure if this is supported by the platform -->
<xs:attribute name="id" type="xs:string" />
<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand All @@ -190,8 +187,8 @@
<xs:attribute name="visible" type="xs:boolean" />
<xs:attribute name="availableforphone" type="xs:boolean" />
<xs:attribute name="collapsible" type="xs:boolean" />


<xs:attribute name="ordinalvalue" type="xs:nonNegativeInteger" />
<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -673,7 +670,7 @@
<xs:element name="TimeFrame" type="xs:string" minOccurs="0" maxOccurs="1" />
</xs:choice>
</xs:choice>

<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand All @@ -688,19 +685,17 @@
<xs:attribute name="isrequired" type="xs:boolean" />
<xs:attribute name="relationship" type="xs:string" />
<xs:attribute name="indicationOfSubgrid" type="xs:boolean" />

</xs:complexType>
<xs:complexType name="FormXmlLibraryType">
<xs:sequence>
<xs:element name="Library" minOccurs="1" maxOccurs="50">
<xs:complexType>
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="libraryUniqueId" type="xs:string" use="required" />

</xs:complexType>
</xs:element>
</xs:sequence>

<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
<xs:complexType name="FormXmlHandlerType">
<xs:sequence>
Expand All @@ -724,7 +719,8 @@
<xs:attribute name="enabled" type="xs:boolean" />
<xs:attribute name="passExecutionContext" type="xs:boolean" />
<xs:attribute name="parameters" type="xs:string" />

<xs:attribute name="ordinalvalue" type="xs:nonNegativeInteger" />
<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
<xs:complexType name="FormXmlEventsType">
<xs:sequence>
Expand All @@ -736,7 +732,6 @@
<xs:sequence>
<xs:element name="Handler" type="FormXmlHandlerType" minOccurs="0" maxOccurs="50" />
</xs:sequence>

</xs:complexType>
</xs:element>
<xs:element name="InternalHandlers" minOccurs="0" maxOccurs="1">
Expand Down Expand Up @@ -769,7 +764,7 @@
<xs:attribute name="attribute" type="xs:string" />
<xs:attribute name="control" type="xs:string" />
<xs:attribute name="relationship" type="xs:string" />

<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand All @@ -793,7 +788,7 @@
<xs:attribute name="description" use="required" type="xs:string" />
<xs:attribute name="languagecode" use="required" type="xs:positiveInteger" />
<xs:attribute name="addedby" type="xs:string" />

<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -849,7 +844,8 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>

<xs:attribute name="ordinalvalue" type="xs:nonNegativeInteger" />
<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:attributeGroup>
<xs:attributeGroup name="FormXmlRowCommon">
<xs:attribute name="height" type="xs:string" />
Expand All @@ -860,6 +856,8 @@
<xs:attribute name="showlabel" type="xs:boolean" />
<xs:attribute name="labelid" type="FormGuidType" use="optional" />
<xs:attribute name="locklevel" type="xs:nonNegativeInteger" />
<xs:attribute name="ordinalvalue" type="xs:nonNegativeInteger" />
<xs:attribute name="solutionaction" type="solutionactionType" />
<xs:attribute name="rowspan" type="xs:nonNegativeInteger" />
<xs:attribute name="colspan" type="xs:nonNegativeInteger" />
<xs:attribute name="userspacer" type="xs:boolean" />
Expand All @@ -869,8 +867,6 @@
<xs:attribute name="isstreamcell" type="xs:boolean" />
<xs:attribute name="ischartcell" type="xs:boolean" />
<xs:attribute name="istilecell" type="xs:boolean" />


</xs:attributeGroup>
<xs:simpleType name="BehaviorInBulkEditForm">
<xs:restriction base="xs:string">
Expand Down
16 changes: 8 additions & 8 deletions src/Dataverse/MSBuildTasks/ValidationSchema/Sitemap.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
<xs:documentation>Text to be displayed.</xs:documentation>
</xs:annotation>
</xs:attribute>

<xs:attribute name="ordinalvalue" type="xs:nonNegativeInteger" />
<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -154,7 +155,6 @@
<xs:documentation>Specifies the privileges needed on the entity to display this subarea. </xs:documentation>
</xs:annotation>
</xs:attribute>

</xs:complexType>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -302,8 +302,8 @@
<xs:documentation>Specifies the path to the Get Started page for this subarea if the user is logged in as an administrator and Microsoft Dynamics 365 for Outlook is in use.</xs:documentation>
</xs:annotation>
</xs:attribute>


<xs:attribute name="ordinalvalue" type="xs:nonNegativeInteger" />
<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -387,8 +387,8 @@
<xs:documentation>For internal use only. Use the Group/Descriptions/Description element instead.</xs:documentation>
</xs:annotation>
</xs:attribute>


<xs:attribute name="ordinalvalue" type="xs:nonNegativeInteger" />
<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -470,8 +470,8 @@
<xs:documentation>For internal use only. Use the Area/Descriptions/Description element instead.</xs:documentation>
</xs:annotation>
</xs:attribute>


<xs:attribute name="ordinalvalue" type="xs:nonNegativeInteger" />
<xs:attribute name="solutionaction" type="solutionactionType" />
</xs:complexType>
<xs:unique name="GroupIdMustBeUnique">
<xs:selector xpath="Group" />
Expand Down

0 comments on commit 711de41

Please sign in to comment.