Merge branch 'master' into fix_markdown_part_2

wixtoolset · Oct 12, 2023 · 7cd8328 · 7cd8328
2 parents f50288a + 9cd099e
commit 7cd8328
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/Docusaurus/package-lock.json b/src/Docusaurus/package-lock.json
diff --git a/src/xsd4/netfx.xsd b/src/xsd4/netfx.xsd
@@ -531,7 +531,7 @@
           <xs:documentation>
             Name of the property in which to place the result of the compatibility check. The possible values are:
               - 0 - Successful compatibility check.
-              - 13 - Requested platform is not compatible with OS.
+              - 13 - Requested platform is not compatible with OS. _Introduced in WiX v5.0._
               - 12289 - No runtime is installed.
               - 12290 - Required runtime is not installed.
               - 12291 - Failed to get hostfxr exports.

diff --git a/src/xsd4/wix.xsd b/src/xsd4/wix.xsd
@@ -4821,7 +4821,10 @@
       </xs:attribute>
       <xs:attribute name="Admin" type="YesNoTypeUnion">
         <xs:annotation>
-          <xs:documentation>Denotes that the Property is saved during <html:a href="https://learn.microsoft.com/en-us/windows/win32/msi/administrative-installation">AdminProperties Property</html:a> for more information.</xs:documentation>
+          <xs:documentation>
+            Denotes that the property is saved during [administrative installations](https://learn.microsoft.com/en-us/windows/win32/msi/administrative-installation).
+            Adds the property name to the [AdminProperties property](https://learn.microsoft.com/en-us/windows/win32/msi/adminproperties).
+          </xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="Secure" type="YesNoTypeUnion">