aboutsummaryrefslogtreecommitdiff
path: root/src/tools/heat
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/heat')
-rw-r--r--src/tools/heat/Data/HarvesterWarnings.cs7
-rw-r--r--src/tools/heat/HeatCommand.cs1
-rw-r--r--src/tools/heat/Program.cs4
3 files changed, 10 insertions, 2 deletions
diff --git a/src/tools/heat/Data/HarvesterWarnings.cs b/src/tools/heat/Data/HarvesterWarnings.cs
index 80ee5c31..1bbd5bed 100644
--- a/src/tools/heat/Data/HarvesterWarnings.cs
+++ b/src/tools/heat/Data/HarvesterWarnings.cs
@@ -2,13 +2,17 @@
2 2
3namespace WixToolset.Harvesters.Data 3namespace WixToolset.Harvesters.Data
4{ 4{
5 using System;
6 using System.Resources; 5 using System.Resources;
7 using WixToolset.Data; 6 using WixToolset.Data;
8 7
9#pragma warning disable 1591 // TODO: add documentation 8#pragma warning disable 1591 // TODO: add documentation
10 public static class HarvesterWarnings 9 public static class HarvesterWarnings
11 { 10 {
11 public static Message HeatIsDeprecated()
12 {
13 return Message(null, Ids.HeatIsDeprecated, "Heat is deprecated and will be removed in WiX v7. Consider alternative solutions, like the Files element.");
14 }
15
12 public static Message AssemblyHarvestFailed(string file, string message) 16 public static Message AssemblyHarvestFailed(string file, string message)
13 { 17 {
14 return Message(null, Ids.AssemblyHarvestFailed, "Could not harvest data from a file that was expected to be an assembly: {0}. If this file is not an assembly you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the failure: {1}", file, message); 18 return Message(null, Ids.AssemblyHarvestFailed, "Could not harvest data from a file that was expected to be an assembly: {0}. If this file is not an assembly you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the failure: {1}", file, message);
@@ -66,6 +70,7 @@ namespace WixToolset.Harvesters.Data
66 70
67 public enum Ids 71 public enum Ids
68 { 72 {
73 HeatIsDeprecated = 5149,
69 SelfRegHarvestFailed = 5150, 74 SelfRegHarvestFailed = 5150,
70 AssemblyHarvestFailed = 5151, 75 AssemblyHarvestFailed = 5151,
71 TypeLibLoadFailed = 5152, 76 TypeLibLoadFailed = 5152,
diff --git a/src/tools/heat/HeatCommand.cs b/src/tools/heat/HeatCommand.cs
index 34198011..c8703ec1 100644
--- a/src/tools/heat/HeatCommand.cs
+++ b/src/tools/heat/HeatCommand.cs
@@ -15,7 +15,6 @@ namespace WixToolset.Harvesters
15 using WixToolset.Extensibility.Data; 15 using WixToolset.Extensibility.Data;
16 using WixToolset.Extensibility.Services; 16 using WixToolset.Extensibility.Services;
17 using WixToolset.Harvesters.Extensibility; 17 using WixToolset.Harvesters.Extensibility;
18 using Wix = WixToolset.Harvesters.Serialize;
19 18
20 internal class HeatCommand : BaseCommandLineCommand 19 internal class HeatCommand : BaseCommandLineCommand
21 { 20 {
diff --git a/src/tools/heat/Program.cs b/src/tools/heat/Program.cs
index f74def8f..80423e18 100644
--- a/src/tools/heat/Program.cs
+++ b/src/tools/heat/Program.cs
@@ -12,6 +12,7 @@ namespace WixToolset.Tools.Heat
12 using WixToolset.Extensibility.Data; 12 using WixToolset.Extensibility.Data;
13 using WixToolset.Extensibility.Services; 13 using WixToolset.Extensibility.Services;
14 using WixToolset.Harvesters; 14 using WixToolset.Harvesters;
15 using WixToolset.Harvesters.Data;
15 using WixToolset.Harvesters.Extensibility; 16 using WixToolset.Harvesters.Extensibility;
16 using WixToolset.Tools.Core; 17 using WixToolset.Tools.Core;
17 18
@@ -78,6 +79,9 @@ namespace WixToolset.Tools.Heat
78 79
79 var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider, heatExtensions); 80 var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider, heatExtensions);
80 var command = commandLine.ParseStandardCommandLine(arguments); 81 var command = commandLine.ParseStandardCommandLine(arguments);
82
83 messaging.Write(HarvesterWarnings.HeatIsDeprecated());
84
81 return command?.ExecuteAsync(CancellationToken.None) ?? Task.FromResult(1); 85 return command?.ExecuteAsync(CancellationToken.None) ?? Task.FromResult(1);
82 } 86 }
83 } 87 }