aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.BuildTasks/GetLooseFileList.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.BuildTasks/GetLooseFileList.cs')
-rw-r--r--src/WixToolset.BuildTasks/GetLooseFileList.cs9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/WixToolset.BuildTasks/GetLooseFileList.cs b/src/WixToolset.BuildTasks/GetLooseFileList.cs
index bd403426..d1eb62c1 100644
--- a/src/WixToolset.BuildTasks/GetLooseFileList.cs
+++ b/src/WixToolset.BuildTasks/GetLooseFileList.cs
@@ -3,16 +3,11 @@
3namespace WixToolset.BuildTasks 3namespace WixToolset.BuildTasks
4{ 4{
5 using System; 5 using System;
6 using System.Collections;
7 using System.Collections.Generic; 6 using System.Collections.Generic;
8 using System.Diagnostics;
9 using System.IO; 7 using System.IO;
10 using System.Reflection;
11 using System.Xml;
12 using Microsoft.Build.Framework; 8 using Microsoft.Build.Framework;
13 using Microsoft.Build.Utilities; 9 using Microsoft.Build.Utilities;
14 using WixToolset.Dtf.WindowsInstaller; 10 using WixToolset.Dtf.WindowsInstaller;
15 using Microsoft.Win32;
16 11
17 /// <summary> 12 /// <summary>
18 /// This task assigns Culture metadata to files based on the value of the Culture attribute on the 13 /// This task assigns Culture metadata to files based on the value of the Culture attribute on the
@@ -154,7 +149,7 @@ namespace WixToolset.BuildTasks
154 string directoryParent = (string)(directoryRecords[i + 1]); 149 string directoryParent = (string)(directoryRecords[i + 1]);
155 string defaultDir = (string)(directoryRecords[i + 2]); 150 string defaultDir = (string)(directoryRecords[i + 2]);
156 151
157 string sourceDir = SourceDirFromDefaultDir(defaultDir); 152 string sourceDir = this.SourceDirFromDefaultDir(defaultDir);
158 153
159 DirectoryIdDefaultDir[directoryId] = sourceDir; 154 DirectoryIdDefaultDir[directoryId] = sourceDir;
160 DirectoryIdParent[directoryId] = directoryParent; 155 DirectoryIdParent[directoryId] = directoryParent;
@@ -206,7 +201,7 @@ namespace WixToolset.BuildTasks
206 for (i = 0; i < fileRecords.Count; i += 3) 201 for (i = 0; i < fileRecords.Count; i += 3)
207 { 202 {
208 string componentId = (string)(fileRecords[i]); 203 string componentId = (string)(fileRecords[i]);
209 string fileName = SourceFileFromFileName((string)(fileRecords[i + 1])); 204 string fileName = this.SourceFileFromFileName((string)(fileRecords[i + 1]));
210 int attributes = (int)(fileRecords[i + 2]); 205 int attributes = (int)(fileRecords[i + 2]);
211 206
212 // If the whole database is marked uncompressed, use the directory layout made above 207 // If the whole database is marked uncompressed, use the directory layout made above