aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2017-09-22 07:47:43 -0700
committerRob Mensching <rob@firegiant.com>2017-09-22 07:47:43 -0700
commit6b51e3b2bfd321f98e855141eb4b15a75bcd8c16 (patch)
treed475f3314df829a21afed4a902abcccc1104e11a
parentab6477ed0faf81cf152d99a3e07f7489b7dea7f7 (diff)
downloadwix-6b51e3b2bfd321f98e855141eb4b15a75bcd8c16.tar.gz
wix-6b51e3b2bfd321f98e855141eb4b15a75bcd8c16.tar.bz2
wix-6b51e3b2bfd321f98e855141eb4b15a75bcd8c16.zip
Fix CLI header
Diffstat
-rw-r--r--src/Directory.Build.props1
-rw-r--r--src/WixToolset.Core/AppCommon.cs9
-rw-r--r--src/WixToolset.Core/WixDistributionSpecificStrings.Designer.cs77
-rw-r--r--src/WixToolset.Core/WixDistributionSpecificStrings.resx130
-rw-r--r--src/WixToolset.Core/WixToolset.Core.csproj2
-rw-r--r--src/wix/Program.cs9
-rw-r--r--src/wix/wix.csproj2
7 files changed, 17 insertions, 213 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 25cb6d36..b27b5ca8 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -10,6 +10,7 @@
10 <Authors>WiX Toolset Team</Authors> 10 <Authors>WiX Toolset Team</Authors>
11 <Company>WiX Toolset</Company> 11 <Company>WiX Toolset</Company>
12 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> 12 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
13 <Product>WiX Toolset</Product>
13 </PropertyGroup> 14 </PropertyGroup>
14 15
15 <PropertyGroup> 16 <PropertyGroup>
diff --git a/src/WixToolset.Core/AppCommon.cs b/src/WixToolset.Core/AppCommon.cs
index 30ec7771..5fde632a 100644
--- a/src/WixToolset.Core/AppCommon.cs
+++ b/src/WixToolset.Core/AppCommon.cs
@@ -121,7 +121,7 @@ namespace WixToolset
121 /// <returns>Returns value for PID_APPNAME."</returns> 121 /// <returns>Returns value for PID_APPNAME."</returns>
122 public static string GetCreatingApplicationString() 122 public static string GetCreatingApplicationString()
123 { 123 {
124 Assembly assembly = Assembly.GetExecutingAssembly(); 124 var assembly = Assembly.GetExecutingAssembly();
125 return WixDistribution.ReplacePlaceholders("[AssemblyProduct] ([FileVersion])", assembly); 125 return WixDistribution.ReplacePlaceholders("[AssemblyProduct] ([FileVersion])", assembly);
126 } 126 }
127 127
@@ -130,8 +130,8 @@ namespace WixToolset
130 /// </summary> 130 /// </summary>
131 public static void DisplayToolHeader() 131 public static void DisplayToolHeader()
132 { 132 {
133 Assembly assembly = Assembly.GetCallingAssembly(); 133 var assembly = Assembly.GetCallingAssembly();
134 Console.WriteLine(WixDistribution.ReplacePlaceholders(WixDistributionSpecificStrings.ToolsetHelpHeader, assembly)); 134 Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]\r\n[AssemblyCopyright]", assembly));
135 } 135 }
136 136
137 /// <summary> 137 /// <summary>
@@ -139,7 +139,8 @@ namespace WixToolset
139 /// </summary> 139 /// </summary>
140 public static void DisplayToolFooter() 140 public static void DisplayToolFooter()
141 { 141 {
142 Console.Write(WixDistribution.ReplacePlaceholders(WixDistributionSpecificStrings.ToolsetHelpFooter, null)); 142 var assembly = Assembly.GetCallingAssembly();
143 Console.Write(WixDistribution.ReplacePlaceholders("\r\nFor more information see: [SupportUrl]", assembly));
143 } 144 }
144 } 145 }
145} 146}
diff --git a/src/WixToolset.Core/WixDistributionSpecificStrings.Designer.cs b/src/WixToolset.Core/WixDistributionSpecificStrings.Designer.cs
deleted file mode 100644
index 841f6ca8..00000000
--- a/src/WixToolset.Core/WixDistributionSpecificStrings.Designer.cs
+++ /dev/null
@@ -1,77 +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 {
4 using System;
5
6
7 /// <summary>
8 /// A strongly-typed resource class, for looking up localized strings, etc.
9 /// </summary>
10 // This class was auto-generated by the StronglyTypedResourceBuilder
11 // class via a tool like ResGen or Visual Studio.
12 // To add or remove a member, edit your .ResX file then rerun ResGen
13 // with the /str option, or rebuild your VS project.
14 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
15 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
16 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
17 internal class WixDistributionSpecificStrings {
18
19 private static global::System.Resources.ResourceManager resourceMan;
20
21 private static global::System.Globalization.CultureInfo resourceCulture;
22
23 [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
24 internal WixDistributionSpecificStrings() {
25 }
26
27 /// <summary>
28 /// Returns the cached ResourceManager instance used by this class.
29 /// </summary>
30 [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
31 internal static global::System.Resources.ResourceManager ResourceManager {
32 get {
33 if (object.ReferenceEquals(resourceMan, null)) {
34 global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WixToolset.WixDistributionSpecificStrings", typeof(WixDistributionSpecificStrings).Assembly);
35 resourceMan = temp;
36 }
37 return resourceMan;
38 }
39 }
40
41 /// <summary>
42 /// Overrides the current thread's CurrentUICulture property for all
43 /// resource lookups using this strongly typed resource class.
44 /// </summary>
45 [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
46 internal static global::System.Globalization.CultureInfo Culture {
47 get {
48 return resourceCulture;
49 }
50 set {
51 resourceCulture = value;
52 }
53 }
54
55 /// <summary>
56 /// Looks up a localized string similar to
57 ///For more information see: http://wix.sourceforge.net
58 ///.
59 /// </summary>
60 internal static string ToolsetHelpFooter {
61 get {
62 return ResourceManager.GetString("ToolsetHelpFooter", resourceCulture);
63 }
64 }
65
66 /// <summary>
67 /// Looks up a localized string similar to WiX {0} version {1}
68 ///Copyright (C) .NET Foundation and contributors. All rights reserved.
69 ///.
70 /// </summary>
71 internal static string ToolsetHelpHeader {
72 get {
73 return ResourceManager.GetString("ToolsetHelpHeader", resourceCulture);
74 }
75 }
76 }
77}
diff --git a/src/WixToolset.Core/WixDistributionSpecificStrings.resx b/src/WixToolset.Core/WixDistributionSpecificStrings.resx
deleted file mode 100644
index 7cca2d4e..00000000
--- a/src/WixToolset.Core/WixDistributionSpecificStrings.resx
+++ /dev/null
@@ -1,130 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<root>
3 <!--
4 Microsoft ResX Schema
5
6 Version 2.0
7
8 The primary goals of this format is to allow a simple XML format
9 that is mostly human readable. The generation and parsing of the
10 various data types are done through the TypeConverter classes
11 associated with the data types.
12
13 Example:
14
15 ... ado.net/XML headers & schema ...
16 <resheader name="resmimetype">text/microsoft-resx</resheader>
17 <resheader name="version">2.0</resheader>
18 <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19 <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20 <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21 <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22 <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23 <value>[base64 mime encoded serialized .NET Framework object]</value>
24 </data>
25 <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26 <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27 <comment>This is a comment</comment>
28 </data>
29
30 There are any number of "resheader" rows that contain simple
31 name/value pairs.
32
33 Each data row contains a name, and value. The row also contains a
34 type or mimetype. Type corresponds to a .NET class that support
35 text/value conversion through the TypeConverter architecture.
36 Classes that don't support this are serialized and stored with the
37 mimetype set.
38
39 The mimetype is used for serialized objects, and tells the
40 ResXResourceReader how to depersist the object. This is currently not
41 extensible. For a given mimetype the value must be set accordingly:
42
43 Note - application/x-microsoft.net.object.binary.base64 is the format
44 that the ResXResourceWriter will generate, however the reader can
45 read any of the formats listed below.
46
47 mimetype: application/x-microsoft.net.object.binary.base64
48 value : The object must be serialized with
49 : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50 : and then encoded with base64 encoding.
51
52 mimetype: application/x-microsoft.net.object.soap.base64
53 value : The object must be serialized with
54 : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55 : and then encoded with base64 encoding.
56
57 mimetype: application/x-microsoft.net.object.bytearray.base64
58 value : The object must be serialized into a byte array
59 : using a System.ComponentModel.TypeConverter
60 : and then encoded with base64 encoding.
61 -->
62 <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63 <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64 <xsd:element name="root" msdata:IsDataSet="true">
65 <xsd:complexType>
66 <xsd:choice maxOccurs="unbounded">
67 <xsd:element name="metadata">
68 <xsd:complexType>
69 <xsd:sequence>
70 <xsd:element name="value" type="xsd:string" minOccurs="0" />
71 </xsd:sequence>
72 <xsd:attribute name="name" use="required" type="xsd:string" />
73 <xsd:attribute name="type" type="xsd:string" />
74 <xsd:attribute name="mimetype" type="xsd:string" />
75 <xsd:attribute ref="xml:space" />
76 </xsd:complexType>
77 </xsd:element>
78 <xsd:element name="assembly">
79 <xsd:complexType>
80 <xsd:attribute name="alias" type="xsd:string" />
81 <xsd:attribute name="name" type="xsd:string" />
82 </xsd:complexType>
83 </xsd:element>
84 <xsd:element name="data">
85 <xsd:complexType>
86 <xsd:sequence>
87 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89 </xsd:sequence>
90 <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91 <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92 <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93 <xsd:attribute ref="xml:space" />
94 </xsd:complexType>
95 </xsd:element>
96 <xsd:element name="resheader">
97 <xsd:complexType>
98 <xsd:sequence>
99 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100 </xsd:sequence>
101 <xsd:attribute name="name" type="xsd:string" use="required" />
102 </xsd:complexType>
103 </xsd:element>
104 </xsd:choice>
105 </xsd:complexType>
106 </xsd:element>
107 </xsd:schema>
108 <resheader name="resmimetype">
109 <value>text/microsoft-resx</value>
110 </resheader>
111 <resheader name="version">
112 <value>2.0</value>
113 </resheader>
114 <resheader name="reader">
115 <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116 </resheader>
117 <resheader name="writer">
118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119 </resheader>
120 <data name="ToolsetHelpFooter" xml:space="preserve">
121 <value>
122For more information see: [SupportUrl]
123</value>
124 </data>
125 <data name="ToolsetHelpHeader" xml:space="preserve">
126 <value>[AssemblyProduct] [AssemblyDescription] version [FileVersion]
127[AssemblyCopyright]
128</value>
129 </data>
130</root> \ No newline at end of file
diff --git a/src/WixToolset.Core/WixToolset.Core.csproj b/src/WixToolset.Core/WixToolset.Core.csproj
index 3db31e4d..de7f004e 100644
--- a/src/WixToolset.Core/WixToolset.Core.csproj
+++ b/src/WixToolset.Core/WixToolset.Core.csproj
@@ -4,7 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework> 6 <TargetFramework>netstandard2.0</TargetFramework>
7 <Description></Description> 7 <Description>Core</Description>
8 <Title>WiX Toolset Core</Title> 8 <Title>WiX Toolset Core</Title>
9 </PropertyGroup> 9 </PropertyGroup>
10 10
diff --git a/src/wix/Program.cs b/src/wix/Program.cs
index 3e4fa8f8..477f05ff 100644
--- a/src/wix/Program.cs
+++ b/src/wix/Program.cs
@@ -24,11 +24,20 @@ namespace WixToolset.Core
24 [MTAThread] 24 [MTAThread]
25 public static int Main(string[] args) 25 public static int Main(string[] args)
26 { 26 {
27 Messaging.Instance.InitializeAppName("WIX", "wix.exe");
28
29 Messaging.Instance.Display += DisplayMessage;
30
27 var command = CommandLine.ParseStandardCommandLine(args); 31 var command = CommandLine.ParseStandardCommandLine(args);
28 32
29 return command?.Execute() ?? 1; 33 return command?.Execute() ?? 1;
30 } 34 }
31 35
36 private static void DisplayMessage(object sender, DisplayEventArgs e)
37 {
38 Console.WriteLine(e.Message);
39 }
40
32#if false 41#if false
33 private static ICommand ParseCommandLine(string[] args) 42 private static ICommand ParseCommandLine(string[] args)
34 { 43 {
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
index 88017e3f..5018bcd4 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix.csproj
@@ -5,7 +5,7 @@
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp2.0</TargetFramework> 6 <TargetFramework>netcoreapp2.0</TargetFramework>
7 <OutputType>Exe</OutputType> 7 <OutputType>Exe</OutputType>
8 <Description></Description> 8 <Description>Compiler</Description>
9 <Title>WiX Toolset Compiler</Title> 9 <Title>WiX Toolset Compiler</Title>
10 </PropertyGroup> 10 </PropertyGroup>
11 11
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-11-29 22:05:36 +0000