aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-05-08 22:04:46 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-05-08 22:15:56 +1000
commit421c4801e2df8e347eed5eb51c5779aea2a1c9be (patch)
tree56f0cfa7089b6798e0f7f677cd8944055a85008b
parent9339c0c40679098a63e3e6b47f1f9ab8d3a848fb (diff)
downloadwix-421c4801e2df8e347eed5eb51c5779aea2a1c9be.tar.gz
wix-421c4801e2df8e347eed5eb51c5779aea2a1c9be.tar.bz2
wix-421c4801e2df8e347eed5eb51c5779aea2a1c9be.zip
Remove heat messages
-rw-r--r--src/wixext/IisErrors.cs18
-rw-r--r--src/wixext/IisWarnings.cs30
2 files changed, 0 insertions, 48 deletions
diff --git a/src/wixext/IisErrors.cs b/src/wixext/IisErrors.cs
index e38d7807..2f226217 100644
--- a/src/wixext/IisErrors.cs
+++ b/src/wixext/IisErrors.cs
@@ -7,11 +7,6 @@ namespace WixToolset.Data
7 7
8 public static class IIsErrors 8 public static class IIsErrors
9 { 9 {
10 public static Message CannotHarvestWebSite()
11 {
12 return Message(null, Ids.CannotHarvestWebSite, "Cannot harvest website. On Windows Vista, you must install IIS 6 Management Compatibility.");
13 }
14
15 public static Message DeprecatedBinaryChildElement(SourceLineNumber sourceLineNumbers, string elementName) 10 public static Message DeprecatedBinaryChildElement(SourceLineNumber sourceLineNumbers, string elementName)
16 { 11 {
17 return Message(sourceLineNumbers, Ids.DeprecatedBinaryChildElement, "The {0} element contains a deprecated child Binary element. Please move the Binary element under a Fragment, Module, or Product element and set the {0}/@BinaryKey attribute to the value of the Binary/@Id attribute.", elementName); 12 return Message(sourceLineNumbers, Ids.DeprecatedBinaryChildElement, "The {0} element contains a deprecated child Binary element. Please move the Binary element under a Fragment, Module, or Product element and set the {0}/@BinaryKey attribute to the value of the Binary/@Id attribute.", elementName);
@@ -32,11 +27,6 @@ namespace WixToolset.Data
32 return Message(sourceLineNumbers, Ids.IllegalElementWithoutComponent, "The {0} element cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName); 27 return Message(sourceLineNumbers, Ids.IllegalElementWithoutComponent, "The {0} element cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName);
33 } 28 }
34 29
35 public static Message InsufficientPermissionHarvestWebSite()
36 {
37 return Message(null, Ids.InsufficientPermissionHarvestWebSite, "Not enough permissions to harvest website. On Windows Vista, you must run Heat elevated.");
38 }
39
40 public static Message MimeMapExtensionMissingPeriod(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue) 30 public static Message MimeMapExtensionMissingPeriod(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
41 { 31 {
42 return Message(sourceLineNumbers, Ids.MimeMapExtensionMissingPeriod, "The {0}/@{1} attribute's value, '{2}', is not a valid mime map extension. It must begin with a period.", elementName, attributeName, attributeValue); 32 return Message(sourceLineNumbers, Ids.MimeMapExtensionMissingPeriod, "The {0}/@{1} attribute's value, '{2}', is not a valid mime map extension. It must begin with a period.", elementName, attributeName, attributeValue);
@@ -62,11 +52,6 @@ namespace WixToolset.Data
62 return Message(sourceLineNumbers, Ids.WebSiteAttributeUnderWebSite, "The {0}/@WebSite attribute cannot be specified when the {0} element is nested under a WebSite element.", elementName); 52 return Message(sourceLineNumbers, Ids.WebSiteAttributeUnderWebSite, "The {0}/@WebSite attribute cannot be specified when the {0} element is nested under a WebSite element.", elementName);
63 } 53 }
64 54
65 public static Message WebSiteNotFound(string webSiteDescription)
66 {
67 return Message(null, Ids.WebSiteNotFound, "The web site '{0}' could not be found. Please check that the web site exists, and that it is spelled correctly (please note, you must use the correct case).", webSiteDescription);
68 }
69
70 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) 55 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
71 { 56 {
72 return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); 57 return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
@@ -87,9 +72,6 @@ namespace WixToolset.Data
87 WebApplicationAlreadySpecified = 5155, 72 WebApplicationAlreadySpecified = 5155,
88 IllegalCharacterInAttributeValue = 5156, 73 IllegalCharacterInAttributeValue = 5156,
89 DeprecatedBinaryChildElement = 5157, 74 DeprecatedBinaryChildElement = 5157,
90 WebSiteNotFound = 5158,
91 InsufficientPermissionHarvestWebSite = 5159,
92 CannotHarvestWebSite = 5160,
93 RequiredAttributeUnderComponent = 5161, 75 RequiredAttributeUnderComponent = 5161,
94 } 76 }
95 } 77 }
diff --git a/src/wixext/IisWarnings.cs b/src/wixext/IisWarnings.cs
deleted file mode 100644
index 0b833f68..00000000
--- a/src/wixext/IisWarnings.cs
+++ /dev/null
@@ -1,30 +0,0 @@
1// 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.
2
3namespace WixToolset.Data
4{
5 using System;
6 using System.Resources;
7
8 public static class IIsWarnings
9 {
10 public static Message EncounteredNullDirectoryForWebSite(string directory)
11 {
12 return Message(null, Ids.EncounteredNullDirectoryForWebSite, "Could not harvest website directory: {0}. Please update the output with the appropriate directory ID before using.", directory);
13 }
14
15 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
16 {
17 return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
18 }
19
20 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args)
21 {
22 return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, resourceManager, resourceName, args);
23 }
24
25 public enum Ids
26 {
27 EncounteredNullDirectoryForWebSite = 5400,
28 }
29 }
30}