@joebigelow / wix / commits / 421c4801

Remove heat messages

Sean Hall committed May 8, 2020 at 22:04 UTC 421c4801e2df8e347eed5eb51c5779aea2a1c9be
2 files changed -48
src/wixext/IisErrors.cs
-18
@@ -7,11 +7,6 @@ namespace WixToolset.Data
7
8 public static class IIsErrors
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 -
10 public static Message DeprecatedBinaryChildElement(SourceLineNumber sourceLineNumbers, string elementName)
11 {
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
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);
28 }
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 -
30 public static Message MimeMapExtensionMissingPeriod(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
31 {
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
52 return Message(sourceLineNumbers, Ids.WebSiteAttributeUnderWebSite, "The {0}/@WebSite attribute cannot be specified when the {0} element is nested under a WebSite element.", elementName);
53 }
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 -
55 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
56 {
57 return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
@@ -87,9 +72,6 @@ namespace WixToolset.Data
72 WebApplicationAlreadySpecified = 5155,
73 IllegalCharacterInAttributeValue = 5156,
74 DeprecatedBinaryChildElement = 5157,
90 - WebSiteNotFound = 5158,
91 - InsufficientPermissionHarvestWebSite = 5159,
92 - CannotHarvestWebSite = 5160,
75 RequiredAttributeUnderComponent = 5161,
76 }
77 }
src/wixext/IisWarnings.cs deleted
-30
@@ -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 -
3 -namespace 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 -}