Fix and improve ILSpy.Installer project

- Fix build error with Debug build configuration
- Use only \wix as output directory
- Add solution filter file with included installer project
- Add package version to MSI file name

.gitignore

@@ -1,6 +1,5 @@
 bin/
 obj/
-packages/
 AppPackages/
 BundleArtifacts/
 /ICSharpCode.Decompiler/Properties/AssemblyInfo.cs
@@ -20,6 +19,5 @@ _ReSharper*/
 /ICSharpCode.Decompiler.Tests/TestCases/Correctness/*.exe.config
 /ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec
 multitargeting.props
-ILSpy.Installer/wix/*.g.wxs
+ILSpy.Installer/wix/
-ILSpy.Installer/output/
 ILSpy.Installer/AppPackage.cs

ILSpy.Installer.slnf

@@ -0,0 +1,18 @@
+{
+	"solution": {
+		"path": "ILSpy.sln",
+		"projects": [
+			"ICSharpCode.Decompiler.PdbProvider.Cecil\\ICSharpCode.Decompiler.PdbProvider.Cecil.csproj",
+			"ICSharpCode.Decompiler.Tests\\ICSharpCode.Decompiler.Tests.csproj",
+			"ICSharpCode.Decompiler\\ICSharpCode.Decompiler.csproj",
+			"ILSpy.BamlDecompiler.Tests\\ILSpy.BamlDecompiler.Tests.csproj",
+			"ILSpy.BamlDecompiler\\ILSpy.BamlDecompiler.csproj",
+			"ILSpy.ReadyToRun\\ILSpy.ReadyToRun.csproj",
+			"ILSpy.Tests\\ILSpy.Tests.csproj",
+			"ILSpy\\ILSpy.csproj",
+			"ILSpy.Installer\\ILSpy.Installer.csproj",
+			"SharpTreeView\\ICSharpCode.TreeView.csproj",
+			"TestPlugin\\TestPlugin.csproj"
+		]
+	}
+}

ILSpy.Installer/setup.cs

@@ -12,13 +12,20 @@ namespace ILSpy.Installer
 		{
 			Compiler.AutoGeneration.IgnoreWildCardEmptyDirectories = true;
 
+#if DEBUG
+			var buildConfiguration = "Debug";
+#else
+			var buildConfiguration = "Release;
+#endif
+			var buildOutputDir = $@"ILSpy\bin\{buildConfiguration}\net472";
+
 			var project = new Project("ILSpy",
 							  new InstallDir(@"%LocalAppData%\Programs\ILSpy",
-								  new DirFiles(@"ILSpy\bin\Release\net472\*.dll"),
+								  new DirFiles(Path.Combine(buildOutputDir, "*.dll")),
-								  new DirFiles(@"ILSpy\bin\Release\net472\*.exe"),
+								  new DirFiles(Path.Combine(buildOutputDir, "*.exe")),
-								  new DirFiles(@"ILSpy\bin\Release\net472\*.config"),
+								  new DirFiles(Path.Combine(buildOutputDir, "*.config")),
-								  new Files(@"ILSpy\bin\Release\net472\ILSpy.resources.dll"),
+								  new Files(Path.Combine(buildOutputDir, "ILSpy.resources.dll")),
-								  new Files(@"ILSpy\bin\Release\net472\ILSpy.ReadyToRun.Plugin.resources.dll")));
+								  new Files(Path.Combine(buildOutputDir, "ILSpy.ReadyToRun.Plugin.resources.dll"))));
 
 			project.GUID = new Guid("a12fdab1-731b-4a98-9749-d481ce8692ab");
 			project.Version = AppPackage.Version;
@@ -40,7 +47,7 @@ namespace ILSpy.Installer
 					new FileShortcut("ILSpy", @"%ProgramMenu%")
 				};
 
-			Compiler.BuildMsi(project, Path.Combine(Environment.CurrentDirectory, "output", "ILSpy.msi"));
+			Compiler.BuildMsi(project, Path.Combine(Environment.CurrentDirectory, "wix", $"ILSpy-{AppPackage.Version}.msi"));
 		}
 	}
 }