aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/NetFxCompiler.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext/NetFxCompiler.cs')
-rw-r--r--src/wixext/NetFxCompiler.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wixext/NetFxCompiler.cs b/src/wixext/NetFxCompiler.cs
index 4916994e..58c8c0f6 100644
--- a/src/wixext/NetFxCompiler.cs
+++ b/src/wixext/NetFxCompiler.cs
@@ -53,14 +53,14 @@ namespace WixToolset.Netfx
53 /// <param name="fileId">The file identifier of the parent element.</param> 53 /// <param name="fileId">The file identifier of the parent element.</param>
54 private void ParseNativeImageElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileId) 54 private void ParseNativeImageElement(Intermediate intermediate, IntermediateSection section, XElement element, string fileId)
55 { 55 {
56 SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); 56 var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
57 Identifier id = null; 57 Identifier id = null;
58 string appBaseDirectory = null; 58 string appBaseDirectory = null;
59 string assemblyApplication = null; 59 string assemblyApplication = null;
60 int attributes = 0x8; // 32bit is on by default 60 int attributes = 0x8; // 32bit is on by default
61 int priority = 3; 61 int priority = 3;
62 62
63 foreach (XAttribute attrib in element.Attributes()) 63 foreach (var attrib in element.Attributes())
64 { 64 {
65 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) 65 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
66 { 66 {
@@ -75,7 +75,7 @@ namespace WixToolset.Netfx
75 // See if a formatted value is specified. 75 // See if a formatted value is specified.
76 if (-1 == appBaseDirectory.IndexOf("[", StringComparison.Ordinal)) 76 if (-1 == appBaseDirectory.IndexOf("[", StringComparison.Ordinal))
77 { 77 {
78 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "Directory", appBaseDirectory); 78 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, appBaseDirectory);
79 } 79 }
80 break; 80 break;
81 case "AssemblyApplication": 81 case "AssemblyApplication":
@@ -84,7 +84,7 @@ namespace WixToolset.Netfx
84 // See if a formatted value is specified. 84 // See if a formatted value is specified.
85 if (-1 == assemblyApplication.IndexOf("[", StringComparison.Ordinal)) 85 if (-1 == assemblyApplication.IndexOf("[", StringComparison.Ordinal))
86 { 86 {
87 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "File", assemblyApplication); 87 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, assemblyApplication);
88 } 88 }
89 break; 89 break;
90 case "Debug": 90 case "Debug":
@@ -140,7 +140,7 @@ namespace WixToolset.Netfx
140 140
141 if (null == id) 141 if (null == id)
142 { 142 {
143 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id")); 143 id = this.ParseHelper.CreateIdentifier("nni", fileId);
144 } 144 }
145 145
146 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 146 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
@@ -149,7 +149,7 @@ namespace WixToolset.Netfx
149 149
150 if (!this.Messaging.EncounteredError) 150 if (!this.Messaging.EncounteredError)
151 { 151 {
152 section.Tuples.Add(new NetFxNativeImageTuple(sourceLineNumbers, id) 152 section.AddTuple(new NetFxNativeImageTuple(sourceLineNumbers, id)
153 { 153 {
154 FileRef = fileId, 154 FileRef = fileId,
155 Priority = priority, 155 Priority = priority,