From 929f43b2d48f9d35803064774e357c7a2cf76713 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 22 May 2020 20:09:02 +1000 Subject: Add heat.exe --- Tools.sln | 14 ++++- appveyor.cmd | 3 ++ src/heat/Program.cs | 74 +++++++++++++++++++++++++++ src/heat/heat.csproj | 34 ++++++++++++ src/heat/heat.net461.v3.ncrunchproject | 5 ++ src/heat/heat.netcoreapp2.1.v3.ncrunchproject | 5 ++ 6 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 src/heat/Program.cs create mode 100644 src/heat/heat.csproj create mode 100644 src/heat/heat.net461.v3.ncrunchproject create mode 100644 src/heat/heat.netcoreapp2.1.v3.ncrunchproject diff --git a/Tools.sln b/Tools.sln index 45deb3c5..5a108710 100644 --- a/Tools.sln +++ b/Tools.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30011.22 MinimumVisualStudioVersion = 15.0.26124.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BuildTasks", "src\test\WixToolsetTest.BuildTasks\WixToolsetTest.BuildTasks.csproj", "{4B0098A4-B581-4D04-BA1E-6DC2370A7D43}" EndProject @@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.WixCop", "sr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thmviewer", "src\thmviewer\thmviewer.vcxproj", "{95228C13-97F5-484A-B4A2-ECF4618B0881}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "heat", "src\heat\heat.csproj", "{B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -104,6 +106,14 @@ Global {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|Any CPU.ActiveCfg = Release|Win32 {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|x86.ActiveCfg = Release|Win32 {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|x86.Build.0 = Release|Win32 + {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Debug|x86.ActiveCfg = Debug|Any CPU + {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Debug|x86.Build.0 = Debug|Any CPU + {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|Any CPU.Build.0 = Release|Any CPU + {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|x86.ActiveCfg = Release|Any CPU + {B1F18B6F-FBD8-4911-B3BF-40D801DA77D7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/appveyor.cmd b/appveyor.cmd index d0dcee83..0071045f 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -8,6 +8,9 @@ dotnet test -c Release src\test\WixToolsetTest.BuildTasks dotnet test -c Release src\test\WixToolsetTest.WixCop dotnet publish -c Release -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix +@rem dotnet publish -c Release -o %_P%\netfx-heat\ -f net461 src\heat +@rem dotnet publish -c Release -o %_P%\netfx-wix\ -f net461 src\wix +@rem dotnet publish -c Release -o %_P%\netfx-wixcop\ -f net461 src\wixcop dotnet publish -c Release -o %_P%\WixToolset.MSBuild\net461\ -f net461 src\WixToolset.BuildTasks dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netcoreapp2.1\ -f netcoreapp2.1 src\WixToolset.BuildTasks diff --git a/src/heat/Program.cs b/src/heat/Program.cs new file mode 100644 index 00000000..38d6d401 --- /dev/null +++ b/src/heat/Program.cs @@ -0,0 +1,74 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. + +namespace WixToolset.Tools.Heat +{ + using System; + using System.Runtime.InteropServices; + using WixToolset.Core; + using WixToolset.Data; + using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; + using WixToolset.Extensibility.Services; + using WixToolset.Harvesters; + using WixToolset.Tools.Core; + + /// + /// Wix Toolset Harvester. + /// + public sealed class Program + { + /// + /// The main entry point for the application. + /// + /// Commandline arguments for the application. + /// Returns the application error code. + [MTAThread] + public static int Main(string[] args) + { + var serviceProvider = WixToolsetServiceProviderFactory.CreateServiceProvider(); + var listener = new ConsoleMessageListener("HEAT", "heat.exe"); + + try + { + var program = new Program(); + return program.Run(serviceProvider, listener, args); + } + catch (WixException e) + { + listener.Write(e.Error); + + return e.Error.Id; + } + catch (Exception e) + { + listener.Write(ErrorMessages.UnexpectedException(e)); + + if (e is NullReferenceException || e is SEHException) + { + throw; + } + + return e.HResult; + } + } + + /// + /// Run the application with the given arguments. + /// + /// Service provider to use throughout this execution. + /// The commandline arguments. + /// Returns the application error code. + public int Run(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string[] args) + { + var messaging = serviceProvider.GetService(); + messaging.SetListener(listener); + + var arguments = serviceProvider.GetService(); + arguments.Populate(args); + + var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider); + var command = commandLine.ParseStandardCommandLine(arguments); + return command?.Execute() ?? 1; + } + } +} diff --git a/src/heat/heat.csproj b/src/heat/heat.csproj new file mode 100644 index 00000000..fd56c6c8 --- /dev/null +++ b/src/heat/heat.csproj @@ -0,0 +1,34 @@ + + + + + + netcoreapp2.1;net461;net472 + Exe + Harvester + WiX Harvester + embedded + true + + win-x86 + AnyCPU + + + + NU1701 + + + + + + + + + + + + + + + + diff --git a/src/heat/heat.net461.v3.ncrunchproject b/src/heat/heat.net461.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/heat/heat.net461.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/heat/heat.netcoreapp2.1.v3.ncrunchproject b/src/heat/heat.netcoreapp2.1.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/heat/heat.netcoreapp2.1.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb