aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/IIsCompiler.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext/IIsCompiler.cs')
-rw-r--r--src/wixext/IIsCompiler.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/wixext/IIsCompiler.cs b/src/wixext/IIsCompiler.cs
index a221e78a..c7957f9d 100644
--- a/src/wixext/IIsCompiler.cs
+++ b/src/wixext/IIsCompiler.cs
@@ -141,7 +141,7 @@ namespace WixToolset.Iis
141 var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); 141 var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
142 Identifier id = null; 142 Identifier id = null;
143 int attributes = 0; 143 int attributes = 0;
144 string binaryKey = null; 144 string binaryRef = null;
145 string certificatePath = null; 145 string certificatePath = null;
146 string name = null; 146 string name = null;
147 string pfxPassword = null; 147 string pfxPassword = null;
@@ -157,10 +157,10 @@ namespace WixToolset.Iis
157 case "Id": 157 case "Id":
158 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); 158 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
159 break; 159 break;
160 case "BinaryKey": 160 case "BinaryRef":
161 attributes |= 2; // SCA_CERT_ATTRIBUTE_BINARYDATA 161 attributes |= 2; // SCA_CERT_ATTRIBUTE_BINARYDATA
162 binaryKey = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); 162 binaryRef = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
163 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryKey); 163 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryRef);
164 break; 164 break;
165 case "CertificatePath": 165 case "CertificatePath":
166 certificatePath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); 166 certificatePath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -258,7 +258,7 @@ namespace WixToolset.Iis
258 258
259 if (null == id) 259 if (null == id)
260 { 260 {
261 id = this.ParseHelper.CreateIdentifier("crt", componentId, binaryKey, certificatePath); 261 id = this.ParseHelper.CreateIdentifier("crt", componentId, binaryRef, certificatePath);
262 } 262 }
263 263
264 if (null == name) 264 if (null == name)
@@ -276,13 +276,13 @@ namespace WixToolset.Iis
276 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "StoreName")); 276 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "StoreName"));
277 } 277 }
278 278
279 if (null != binaryKey && null != certificatePath) 279 if (null != binaryRef && null != certificatePath)
280 { 280 {
281 this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryKey", "CertificatePath", certificatePath)); 281 this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "BinaryRef", "CertificatePath", certificatePath));
282 } 282 }
283 else if (null == binaryKey && null == certificatePath) 283 else if (null == binaryRef && null == certificatePath)
284 { 284 {
285 this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "BinaryKey", "CertificatePath")); 285 this.Messaging.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, element.Name.LocalName, "BinaryRef", "CertificatePath"));
286 } 286 }
287 287
288 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 288 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
@@ -301,7 +301,7 @@ namespace WixToolset.Iis
301 StoreLocation = storeLocation, 301 StoreLocation = storeLocation,
302 StoreName = storeName, 302 StoreName = storeName,
303 Attributes = attributes, 303 Attributes = attributes,
304 BinaryRef = binaryKey, 304 BinaryRef = binaryRef,
305 CertificatePath = certificatePath, 305 CertificatePath = certificatePath,
306 PFXPassword = pfxPassword, 306 PFXPassword = pfxPassword,
307 }); 307 });