aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
index 030bc4cc..a9eb2a8f 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
@@ -57,27 +57,27 @@ namespace WixToolset.Core.WindowsInstaller.Bind
57 FileInfo fileInfo = null; 57 FileInfo fileInfo = null;
58 try 58 try
59 { 59 {
60 fileInfo = new FileInfo(file.WixFile.Source); 60 fileInfo = new FileInfo(file.WixFile.Source.Path);
61 } 61 }
62 catch (ArgumentException) 62 catch (ArgumentException)
63 { 63 {
64 Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source)); 64 Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source.Path));
65 return; 65 return;
66 } 66 }
67 catch (PathTooLongException) 67 catch (PathTooLongException)
68 { 68 {
69 Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source)); 69 Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source.Path));
70 return; 70 return;
71 } 71 }
72 catch (NotSupportedException) 72 catch (NotSupportedException)
73 { 73 {
74 Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source)); 74 Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source.Path));
75 return; 75 return;
76 } 76 }
77 77
78 if (!fileInfo.Exists) 78 if (!fileInfo.Exists)
79 { 79 {
80 Messaging.Instance.OnMessage(WixErrors.CannotFindFile(file.File.SourceLineNumbers, file.File.File, file.File.LongFileName, file.WixFile.Source)); 80 Messaging.Instance.OnMessage(WixErrors.CannotFindFile(file.File.SourceLineNumbers, file.File.File, file.File.LongFileName, file.WixFile.Source.Path));
81 return; 81 return;
82 } 82 }
83 83
@@ -85,7 +85,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
85 { 85 {
86 if (Int32.MaxValue < fileStream.Length) 86 if (Int32.MaxValue < fileStream.Length)
87 { 87 {
88 throw new WixException(WixErrors.FileTooLarge(file.File.SourceLineNumbers, file.WixFile.Source)); 88 throw new WixException(WixErrors.FileTooLarge(file.File.SourceLineNumbers, file.WixFile.Source.Path));
89 } 89 }
90 90
91 file.File.FileSize = Convert.ToInt32(fileStream.Length, CultureInfo.InvariantCulture); 91 file.File.FileSize = Convert.ToInt32(fileStream.Length, CultureInfo.InvariantCulture);
@@ -372,7 +372,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
372 // Navigator is cheaper than dom. Perhaps there is a cheaper API still. 372 // Navigator is cheaper than dom. Perhaps there is a cheaper API still.
373 try 373 try
374 { 374 {
375 XPathDocument doc = new XPathDocument(fileManifest.WixFile.Source); 375 XPathDocument doc = new XPathDocument(fileManifest.WixFile.Source.Path);
376 XPathNavigator nav = doc.CreateNavigator(); 376 XPathNavigator nav = doc.CreateNavigator();
377 nav.MoveToRoot(); 377 nav.MoveToRoot();
378 378
@@ -396,7 +396,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
396 } 396 }
397 if (!hasNextSibling) 397 if (!hasNextSibling)
398 { 398 {
399 Messaging.Instance.OnMessage(WixErrors.InvalidManifestContent(file.File.SourceLineNumbers, fileManifest.WixFile.Source)); 399 Messaging.Instance.OnMessage(WixErrors.InvalidManifestContent(file.File.SourceLineNumbers, fileManifest.WixFile.Source.Path));
400 return; 400 return;
401 } 401 }
402 402
@@ -434,11 +434,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
434 } 434 }
435 catch (FileNotFoundException fe) 435 catch (FileNotFoundException fe)
436 { 436 {
437 Messaging.Instance.OnMessage(WixErrors.FileNotFound(new SourceLineNumber(fileManifest.WixFile.Source), fe.FileName, "AssemblyManifest")); 437 Messaging.Instance.OnMessage(WixErrors.FileNotFound(new SourceLineNumber(fileManifest.WixFile.Source.Path), fe.FileName, "AssemblyManifest"));
438 } 438 }
439 catch (XmlException xe) 439 catch (XmlException xe)
440 { 440 {
441 Messaging.Instance.OnMessage(WixErrors.InvalidXml(new SourceLineNumber(fileManifest.WixFile.Source), "manifest", xe.Message)); 441 Messaging.Instance.OnMessage(WixErrors.InvalidXml(new SourceLineNumber(fileManifest.WixFile.Source.Path), "manifest", xe.Message));
442 } 442 }
443 443
444 if (!String.IsNullOrEmpty(win32Name)) 444 if (!String.IsNullOrEmpty(win32Name))