From 14fdc9113bdc7270fb33e06990081988eb099ba9 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 9 May 2019 08:43:08 -0700 Subject: Update to latest Core changes plus other minor fixes --- src/Directory.Build.props | 4 ++-- .../WixToolset.BuildTasks.csproj | 2 +- .../WixToolset.Tools.Core.csproj | 2 +- .../WixToolsetTest.BuildTasks/MsbuildFixture.cs | 21 +++++++-------------- .../WixToolsetTest.BuildTasks.csproj | 4 ++-- .../WixToolsetTest.BuildTasks.v3.ncrunchproject | 1 - .../WixToolsetTest.WixCop.csproj | 4 ++-- .../WixToolsetTest.WixCop.v3.ncrunchproject | 1 + src/thmviewer/thmviewer.cpp | 2 +- src/thmviewer/thmviewer.v3.ncrunchproject | 7 +++++++ src/thmviewer/thmviewer.vcxproj.filters | 4 +++- src/wix/wix.csproj | 2 +- src/wixcop/WixCop.csproj | 2 +- 13 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 src/thmviewer/thmviewer.v3.ncrunchproject (limited to 'src') diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 30ce4e48..a22f4470 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,7 +22,7 @@ WiX Toolset - - + + diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index 8713709e..c5b609c6 100644 --- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj @@ -43,7 +43,7 @@ - + diff --git a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj index 92111c61..0f67db73 100644 --- a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj +++ b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs index 74978322..9f761c32 100644 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs @@ -13,13 +13,6 @@ namespace WixToolsetTest.BuildTasks { private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(DoIt).Assembly.CodeBase).AbsolutePath), "wix.targets"); - public MsbuildFixture() - { - this.MsbuildRunner = new MsbuildRunner(); - } - - private MsbuildRunner MsbuildRunner { get; } - [Fact] public void CanBuildSimpleMsiPackage() { @@ -31,7 +24,7 @@ namespace WixToolsetTest.BuildTasks var binFolder = Path.Combine(baseFolder, @"bin\"); var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var result = this.MsbuildRunner.Execute(projectPath, new[] + var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", $"-p:IntermediateOutputPath={intermediateFolder}", @@ -69,7 +62,7 @@ namespace WixToolsetTest.BuildTasks var binFolder = Path.Combine(baseFolder, @"bin\"); var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var result = this.MsbuildRunner.Execute(projectPath, new[] + var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", $"-p:IntermediateOutputPath={intermediateFolder}", @@ -94,7 +87,7 @@ namespace WixToolsetTest.BuildTasks var binFolder = Path.Combine(baseFolder, @"bin\"); var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var result = this.MsbuildRunner.Execute(projectPath, new[] + var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", $"-p:IntermediateOutputPath={intermediateFolder}", @@ -116,7 +109,7 @@ namespace WixToolsetTest.BuildTasks var binFolder = Path.Combine(baseFolder, @"bin\"); var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var result = this.MsbuildRunner.Execute(projectPath, new[] + var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", $"-p:IntermediateOutputPath={intermediateFolder}", @@ -141,7 +134,7 @@ namespace WixToolsetTest.BuildTasks var binFolder = Path.Combine(baseFolder, @"bin\"); var intermediateFolder = Path.Combine(baseFolder, @"obj\"); - var result = this.MsbuildRunner.Execute(projectPath, new[] + var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", $"-p:IntermediateOutputPath={intermediateFolder}", @@ -169,7 +162,7 @@ namespace WixToolsetTest.BuildTasks var intermediateFolder = Path.Combine(baseFolder, @"obj\"); // Build - var result = this.MsbuildRunner.Execute(projectPath, new[] + var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", $"-p:IntermediateOutputPath={intermediateFolder}", @@ -187,7 +180,7 @@ namespace WixToolsetTest.BuildTasks Assert.NotEmpty(createdPaths); // Clean - result = this.MsbuildRunner.Execute(projectPath, new[] + result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", $"-p:IntermediateOutputPath={intermediateFolder}", diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj index edab8a67..c5498de4 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj +++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj @@ -27,7 +27,7 @@ - - + + diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject index 8f3624cb..cf22dfa9 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject +++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject @@ -1,6 +1,5 @@  - True \ No newline at end of file diff --git a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj index f399760f..45f8c57d 100644 --- a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj +++ b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj @@ -38,7 +38,7 @@ - - + + diff --git a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject index cf22dfa9..8f3624cb 100644 --- a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject +++ b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject @@ -1,5 +1,6 @@  + True \ No newline at end of file diff --git a/src/thmviewer/thmviewer.cpp b/src/thmviewer/thmviewer.cpp index 511272a9..425cdf43 100644 --- a/src/thmviewer/thmviewer.cpp +++ b/src/thmviewer/thmviewer.cpp @@ -98,7 +98,7 @@ int WINAPI wWinMain( ofn.hwndOwner = hWnd; ofn.lpstrFile = wzFile; ofn.nMaxFile = countof(wzFile); - ofn.lpstrFilter = L"Theme Files\0*.thm\0XML Files\0*.xml\0All Files\0*.*\0"; + ofn.lpstrFilter = L"Theme Files (*.thm)\0*.thm\0XML Files (*.xml)\0*.xml\0All Files (*.*)\0*.*\0"; ofn.nFilterIndex = 1; ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; ofn.lpstrTitle = vpTheme->sczCaption; diff --git a/src/thmviewer/thmviewer.v3.ncrunchproject b/src/thmviewer/thmviewer.v3.ncrunchproject new file mode 100644 index 00000000..3cffd6ce --- /dev/null +++ b/src/thmviewer/thmviewer.v3.ncrunchproject @@ -0,0 +1,7 @@ + + + + thmviewer.manifest + + + \ No newline at end of file diff --git a/src/thmviewer/thmviewer.vcxproj.filters b/src/thmviewer/thmviewer.vcxproj.filters index 79e08275..9a1eff3f 100644 --- a/src/thmviewer/thmviewer.vcxproj.filters +++ b/src/thmviewer/thmviewer.vcxproj.filters @@ -24,9 +24,11 @@ Source Files + + Source Files + - Resource Files diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj index 9cb5658f..398952af 100644 --- a/src/wix/wix.csproj +++ b/src/wix/wix.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/wixcop/WixCop.csproj b/src/wixcop/WixCop.csproj index be10524d..7a17caf1 100644 --- a/src/wixcop/WixCop.csproj +++ b/src/wixcop/WixCop.csproj @@ -25,7 +25,7 @@ - + -- cgit v1.2.3-55-g6feb