Browse Source

Fixed SD2-1267 - Cannot design a WiX dialog that is not in a project.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2294 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 19 years ago
parent
commit
e18a648417
  1. 8
      src/AddIns/BackendBindings/WixBinding/Project/Src/WixBinaries.cs
  2. 13
      src/AddIns/BackendBindings/WixBinding/Test/Document/GetBinaryFileNameFromProjectTestFixture.cs

8
src/AddIns/BackendBindings/WixBinding/Project/Src/WixBinaries.cs

@ -82,9 +82,11 @@ namespace ICSharpCode.WixBinding
List<string> GetWixFileNamesInProject(WixDocument document) List<string> GetWixFileNamesInProject(WixDocument document)
{ {
List<string> fileNames = new List<string>(); List<string> fileNames = new List<string>();
foreach (FileProjectItem fileProjectItem in project.WixFiles) { if (project != null) {
if (!FileUtility.IsEqualFileName(fileProjectItem.FileName, document.FileName)) { foreach (FileProjectItem fileProjectItem in project.WixFiles) {
fileNames.Add(fileProjectItem.FileName); if (!FileUtility.IsEqualFileName(fileProjectItem.FileName, document.FileName)) {
fileNames.Add(fileProjectItem.FileName);
}
} }
} }
return fileNames; return fileNames;

13
src/AddIns/BackendBindings/WixBinding/Test/Document/GetBinaryFileNameFromProjectTestFixture.cs

@ -71,6 +71,19 @@ namespace WixBinding.Tests.Document
Assert.AreEqual(expectedFileName, binaries.GetBinaryFileName("Dialog")); Assert.AreEqual(expectedFileName, binaries.GetBinaryFileName("Dialog"));
} }
/// <summary>
/// SD2-1267 - If you open a single WiX file (.wxs) without opening
/// a WiX project you are unable to design its WiX dialog.
/// </summary>
[Test]
public void GetBinaryFileNameWhenWixDocNotInProject()
{
WixDocument doc = new WixDocument();
WixBinaries binaries = new WixBinaries(doc, this);
Assert.IsNull(binaries.GetBinaryFileName("UnknownId"));
}
public TextReader Create(string fileName) public TextReader Create(string fileName)
{ {
fileName = Path.GetFileName(fileName); fileName = Path.GetFileName(fileName);

Loading…
Cancel
Save