diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-18 17:55:28 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-18 23:24:21 -0600 |
commit | 8d27ac8bd8eb8ec320714a0bc201b05728da2206 (patch) | |
tree | 7b7e7e25510fa23c84da6717d982af6b0f969075 /src | |
parent | 2baff8dcce00fea541028dc927f34eb57641e47d (diff) | |
download | wix-8d27ac8bd8eb8ec320714a0bc201b05728da2206.tar.gz wix-8d27ac8bd8eb8ec320714a0bc201b05728da2206.tar.bz2 wix-8d27ac8bd8eb8ec320714a0bc201b05728da2206.zip |
Enable XML doc.
Diffstat (limited to 'src')
-rw-r--r-- | src/CSharp.Build.props | 1 | ||||
-rw-r--r-- | src/Directory.Build.targets | 8 | ||||
-rw-r--r-- | src/WixToolset.Data/Intermediate.cs | 15 | ||||
-rw-r--r-- | src/WixToolset.Data/WindowsInstaller/ColumnDefinition.cs | 1 | ||||
-rw-r--r-- | src/WixToolset.Data/WindowsInstaller/Field.cs | 4 | ||||
-rw-r--r-- | src/WixToolset.Data/WindowsInstaller/Rows/SummaryInfoRowCollection.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.Data/WindowsInstaller/TableDefinition.cs | 1 | ||||
-rw-r--r-- | src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs | 3 | ||||
-rw-r--r-- | src/WixToolset.Data/WixOutput.cs | 12 | ||||
-rw-r--r-- | src/WixToolset.Data/WixToolset.Data.csproj | 6 |
10 files changed, 34 insertions, 19 deletions
diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props index bcd47a0c..81d24ad1 100644 --- a/src/CSharp.Build.props +++ b/src/CSharp.Build.props | |||
@@ -8,5 +8,6 @@ | |||
8 | <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> | 8 | <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> |
9 | <SignAssembly>true</SignAssembly> | 9 | <SignAssembly>true</SignAssembly> |
10 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | 10 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> |
11 | <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass> | ||
11 | </PropertyGroup> | 12 | </PropertyGroup> |
12 | </Project> | 13 | </Project> |
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index dac7452a..cb988931 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets | |||
@@ -10,6 +10,11 @@ | |||
10 | --> | 10 | --> |
11 | <Project> | 11 | <Project> |
12 | <PropertyGroup> | 12 | <PropertyGroup> |
13 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
14 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
15 | </PropertyGroup> | ||
16 | |||
17 | <PropertyGroup> | ||
13 | <ReplacePackageReferences>true</ReplacePackageReferences> | 18 | <ReplacePackageReferences>true</ReplacePackageReferences> |
14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | 19 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> |
15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | 20 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> |
@@ -45,4 +50,7 @@ | |||
45 | 50 | ||
46 | </When> | 51 | </When> |
47 | </Choose> | 52 | </Choose> |
53 | |||
54 | <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " /> | ||
55 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
48 | </Project> | 56 | </Project> |
diff --git a/src/WixToolset.Data/Intermediate.cs b/src/WixToolset.Data/Intermediate.cs index 30a50120..f9d33839 100644 --- a/src/WixToolset.Data/Intermediate.cs +++ b/src/WixToolset.Data/Intermediate.cs | |||
@@ -121,7 +121,6 @@ namespace WixToolset.Data | |||
121 | /// Loads an intermediate from a WixOutput object. | 121 | /// Loads an intermediate from a WixOutput object. |
122 | /// </summary> | 122 | /// </summary> |
123 | /// <param name="wixOutput">WixOutput object.</param> | 123 | /// <param name="wixOutput">WixOutput object.</param> |
124 | /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param> | ||
125 | /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> | 124 | /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> |
126 | /// <returns>Returns the loaded intermediate.</returns> | 125 | /// <returns>Returns the loaded intermediate.</returns> |
127 | public static Intermediate Load(WixOutput wixOutput, bool suppressVersionCheck = false) | 126 | public static Intermediate Load(WixOutput wixOutput, bool suppressVersionCheck = false) |
@@ -146,7 +145,6 @@ namespace WixToolset.Data | |||
146 | /// Loads several intermediates from paths on disk using the same definitions. | 145 | /// Loads several intermediates from paths on disk using the same definitions. |
147 | /// </summary> | 146 | /// </summary> |
148 | /// <param name="intermediateFiles">Paths to intermediate files saved on disk.</param> | 147 | /// <param name="intermediateFiles">Paths to intermediate files saved on disk.</param> |
149 | /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> | ||
150 | /// <returns>Returns the loaded intermediates</returns> | 148 | /// <returns>Returns the loaded intermediates</returns> |
151 | public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles) | 149 | public static IEnumerable<Intermediate> Load(IEnumerable<string> intermediateFiles) |
152 | { | 150 | { |
@@ -225,9 +223,9 @@ namespace WixToolset.Data | |||
225 | } | 223 | } |
226 | 224 | ||
227 | /// <summary> | 225 | /// <summary> |
228 | /// Saves an intermediate to a path on disk. | 226 | /// Saves an intermediate to a WixOutput. |
229 | /// </summary> | 227 | /// </summary> |
230 | /// <param name="path">Path to save intermediate file to disk.</param> | 228 | /// <param name="wixout">Destination to save.</param> |
231 | public void Save(WixOutput wixout) | 229 | public void Save(WixOutput wixout) |
232 | { | 230 | { |
233 | this.SaveEmbedFiles(wixout); | 231 | this.SaveEmbedFiles(wixout); |
@@ -236,10 +234,9 @@ namespace WixToolset.Data | |||
236 | } | 234 | } |
237 | 235 | ||
238 | /// <summary> | 236 | /// <summary> |
239 | /// Loads an intermediate from a path on disk. | 237 | /// Loads an intermediate from a WixOutput. |
240 | /// </summary> | 238 | /// </summary> |
241 | /// <param name="stream">Stream to intermediate file.</param> | 239 | /// <param name="wixout">Source to load from.</param> |
242 | /// <param name="baseUri">Path name of intermediate file.</param> | ||
243 | /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param> | 240 | /// <param name="creator">ISymbolDefinitionCreator to use when reconstituting the intermediate.</param> |
244 | /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> | 241 | /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> |
245 | /// <returns>Returns the loaded intermediate.</returns> | 242 | /// <returns>Returns the loaded intermediate.</returns> |
@@ -254,9 +251,9 @@ namespace WixToolset.Data | |||
254 | } | 251 | } |
255 | 252 | ||
256 | /// <summary> | 253 | /// <summary> |
257 | /// Loads json form of intermedaite from stream. | 254 | /// Loads json form of intermediate. |
258 | /// </summary> | 255 | /// </summary> |
259 | /// <param name="stream">Stream to intermediate file.</param> | 256 | /// <param name="json">Source to load from.</param> |
260 | /// <param name="baseUri">Path name of intermediate file.</param> | 257 | /// <param name="baseUri">Path name of intermediate file.</param> |
261 | /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> | 258 | /// <param name="suppressVersionCheck">Suppress checking for wix.dll version mismatches.</param> |
262 | /// <returns>Returns the loaded json.</returns> | 259 | /// <returns>Returns the loaded json.</returns> |
diff --git a/src/WixToolset.Data/WindowsInstaller/ColumnDefinition.cs b/src/WixToolset.Data/WindowsInstaller/ColumnDefinition.cs index de554fd8..f4dbab34 100644 --- a/src/WixToolset.Data/WindowsInstaller/ColumnDefinition.cs +++ b/src/WixToolset.Data/WindowsInstaller/ColumnDefinition.cs | |||
@@ -29,6 +29,7 @@ namespace WixToolset.Data.WindowsInstaller | |||
29 | /// <param name="modularizeType">Type of modularization for column</param> | 29 | /// <param name="modularizeType">Type of modularization for column</param> |
30 | /// <param name="forceLocalizable">If the column is localizable.</param> | 30 | /// <param name="forceLocalizable">If the column is localizable.</param> |
31 | /// <param name="useCData">If whitespace should be preserved in a CDATA node.</param> | 31 | /// <param name="useCData">If whitespace should be preserved in a CDATA node.</param> |
32 | /// <param name="unreal">If not saved to MSI.</param> | ||
32 | public ColumnDefinition(string name, ColumnType type, int length, bool primaryKey, bool nullable, ColumnCategory category, long? minValue = null, long? maxValue = null, string keyTable = null, int? keyColumn = null, string possibilities = null, string description = null, ColumnModularizeType? modularizeType = null, bool forceLocalizable = false, bool useCData = false, bool unreal = false) | 33 | public ColumnDefinition(string name, ColumnType type, int length, bool primaryKey, bool nullable, ColumnCategory category, long? minValue = null, long? maxValue = null, string keyTable = null, int? keyColumn = null, string possibilities = null, string description = null, ColumnModularizeType? modularizeType = null, bool forceLocalizable = false, bool useCData = false, bool unreal = false) |
33 | { | 34 | { |
34 | this.Name = name; | 35 | this.Name = name; |
diff --git a/src/WixToolset.Data/WindowsInstaller/Field.cs b/src/WixToolset.Data/WindowsInstaller/Field.cs index 84e8d543..e5edd552 100644 --- a/src/WixToolset.Data/WindowsInstaller/Field.cs +++ b/src/WixToolset.Data/WindowsInstaller/Field.cs | |||
@@ -64,7 +64,6 @@ namespace WixToolset.Data.WindowsInstaller | |||
64 | /// <summary> | 64 | /// <summary> |
65 | /// Sets the value of a particular field in the row without validating. | 65 | /// Sets the value of a particular field in the row without validating. |
66 | /// </summary> | 66 | /// </summary> |
67 | /// <param name="field">field index.</param> | ||
68 | /// <param name="value">Value of a field in the row.</param> | 67 | /// <param name="value">Value of a field in the row.</param> |
69 | /// <returns>True if successful, false if validation failed.</returns> | 68 | /// <returns>True if successful, false if validation failed.</returns> |
70 | public bool BestEffortSet(object value) | 69 | public bool BestEffortSet(object value) |
@@ -133,8 +132,9 @@ namespace WixToolset.Data.WindowsInstaller | |||
133 | } | 132 | } |
134 | 133 | ||
135 | /// <summary> | 134 | /// <summary> |
136 | /// Validate a value for this column. | 135 | /// Validate a value for a column. |
137 | /// </summary> | 136 | /// </summary> |
137 | /// <param name="column">The column.</param> | ||
138 | /// <param name="value">The value to validate.</param> | 138 | /// <param name="value">The value to validate.</param> |
139 | /// <returns>Validated value.</returns> | 139 | /// <returns>Validated value.</returns> |
140 | internal object ValidateValue(ColumnDefinition column, object value) | 140 | internal object ValidateValue(ColumnDefinition column, object value) |
diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/SummaryInfoRowCollection.cs b/src/WixToolset.Data/WindowsInstaller/Rows/SummaryInfoRowCollection.cs index fc0410e9..4b2ce129 100644 --- a/src/WixToolset.Data/WindowsInstaller/Rows/SummaryInfoRowCollection.cs +++ b/src/WixToolset.Data/WindowsInstaller/Rows/SummaryInfoRowCollection.cs | |||
@@ -32,7 +32,7 @@ namespace WixToolset.Data.WindowsInstaller.Rows | |||
32 | /// Gets the summary property ID for the <paramref name="row"/>. | 32 | /// Gets the summary property ID for the <paramref name="row"/>. |
33 | /// </summary> | 33 | /// </summary> |
34 | /// <param name="row">The row to index.</param> | 34 | /// <param name="row">The row to index.</param> |
35 | /// <returns>The summary property ID for the <paramref name="row"/>. | 35 | /// <returns>The summary property ID for the <paramref name="row"/>.</returns> |
36 | protected override int GetKeyForItem(Row row) | 36 | protected override int GetKeyForItem(Row row) |
37 | { | 37 | { |
38 | return (int)row[0]; | 38 | return (int)row[0]; |
diff --git a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs index 504c89ce..a7602d05 100644 --- a/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs +++ b/src/WixToolset.Data/WindowsInstaller/TableDefinition.cs | |||
@@ -26,6 +26,7 @@ namespace WixToolset.Data.WindowsInstaller | |||
26 | /// <param name="columns">Column definitions for the table.</param> | 26 | /// <param name="columns">Column definitions for the table.</param> |
27 | /// <param name="unreal">Flag if table is unreal.</param> | 27 | /// <param name="unreal">Flag if table is unreal.</param> |
28 | /// <param name="symbolIdIsPrimaryKey">Whether the primary key is the id of the symbol definition associated with this table.</param> | 28 | /// <param name="symbolIdIsPrimaryKey">Whether the primary key is the id of the symbol definition associated with this table.</param> |
29 | /// <param name="strongRowType">The specialized type for the rows.</param> | ||
29 | public TableDefinition(string name, IntermediateSymbolDefinition symbolDefinition, IEnumerable<ColumnDefinition> columns, bool unreal = false, bool symbolIdIsPrimaryKey = false, Type strongRowType = null) | 30 | public TableDefinition(string name, IntermediateSymbolDefinition symbolDefinition, IEnumerable<ColumnDefinition> columns, bool unreal = false, bool symbolIdIsPrimaryKey = false, Type strongRowType = null) |
30 | { | 31 | { |
31 | this.Name = name; | 32 | this.Name = name; |
diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs index cc16bca5..8d69cd08 100644 --- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs +++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs | |||
@@ -70,7 +70,6 @@ namespace WixToolset.Data.WindowsInstaller | |||
70 | /// Ensure this output contains a particular table. | 70 | /// Ensure this output contains a particular table. |
71 | /// </summary> | 71 | /// </summary> |
72 | /// <param name="tableDefinition">Definition of the table that should exist.</param> | 72 | /// <param name="tableDefinition">Definition of the table that should exist.</param> |
73 | /// <param name="section">Optional section to use for the table. If one is not provided, the entry section will be used.</param> | ||
74 | /// <returns>The table in this output.</returns> | 73 | /// <returns>The table in this output.</returns> |
75 | public Table EnsureTable(TableDefinition tableDefinition) | 74 | public Table EnsureTable(TableDefinition tableDefinition) |
76 | { | 75 | { |
@@ -98,7 +97,7 @@ namespace WixToolset.Data.WindowsInstaller | |||
98 | /// <summary> | 97 | /// <summary> |
99 | /// Saves an output to an <c>XmlWriter</c>. | 98 | /// Saves an output to an <c>XmlWriter</c>. |
100 | /// </summary> | 99 | /// </summary> |
101 | /// <param name="wixout">XmlWriter to save to.</param> | 100 | /// <param name="writer">XmlWriter to save to.</param> |
102 | public void Save(XmlWriter writer) | 101 | public void Save(XmlWriter writer) |
103 | { | 102 | { |
104 | writer.WriteStartDocument(); | 103 | writer.WriteStartDocument(); |
diff --git a/src/WixToolset.Data/WixOutput.cs b/src/WixToolset.Data/WixOutput.cs index 969de991..43359f24 100644 --- a/src/WixToolset.Data/WixOutput.cs +++ b/src/WixToolset.Data/WixOutput.cs | |||
@@ -24,6 +24,9 @@ namespace WixToolset.Data | |||
24 | this.stream = stream; | 24 | this.stream = stream; |
25 | } | 25 | } |
26 | 26 | ||
27 | /// <summary> | ||
28 | /// | ||
29 | /// </summary> | ||
27 | public Uri Uri { get; } | 30 | public Uri Uri { get; } |
28 | 31 | ||
29 | /// <summary> | 32 | /// <summary> |
@@ -60,8 +63,8 @@ namespace WixToolset.Data | |||
60 | /// <summary> | 63 | /// <summary> |
61 | /// Creates a new file structure. | 64 | /// Creates a new file structure. |
62 | /// </summary> | 65 | /// </summary> |
66 | /// <param name="uri"></param> | ||
63 | /// <param name="stream">Stream to write the file structure to.</param> | 67 | /// <param name="stream">Stream to write the file structure to.</param> |
64 | /// <param name="embedFilePaths">Paths to files to embedd in the file structure.</param> | ||
65 | /// <returns>Newly created <c>WixOutput</c>.</returns> | 68 | /// <returns>Newly created <c>WixOutput</c>.</returns> |
66 | public static WixOutput Create(Uri uri, Stream stream) | 69 | public static WixOutput Create(Uri uri, Stream stream) |
67 | { | 70 | { |
@@ -109,9 +112,11 @@ namespace WixToolset.Data | |||
109 | } | 112 | } |
110 | 113 | ||
111 | /// <summary> | 114 | /// <summary> |
112 | /// Loads a wixout from a assembly resource stream. | 115 | /// Loads a wixout from an assembly resource stream. |
113 | /// </summary> | 116 | /// </summary> |
114 | /// <param name="path">Path to wixout file saved on disk.</param> | 117 | /// <param name="assembly"></param> |
118 | /// <param name="resourceName"></param> | ||
119 | /// <returns>Loaded created <c>WixOutput</c>.</returns> | ||
115 | public static WixOutput Read(Assembly assembly, string resourceName) | 120 | public static WixOutput Read(Assembly assembly, string resourceName) |
116 | { | 121 | { |
117 | var resourceStream = assembly.GetManifestResourceStream(resourceName); | 122 | var resourceStream = assembly.GetManifestResourceStream(resourceName); |
@@ -128,6 +133,7 @@ namespace WixToolset.Data | |||
128 | /// <summary> | 133 | /// <summary> |
129 | /// Reads a file structure from an open stream. | 134 | /// Reads a file structure from an open stream. |
130 | /// </summary> | 135 | /// </summary> |
136 | /// <param name="uri"></param> | ||
131 | /// <param name="stream">Stream to read from.</param> | 137 | /// <param name="stream">Stream to read from.</param> |
132 | /// <returns>Loaded created <c>WixOutput</c>.</returns> | 138 | /// <returns>Loaded created <c>WixOutput</c>.</returns> |
133 | public static WixOutput Read(Uri uri, Stream stream) | 139 | public static WixOutput Read(Uri uri, Stream stream) |
diff --git a/src/WixToolset.Data/WixToolset.Data.csproj b/src/WixToolset.Data/WixToolset.Data.csproj index 19310aea..24b0917b 100644 --- a/src/WixToolset.Data/WixToolset.Data.csproj +++ b/src/WixToolset.Data/WixToolset.Data.csproj | |||
@@ -6,10 +6,12 @@ | |||
6 | <TargetFrameworks>netstandard2.0</TargetFrameworks> | 6 | <TargetFrameworks>netstandard2.0</TargetFrameworks> |
7 | <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks> | 7 | <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks> |
8 | <LangVersion>7.3</LangVersion> | 8 | <LangVersion>7.3</LangVersion> |
9 | <Title>WiX Toolset Data</Title> | 9 | <Description>WiX Toolset Data</Description> |
10 | <Description></Description> | ||
11 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
12 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
12 | <CreateDocumentationFile>true</CreateDocumentationFile> | ||
13 | <!-- TODO: This shouldn't be ignored because this is public-facing --> | ||
14 | <NoWarn>CS1591</NoWarn> | ||
13 | </PropertyGroup> | 15 | </PropertyGroup> |
14 | 16 | ||
15 | <ItemGroup> | 17 | <ItemGroup> |