Integrate latest Data and Extensibility changes and build light.exe
Rob Mensching committed
Dec 27, 2017 at 14:23 UTC
68075faa4a60e8016ea7653cfc1396cd00e3f646
10 files changed
+17
-18
appveyor.cmd
+3
-1
@@ -4,11 +4,13 @@
4
5
dotnet build -c Release src\test\WixToolsetTest.BuildTasks
6
dotnet build -c Release src\test\WixToolsetTest.CoreIntegration
7
+dotnet build -c Release src\test\WixToolsetTest.LightIntegration
8
9
dotnet publish -c Release -o %_P% -r win-x86 src\wix
10
+dotnet publish -c Release -o %_P% -r win-x86 src\light
11
dotnet publish -c Release -o %_P% -r win-x86 src\WixToolset.BuildTasks
12
13
dotnet pack -c Release src\WixToolset.Core.InternalPackage
14
15
@popd
14
-@endlocal
\ No newline at end of file
16
+@endlocal
src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs
+2
-2
@@ -69,9 +69,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
69
return;
70
}
71
72
- if (TableDefinition.MaxColumnsInRealTable < table.Definition.Columns.Count)
72
+ if (TableDefinition.MaxColumnsInRealTable < table.Definition.Columns.Length)
73
{
74
- throw new WixException(ErrorMessages.TooManyColumnsInRealTable(table.Definition.Name, table.Definition.Columns.Count, TableDefinition.MaxColumnsInRealTable));
74
+ throw new WixException(ErrorMessages.TooManyColumnsInRealTable(table.Definition.Name, table.Definition.Columns.Length, TableDefinition.MaxColumnsInRealTable));
75
}
76
77
// Tack on the table header, and flush before we start writing bytes directly to the stream.
src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+1
-1
@@ -254,7 +254,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
254
var row = table.CreateRow(tuple.SourceLineNumbers);
255
for (var i = 0; i < tuple.Fields.Length; ++i)
256
{
257
- if (i < tableDefinition.Columns.Count)
257
+ if (i < tableDefinition.Columns.Length)
258
{
259
var column = tableDefinition.Columns[i];
260
src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
+2
-2
@@ -219,7 +219,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
219
// Import each row containing a stream
220
foreach (Row row in table.Rows)
221
{
222
- using (Record record = new Record(table.Definition.Columns.Count))
222
+ using (Record record = new Record(table.Definition.Columns.Length))
223
{
224
StringBuilder streamName = new StringBuilder();
225
bool needStream = false;
@@ -230,7 +230,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
230
streamName.Append(table.Name);
231
}
232
233
- for (int i = 0; i < table.Definition.Columns.Count; i++)
233
+ for (int i = 0; i < table.Definition.Columns.Length; i++)
234
{
235
ColumnDefinition columnDefinition = table.Definition.Columns[i];
236
src/WixToolset.Core.WindowsInstaller/Bind/ModularaizeCommand.cs
+1
-1
@@ -48,7 +48,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
48
var modularizedColumns = new List<int>();
49
50
// find the modularized columns
51
- for (var i = 0; i < table.Definition.Columns.Count; ++i)
51
+ for (var i = 0; i < table.Definition.Columns.Length; ++i)
52
{
53
if (ColumnModularizeType.None != table.Definition.Columns[i].ModularizeType)
54
{
src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+3
-3
@@ -127,7 +127,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
127
128
using (View tableView = this.Database.OpenExecuteView(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM `{0}`", tableName)))
129
{
130
- List<ColumnDefinition> columns;
130
+ ColumnDefinition[] columns;
131
using (Record columnNameRecord = tableView.GetColumnInfo(MsiInterop.MSICOLINFONAMES),
132
columnTypeRecord = tableView.GetColumnInfo(MsiInterop.MSICOLINFOTYPES))
133
{
@@ -144,7 +144,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
144
}
145
146
int columnCount = columnNameRecord.GetFieldCount();
147
- columns = new List<ColumnDefinition>(columnCount);
147
+ columns = new ColumnDefinition[columnCount];
148
for (int i = 1; i <= columnCount; i++)
149
{
150
string columnName = columnNameRecord.GetString(i);
@@ -260,7 +260,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
260
columnModularizeType = ColumnModularizeType.Column;
261
}
262
263
- columns.Add(new ColumnDefinition(columnName, columnType, length, primary, nullable, columnCategory, minValue, maxValue, keyTable, keyColumn, set, description, columnModularizeType, (ColumnType.Localized == columnType), true));
263
+ columns[i - 1] = new ColumnDefinition(columnName, columnType, length, primary, nullable, columnCategory, minValue, maxValue, keyTable, keyColumn, set, description, columnModularizeType, (ColumnType.Localized == columnType), true);
264
}
265
}
266
src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
+2
-2
@@ -212,7 +212,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
212
213
// mark the field as modified
214
int indexOfModifiedValue = -1;
215
- for (int i = 0; i < modifiedRow.TableDefinition.Columns.Count; ++i)
215
+ for (int i = 0; i < modifiedRow.TableDefinition.Columns.Length; ++i)
216
{
217
if (columnName.Equals(modifiedRow.TableDefinition.Columns[i].Name, StringComparison.Ordinal))
218
{
@@ -270,7 +270,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
270
string[] primaryKeyParts = primaryKeys.Split('\t');
271
int primaryKeyPartIndex = 0;
272
273
- for (int i = 0; i < table.Definition.Columns.Count; i++)
273
+ for (int i = 0; i < table.Definition.Columns.Length; i++)
274
{
275
ColumnDefinition columnDefinition = table.Definition.Columns[i];
276
src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs
+1
-1
@@ -30,7 +30,7 @@ namespace WixToolset.Core.ExtensibilityServices
30
var row = table.CreateRow(tuple.SourceLineNumbers);
31
for (var i = 0; i < tuple.Fields.Length; ++i)
32
{
33
- if (i < tableDefinition.Columns.Count)
33
+ if (i < tableDefinition.Columns.Length)
34
{
35
var column = tableDefinition.Columns[i];
36
src/test/TestData/Example.Extension/ExampleCompilerExtension.cs
+1
-4
@@ -10,10 +10,7 @@ namespace Example.Extension
10
11
internal class ExampleCompilerExtension : BaseCompilerExtension
12
{
13
- public ExampleCompilerExtension()
14
- {
15
- this.Namespace = "http://www.example.com/scheams/v1/wxs";
16
- }
13
+ public override XNamespace Namespace => "http://www.example.com/scheams/v1/wxs";
14
15
public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)
16
{
src/test/TestData/Example.Extension/ExampleTableDefinitions.cs
+1
-1
@@ -9,7 +9,7 @@ namespace Example.Extension
9
{
10
public static readonly TableDefinition ExampleTable = new TableDefinition(
11
"Example",
12
- new List<ColumnDefinition>
12
+ new[]
13
{
14
new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
15
new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),