Update to latest Wixtoolset.Data and simplify Project/Package reference condition
Rob Mensching committed
Jan 1, 2018 at 16:35 UTC
58f9e097a445dbdf3139832ac471374e68678fc6
3 files changed
+22
-47
src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+8
-3
@@ -23,9 +23,14 @@
23
</ItemGroup>
24
25
<ItemGroup>
26
- <PackageReference Include="WixToolset.Data" Version="4.0.*" />
27
- <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
28
- <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
26
+ <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\README.md') " />
27
+ <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\README.md') " />
28
+
29
+ <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\README.md') " />
30
+ <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\README.md') " />
31
+
32
+ <ProjectReference Include="$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core.Native\README.md') " />
33
+ <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core.Native\README.md') " />
34
</ItemGroup>
35
36
<ItemGroup>
src/WixToolset.Core/Compiler.cs
+8
-38
@@ -690,8 +690,7 @@ namespace WixToolset.Core
690
691
if (YesNoType.Yes == suppressModularization)
692
{
693
- var wixSuppressModularizationRow = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.WixSuppressModularization);
694
- wixSuppressModularizationRow.Set(0, id);
693
+ var wixSuppressModularizationRow = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.WixSuppressModularization, id);
694
}
695
}
696
@@ -2474,8 +2473,7 @@ namespace WixToolset.Core
2473
2474
if (multiInstance)
2475
{
2477
- var instanceComponentRow = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.WixInstanceComponent);
2478
- instanceComponentRow.Set(0, id);
2476
+ var instanceComponentRow = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.WixInstanceComponent, id);
2477
}
2478
2479
if (0 < symbols.Count)
@@ -2488,8 +2486,7 @@ namespace WixToolset.Core
2486
// Complus
2487
if (CompilerConstants.IntegerNotSet != comPlusBits)
2488
{
2491
- row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.Complus);
2492
- row.Set(0, id);
2489
+ row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.Complus, id);
2490
row.Set(1, comPlusBits);
2491
}
2492
@@ -4832,7 +4829,7 @@ namespace WixToolset.Core
4829
if (!this.Core.EncounteredError)
4830
{
4831
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.Feature, id);
4835
- row.Set(1, null); // this column is set in the linker
4832
+ // row.Set(1, null); - this column is set in the linker
4833
row.Set(2, title);
4834
row.Set(3, description);
4835
if (0 < display.Length)
@@ -9543,7 +9540,6 @@ namespace WixToolset.Core
9540
}
9541
}
9542
9546
-
9543
if (!this.Core.EncounteredError)
9544
{
9545
var patchIdRow = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.WixPatchId);
@@ -9555,7 +9551,6 @@ namespace WixToolset.Core
9551
if (allowRemoval)
9552
{
9553
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9558
- row.Set(0, null);
9554
row.Set(1, "AllowRemoval");
9555
row.Set(2, allowRemoval ? "1" : "0");
9556
}
@@ -9563,7 +9558,6 @@ namespace WixToolset.Core
9558
if (null != classification)
9559
{
9560
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9566
- row.Set(0, null);
9561
row.Set(1, "Classification");
9562
row.Set(2, classification);
9563
}
@@ -9571,7 +9565,6 @@ namespace WixToolset.Core
9565
// always generate the CreationTimeUTC
9566
{
9567
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9574
- row.Set(0, null);
9568
row.Set(1, "CreationTimeUTC");
9569
row.Set(2, DateTime.UtcNow.ToString("MM-dd-yy HH:mm", CultureInfo.InvariantCulture));
9570
}
@@ -9579,7 +9572,6 @@ namespace WixToolset.Core
9572
if (null != description)
9573
{
9574
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9582
- row.Set(0, null);
9575
row.Set(1, "Description");
9576
row.Set(2, description);
9577
}
@@ -9587,7 +9579,6 @@ namespace WixToolset.Core
9579
if (null != displayName)
9580
{
9581
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9590
- row.Set(0, null);
9582
row.Set(1, "DisplayName");
9583
row.Set(2, displayName);
9584
}
@@ -9595,7 +9586,6 @@ namespace WixToolset.Core
9586
if (null != manufacturer)
9587
{
9588
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9598
- row.Set(0, null);
9589
row.Set(1, "ManufacturerName");
9590
row.Set(2, manufacturer);
9591
}
@@ -9603,7 +9593,6 @@ namespace WixToolset.Core
9593
if (YesNoType.NotSet != minorUpdateTargetRTM)
9594
{
9595
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9606
- row.Set(0, null);
9596
row.Set(1, "MinorUpdateTargetRTM");
9597
row.Set(2, YesNoType.Yes == minorUpdateTargetRTM ? "1" : "0");
9598
}
@@ -9611,7 +9600,6 @@ namespace WixToolset.Core
9600
if (null != moreInfoUrl)
9601
{
9602
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9614
- row.Set(0, null);
9603
row.Set(1, "MoreInfoURL");
9604
row.Set(2, moreInfoUrl);
9605
}
@@ -9619,7 +9607,6 @@ namespace WixToolset.Core
9607
if (CompilerConstants.IntegerNotSet != optimizeCA)
9608
{
9609
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9622
- row.Set(0, null);
9610
row.Set(1, "OptimizeCA");
9611
row.Set(2, optimizeCA.ToString(CultureInfo.InvariantCulture));
9612
}
@@ -9627,7 +9614,6 @@ namespace WixToolset.Core
9614
if (YesNoType.NotSet != optimizedInstallMode)
9615
{
9616
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9630
- row.Set(0, null);
9617
row.Set(1, "OptimizedInstallMode");
9618
row.Set(2, YesNoType.Yes == optimizedInstallMode ? "1" : "0");
9619
}
@@ -9635,7 +9621,6 @@ namespace WixToolset.Core
9621
if (null != targetProductName)
9622
{
9623
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiPatchMetadata);
9638
- row.Set(0, null);
9624
row.Set(1, "TargetProductName");
9625
row.Set(2, targetProductName);
9626
}
@@ -11190,7 +11175,6 @@ namespace WixToolset.Core
11175
if (YesNoType.NotSet != allowRemoval)
11176
{
11177
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11193
- row.Set(0, null);
11178
row.Set(1, "AllowRemoval");
11179
row.Set(2, YesNoType.Yes == allowRemoval ? "1" : "0");
11180
}
@@ -11198,7 +11182,6 @@ namespace WixToolset.Core
11182
if (null != classification)
11183
{
11184
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11201
- row.Set(0, null);
11185
row.Set(1, "Classification");
11186
row.Set(2, classification);
11187
}
@@ -11206,7 +11189,6 @@ namespace WixToolset.Core
11189
if (null != creationTimeUtc)
11190
{
11191
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11209
- row.Set(0, null);
11192
row.Set(1, "CreationTimeUTC");
11193
row.Set(2, creationTimeUtc);
11194
}
@@ -11214,7 +11196,6 @@ namespace WixToolset.Core
11196
if (null != description)
11197
{
11198
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11217
- row.Set(0, null);
11199
row.Set(1, "Description");
11200
row.Set(2, description);
11201
}
@@ -11222,7 +11203,6 @@ namespace WixToolset.Core
11203
if (null != displayName)
11204
{
11205
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11225
- row.Set(0, null);
11206
row.Set(1, "DisplayName");
11207
row.Set(2, displayName);
11208
}
@@ -11230,7 +11210,6 @@ namespace WixToolset.Core
11210
if (null != manufacturerName)
11211
{
11212
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11233
- row.Set(0, null);
11213
row.Set(1, "ManufacturerName");
11214
row.Set(2, manufacturerName);
11215
}
@@ -11238,7 +11217,6 @@ namespace WixToolset.Core
11217
if (null != minorUpdateTargetRTM)
11218
{
11219
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11241
- row.Set(0, null);
11220
row.Set(1, "MinorUpdateTargetRTM");
11221
row.Set(2, minorUpdateTargetRTM);
11222
}
@@ -11246,7 +11224,6 @@ namespace WixToolset.Core
11224
if (null != moreInfoUrl)
11225
{
11226
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11249
- row.Set(0, null);
11227
row.Set(1, "MoreInfoURL");
11228
row.Set(2, moreInfoUrl);
11229
}
@@ -11254,7 +11231,6 @@ namespace WixToolset.Core
11231
if (CompilerConstants.IntegerNotSet != optimizeCA)
11232
{
11233
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11257
- row.Set(0, null);
11234
row.Set(1, "OptimizeCA");
11235
row.Set(2, optimizeCA.ToString(CultureInfo.InvariantCulture));
11236
}
@@ -11262,7 +11238,6 @@ namespace WixToolset.Core
11238
if (YesNoType.NotSet != optimizedInstallMode)
11239
{
11240
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11265
- row.Set(0, null);
11241
row.Set(1, "OptimizedInstallMode");
11242
row.Set(2, YesNoType.Yes == optimizedInstallMode ? "1" : "0");
11243
}
@@ -11270,7 +11245,6 @@ namespace WixToolset.Core
11245
if (null != targetProductName)
11246
{
11247
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.PatchMetadata);
11273
- row.Set(0, null);
11248
row.Set(1, "TargetProductName");
11249
row.Set(2, targetProductName);
11250
}
@@ -12587,7 +12561,7 @@ namespace WixToolset.Core
12561
row.Set(1, root);
12562
row.Set(2, key);
12563
row.Set(3, name);
12590
- row.Set(4, null);
12564
+ //row.Set(4, null);
12565
row.Set(5, componentId);
12566
}
12567
@@ -12914,7 +12888,7 @@ namespace WixToolset.Core
12888
row.Set(3, name);
12889
if (Wix.RemoveRegistryKey.ActionType.removeOnUninstall == actionType) // Registry table
12890
{
12917
- row.Set(4, null);
12891
+ //row.Set(4, null);
12892
row.Set(5, componentId);
12893
}
12894
else // RemoveRegistry table
@@ -13206,7 +13180,7 @@ namespace WixToolset.Core
13180
{
13181
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.RemoveFile, id);
13182
row.Set(1, componentId);
13209
- row.Set(2, null);
13183
+ //row.Set(2, null);
13184
if (null != directory)
13185
{
13186
row.Set(3, directory);
@@ -16848,7 +16822,7 @@ namespace WixToolset.Core
16822
var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.MsiEmbeddedUI, id);
16823
row.Set(1, name);
16824
row.Set(2, 0); // embedded UI resources always set this to 0
16851
- row.Set(3, null);
16825
+ //row.Set(3, null);
16826
row.Set(4, sourceFile);
16827
}
16828
}
@@ -19611,10 +19585,6 @@ namespace WixToolset.Core
19585
{
19586
sourceFile = Path.Combine("SourceDir", name);
19587
}
19614
- else
19615
- {
19616
- sourceFile = String.Empty; // SourceFile is required it cannot be null.
19617
- }
19588
}
19589
else if (null != remotePayload)
19590
{
src/WixToolset.Core/WixToolset.Core.csproj
+6
-6
@@ -9,14 +9,14 @@
9
</PropertyGroup>
10
11
<ItemGroup>
12
- <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
13
- <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
12
+ <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\README.md') " />
13
+ <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\README.md') " />
14
15
- <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
16
- <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
15
+ <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\README.md') " />
16
+ <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\README.md') " />
17
18
- <ProjectReference Include="$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
19
- <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
18
+ <ProjectReference Include="$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core.Native\README.md') " />
19
+ <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core.Native\README.md') " />
20
</ItemGroup>
21
22
<ItemGroup>