Changed the WiX project to use the OutputName MSBuild property as the .msi filename and not the project name to match how the WiX MSBuild tasks work.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1679 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/WixBinding/Project/Src/Project/WixProject.cs

@@ -97,7 +97,8 @@ namespace ICSharpCode.WixBinding
 			get {
 				string outputPath = GetProperty("OutputPath");
 				string outputType = GetProperty("OutputType");
-				string fileName = String.Concat(Name, GetInstallerExtension(outputType));
+				string outputName = GetProperty("OutputName");
+				string fileName = String.Concat(outputName, GetInstallerExtension(outputType));
 				return Path.Combine(Path.Combine(Directory, outputPath), fileName);
 			}
 		}

src/AddIns/BackendBindings/WixBinding/Test/Project/WixInstallerPathTests.cs

@@ -29,5 +29,17 @@ namespace WixBinding.Tests.Project
 			
 			Assert.AreEqual(@"C:\Projects\Test\bin\Debug\Test.msi", project.InstallerFullPath);
 		}
+		
+		[Test]
+		public void OutputNameDifferentToProjectName()
+		{
+			ProjectCreateInformation info = new ProjectCreateInformation();
+			info.ProjectName = "Test";
+			info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj";
+			WixProject project = new WixProject(info);
+			project.BaseConfiguration["OutputName"] = "ChangedName";
+			
+			Assert.AreEqual(@"C:\Projects\Test\bin\Debug\ChangedName.msi", project.InstallerFullPath);
+		}
 	}
 }

src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj

@@ -57,7 +57,6 @@
     <Compile Include="Utils\WixBindingTestsHelper.cs" />
     <Compile Include="Utils\MockViewContent.cs" />
     <Compile Include="Utils\MockTextEditorViewContent.cs" />
-    <Compile Include="Project\WixInstallerPathTestFixture.cs" />
     <Compile Include="Project\WixNodeBuilderCanBuildWixProjectTestFixture.cs" />
     <Compile Include="Utils\WixLibraryFolderNodeTester.cs" />
     <Compile Include="Gui\WixProjectWithLibraryItemsTestFixture.cs" />
@@ -143,6 +142,7 @@
     <Compile Include="DialogXmlGeneration\ListViewItemRemovedTestFixture.cs" />
     <Compile Include="DialogXmlGeneration\ListViewAddedTestFixture.cs" />
     <Compile Include="Document\GetValueWithNoProjectTestFixture.cs" />
+    <Compile Include="Project\WixInstallerPathTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Project\WixBinding.csproj">

src/AddIns/BackendBindings/WixBinding/WixBinding.sln

@@ -16,6 +16,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "..\..\..\Libr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -66,5 +68,9 @@ Global
 		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 EndGlobal