aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBevan Weiss <bevanweiss@users.noreply.github.com>2025-03-28 12:37:05 +1100
committerGitHub <noreply@github.com>2025-03-27 18:37:05 -0700
commitb20af76706dc8f7e2ac7342636fd09428b307fe4 (patch)
tree1e5e4ae1c60050a580156666876811ed4b901a0f
parent663d2556f29a094276e18a3d6c59dba257914f41 (diff)
downloadwix-b20af76706dc8f7e2ac7342636fd09428b307fe4.tar.gz
wix-b20af76706dc8f7e2ac7342636fd09428b307fe4.tar.bz2
wix-b20af76706dc8f7e2ac7342636fd09428b307fe4.zip
Iis certstore more xsd
Adds XSD for #597 And slight fix up for error message to capture new options --------- Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
-rw-r--r--src/ext/Iis/wixext/IIsCompiler.cs2
-rw-r--r--src/xsd/iis.xsd11
2 files changed, 12 insertions, 1 deletions
diff --git a/src/ext/Iis/wixext/IIsCompiler.cs b/src/ext/Iis/wixext/IIsCompiler.cs
index 5e3c0a95..53160dcd 100644
--- a/src/ext/Iis/wixext/IIsCompiler.cs
+++ b/src/ext/Iis/wixext/IIsCompiler.cs
@@ -219,7 +219,7 @@ namespace WixToolset.Iis
219 break; 219 break;
220 default: 220 default:
221 storeLocation = -1; 221 storeLocation = -1;
222 this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "StoreLocation", storeLocationValue, "currentUser", "localMachine")); 222 this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "StoreLocation", storeLocationValue, "currentUser", "localMachine", "services", "users", "userPolicy", "localMachinePolicy", "localMachineEnterprise"));
223 break; 223 break;
224 } 224 }
225 } 225 }
diff --git a/src/xsd/iis.xsd b/src/xsd/iis.xsd
index b43bff42..4bc59cf2 100644
--- a/src/xsd/iis.xsd
+++ b/src/xsd/iis.xsd
@@ -685,10 +685,21 @@
685 </xs:simpleType> 685 </xs:simpleType>
686 </xs:attribute> 686 </xs:attribute>
687 <xs:attribute name="StoreLocation" use="required"> 687 <xs:attribute name="StoreLocation" use="required">
688 <xs:annotation>
689 <xs:documentation>
690 This attribute controls which Certificate Store Location will be used for the Certificate.
691 See <a href="https://learn.microsoft.com/en-us/windows/win32/seccrypto/system-store-locations" target="_blank">MSDN documentation</a> for more information.
692 </xs:documentation>
693 </xs:annotation>
688 <xs:simpleType> 694 <xs:simpleType>
689 <xs:restriction base="xs:string"> 695 <xs:restriction base="xs:string">
690 <xs:enumeration value="currentUser"/> 696 <xs:enumeration value="currentUser"/>
691 <xs:enumeration value="localMachine"/> 697 <xs:enumeration value="localMachine"/>
698 <xs:enumeration value="services"/>
699 <xs:enumeration value="users"/>
700 <xs:enumeration value="userPolicy"/>
701 <xs:enumeration value="localMachinePolicy"/>
702 <xs:enumeration value="localMachineEnterprise"/>
692 </xs:restriction> 703 </xs:restriction>
693 </xs:simpleType> 704 </xs:simpleType>
694 </xs:attribute> 705 </xs:attribute>