Bring extension up to date.
Sean Hall committed
Dec 11, 2019 at 16:22 UTC
a70d814e7db6a7c4956423bca3bfdd23abc433bc
12 files changed
+78
-80
src/Samples/bafunctions/bafunctions.vcxproj
+6
-6
@@ -2,9 +2,9 @@
2
<!-- 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. -->
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" />
6
- <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props')" />
7
- <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" />
5
+ <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" />
6
+ <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" />
7
+ <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
10
<ProjectConfiguration Include="Debug|Win32">
@@ -57,9 +57,9 @@
57
<PropertyGroup>
58
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
59
</PropertyGroup>
60
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props'))" />
61
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props'))" />
62
- <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props'))" />
60
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props'))" />
61
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props'))" />
62
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
63
<Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
64
</Target>
65
</Project>
src/Samples/bafunctions/packages.config
+3
-3
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
- <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.13" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.5" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/mbahost/mbahost.vcxproj
+6
-6
@@ -2,9 +2,9 @@
2
<!-- 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. -->
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" />
6
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props')" />
7
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" />
5
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" />
6
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" />
7
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
10
<ProjectConfiguration Include="Debug|Win32">
@@ -56,9 +56,9 @@
56
<PropertyGroup>
57
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
58
</PropertyGroup>
59
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props'))" />
60
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props'))" />
61
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props'))" />
59
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props'))" />
60
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props'))" />
61
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
62
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
63
</Target>
64
</Project>
src/mbahost/packages.config
+3
-3
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
- <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.13" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.5" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
+4
-4
@@ -1,10 +1,10 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- 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. -->
3
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" />
4
+ <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" />
5
<Import Project="..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" />
6
<Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
7
- <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" />
7
+ <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
8
<ItemGroup Label="ProjectConfigurations">
9
<ProjectConfiguration Include="Debug|Win32">
10
<Configuration>Debug</Configuration>
@@ -82,11 +82,11 @@
82
<PropertyGroup>
83
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
84
</PropertyGroup>
85
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props'))" />
85
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props'))" />
86
<Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props'))" />
87
<Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" />
88
<Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" />
89
- <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props'))" />
89
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
90
</Target>
91
<Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" />
92
</Project>
\ No newline at end of file
src/test/WixToolsetTest.MbaHost/packages.config
+2
-2
@@ -8,7 +8,7 @@
8
<package id="xunit.extensibility.core" version="2.4.0" targetFramework="net461" />
9
<package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net461" />
10
<package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net461" />
11
- <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" />
11
+ <package id="WixToolset.BalUtil" version="4.0.5" targetFramework="native" />
12
<package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="net461" />
13
- <package id="WixToolset.DUtil" version="4.0.16" targetFramework="native" />
13
+ <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
14
</packages>
\ No newline at end of file
src/wixext/BalCompiler.cs
+35
-35
@@ -110,7 +110,7 @@ namespace WixToolset.Bal
110
111
if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage))
112
{
113
- prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixMbaPrereqInformation");
113
+ prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixMbaPrereqInformation");
114
prereqInfo.PackageId = packageId;
115
116
this.prereqInfoRows.Add(packageId, prereqInfo);
@@ -141,7 +141,7 @@ namespace WixToolset.Bal
141
142
if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage))
143
{
144
- prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixMbaPrereqInformation");
144
+ prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixMbaPrereqInformation");
145
prereqInfo.PackageId = packageId;
146
147
this.prereqInfoRows.Add(packageId, prereqInfo);
@@ -167,7 +167,7 @@ namespace WixToolset.Bal
167
{
168
if (!this.prereqInfoRows.TryGetValue(packageId, out prereqInfo))
169
{
170
- prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixMbaPrereqInformation");
170
+ prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixMbaPrereqInformation");
171
prereqInfo.PackageId = packageId;
172
173
this.prereqInfoRows.Add(packageId, prereqInfo);
@@ -193,7 +193,7 @@ namespace WixToolset.Bal
193
case "BAFunctions":
194
if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))
195
{
196
- var tuple = (WixBalBAFunctionsTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBalBAFunctions");
196
+ var tuple = (WixBalBAFunctionsTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBalBAFunctions");
197
tuple.PayloadId = payloadId;
198
}
199
break;
@@ -218,7 +218,7 @@ namespace WixToolset.Bal
218
case "Overridable":
219
if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))
220
{
221
- var tuple = (WixStdbaOverridableVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixStdbaOverridableVariable");
221
+ var tuple = (WixStdbaOverridableVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixStdbaOverridableVariable");
222
tuple.Name = variableName.Value;
223
}
224
break;
@@ -276,7 +276,7 @@ namespace WixToolset.Bal
276
277
if (!this.Messaging.EncounteredError)
278
{
279
- var tuple = (WixBalConditionTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBalCondition");
279
+ var tuple = (WixBalConditionTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBalCondition");
280
tuple.Condition = condition;
281
tuple.Message = message;
282
@@ -387,32 +387,32 @@ namespace WixToolset.Bal
387
{
388
if (!String.IsNullOrEmpty(launchTarget))
389
{
390
- var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable");
391
- row.Id = new Identifier("LaunchTarget", AccessModifier.Public);
390
+ var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable");
391
+ row.Id = new Identifier(AccessModifier.Public, "LaunchTarget");
392
row.Value = launchTarget;
393
row.Type = "string";
394
}
395
396
if (!String.IsNullOrEmpty(launchTargetElevatedId))
397
{
398
- var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable");
399
- row.Id = new Identifier("LaunchTargetElevatedId", AccessModifier.Public);
398
+ var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable");
399
+ row.Id = new Identifier(AccessModifier.Public, "LaunchTargetElevatedId");
400
row.Value = launchTargetElevatedId;
401
row.Type = "string";
402
}
403
404
if (!String.IsNullOrEmpty(launchArguments))
405
{
406
- var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable");
407
- row.Id = new Identifier("LaunchArguments", AccessModifier.Public);
406
+ var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable");
407
+ row.Id = new Identifier(AccessModifier.Public, "LaunchArguments");
408
row.Value = launchArguments;
409
row.Type = "string";
410
}
411
412
if (YesNoType.Yes == launchHidden)
413
{
414
- var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable");
415
- row.Id = new Identifier("LaunchHidden", AccessModifier.Public);
414
+ var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable");
415
+ row.Id = new Identifier(AccessModifier.Public, "LaunchHidden");
416
row.Value = "yes";
417
row.Type = "string";
418
}
@@ -420,57 +420,57 @@ namespace WixToolset.Bal
420
421
if (!String.IsNullOrEmpty(launchWorkingDir))
422
{
423
- var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "Variable");
424
- row.Id = new Identifier("LaunchWorkingFolder", AccessModifier.Public);
423
+ var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Variable");
424
+ row.Id = new Identifier(AccessModifier.Public, "LaunchWorkingFolder");
425
row.Value = launchWorkingDir;
426
row.Type = "string";
427
}
428
429
if (!String.IsNullOrEmpty(licenseFile))
430
{
431
- var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable");
432
- wixVariableRow.Id = new Identifier("WixStdbaLicenseRtf", AccessModifier.Public);
431
+ var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable");
432
+ wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf");
433
wixVariableRow.Value = licenseFile;
434
}
435
436
if (null != licenseUrl)
437
{
438
- var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable");
439
- wixVariableRow.Id = new Identifier("WixStdbaLicenseUrl", AccessModifier.Public);
438
+ var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable");
439
+ wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl");
440
wixVariableRow.Value = licenseUrl;
441
}
442
443
if (!String.IsNullOrEmpty(logoFile))
444
{
445
- var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable");
446
- wixVariableRow.Id = new Identifier("WixStdbaLogo", AccessModifier.Public);
445
+ var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable");
446
+ wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLogo");
447
wixVariableRow.Value = logoFile;
448
}
449
450
if (!String.IsNullOrEmpty(logoSideFile))
451
{
452
- var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable");
453
- wixVariableRow.Id = new Identifier("WixStdbaLogoSide", AccessModifier.Public);
452
+ var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable");
453
+ wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLogoSide");
454
wixVariableRow.Value = logoSideFile;
455
}
456
457
if (!String.IsNullOrEmpty(themeFile))
458
{
459
- var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable");
460
- wixVariableRow.Id = new Identifier("WixStdbaThemeXml", AccessModifier.Public);
459
+ var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable");
460
+ wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaThemeXml");
461
wixVariableRow.Value = themeFile;
462
}
463
464
if (!String.IsNullOrEmpty(localizationFile))
465
{
466
- var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable");
467
- wixVariableRow.Id = new Identifier("WixStdbaThemeWxl", AccessModifier.Public);
466
+ var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable");
467
+ wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaThemeWxl");
468
wixVariableRow.Value = localizationFile;
469
}
470
471
if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly)
472
{
473
- var tuple = (WixStdbaOptionsTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixStdbaOptions");
473
+ var tuple = (WixStdbaOptionsTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixStdbaOptions");
474
if (YesNoType.Yes == suppressOptionsUI)
475
{
476
tuple.SuppressOptionsUI = 1;
@@ -542,22 +542,22 @@ namespace WixToolset.Bal
542
{
543
if (!String.IsNullOrEmpty(logoFile))
544
{
545
- var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable");
546
- wixVariableRow.Id = new Identifier("PreqbaLogo", AccessModifier.Public);
545
+ var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable");
546
+ wixVariableRow.Id = new Identifier(AccessModifier.Public, "PreqbaLogo");
547
wixVariableRow.Value = logoFile;
548
}
549
550
if (!String.IsNullOrEmpty(themeFile))
551
{
552
- var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable");
553
- wixVariableRow.Id = new Identifier("PreqbaThemeXml", AccessModifier.Public);
552
+ var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable");
553
+ wixVariableRow.Id = new Identifier(AccessModifier.Public, "PreqbaThemeXml");
554
wixVariableRow.Value = themeFile;
555
}
556
557
if (!String.IsNullOrEmpty(localizationFile))
558
{
559
- var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable");
560
- wixVariableRow.Id = new Identifier("PreqbaThemeWxl", AccessModifier.Public);
559
+ var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable");
560
+ wixVariableRow.Id = new Identifier(AccessModifier.Public, "PreqbaThemeWxl");
561
wixVariableRow.Value = localizationFile;
562
}
563
}
src/wixext/BalWindowsInstallerBackendBinderExtension.cs
+7
-9
@@ -6,6 +6,7 @@ namespace WixToolset.Bal
6
using System.Linq;
7
using System.Xml;
8
using WixToolset.Data;
9
+ using WixToolset.Data.Burn;
10
using WixToolset.Data.WindowsInstaller;
11
using WixToolset.Data.WindowsInstaller.Rows;
12
using WixToolset.Extensibility;
@@ -13,9 +14,6 @@ namespace WixToolset.Bal
14
15
public class BalWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension
16
{
16
- // TODO: don't duplicate this from WixToolset.Core.Compiler
17
- public const string BurnUXContainerId = "WixUXContainer";
18
-
17
private static readonly TableDefinition[] Tables = LoadTables();
18
19
protected override TableDefinition[] TableDefinitionsForTuples => Tables;
@@ -30,11 +28,11 @@ namespace WixToolset.Bal
28
}
29
}
30
33
- public override void PostBackendBind(BindResult result, Pdb pdb)
31
+ public override void PostBackendBind(IBindResult result, WixOutput wixout)
32
{
35
- base.PostBackendBind(result, pdb);
33
+ base.PostBackendBind(result, wixout);
34
37
- var output = pdb.Output;
35
+ var output = WindowsInstallerData.Load(wixout.Uri.AbsoluteUri, false);
36
37
// Only process Bundles.
38
if (OutputType.Bundle != output.Type)
@@ -64,7 +62,7 @@ namespace WixToolset.Bal
62
}
63
}
64
67
- private void VerifyBAFunctions(Output output)
65
+ private void VerifyBAFunctions(WindowsInstallerData output)
66
{
67
Row baFunctionsRow = null;
68
var baFunctionsTable = output.Tables["WixBalBAFunctions"];
@@ -98,14 +96,14 @@ namespace WixToolset.Bal
96
// TODO: May need to revisit this depending on the outcome of #5273.
97
var payloadId = (string)baFunctionsRow[0];
98
var bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id);
101
- if (BurnUXContainerId != bundlePayloadRow.Container)
99
+ if (BurnConstants.BurnUXContainerName != bundlePayloadRow.Container)
100
{
101
this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers));
102
}
103
}
104
}
105
108
- private void VerifyPrereqPackages(Output output)
106
+ private void VerifyPrereqPackages(WindowsInstallerData output)
107
{
108
var prereqInfoTable = output.Tables["WixMbaPrereqInformation"];
109
if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0)
src/wixlib/bal.wixproj
+2
-2
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8" ?>
2
<!-- 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. -->
3
<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
- <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" />
4
+ <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0059\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0059\build\WixToolset.MSBuild.props')" />
5
<Import Project="..\FindLocalWix.props" />
6
<PropertyGroup>
7
<ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -56,7 +56,7 @@
56
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
57
</PropertyGroup>
58
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
59
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props'))" />
59
+ <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0059\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0059\build\WixToolset.MSBuild.props'))" />
60
</Target>
61
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
62
</Project>
src/wixlib/packages.config
+1
-1
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
- <package id="WixToolset.MSBuild" version="4.0.0-build-0035" developmentDependency="true" targetFramework="net40" />
4
+ <package id="WixToolset.MSBuild" version="4.0.0-build-0059" developmentDependency="true" targetFramework="net40" />
5
</packages>
\ No newline at end of file
src/wixstdba/packages.config
+3
-3
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
- <package id="WixToolset.BootstrapperCore" version="4.0.3" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.4" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.13" targetFramework="native" />
4
+ <package id="WixToolset.BootstrapperCore" version="4.0.5" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.5" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/wixstdba/wixstdba.vcxproj
+6
-6
@@ -2,9 +2,9 @@
2
<!-- 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. -->
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" />
6
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props')" />
7
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" />
5
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" />
6
+ <Import Project="..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" />
7
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
10
<ProjectConfiguration Include="Debug|Win32">
@@ -107,9 +107,9 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
107
<PropertyGroup>
108
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
109
</PropertyGroup>
110
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.4\build\WixToolset.BalUtil.props'))" />
111
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.3\build\WixToolset.BootstrapperCore.props'))" />
112
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props'))" />
110
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.5\build\WixToolset.BalUtil.props'))" />
111
+ <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.5\build\WixToolset.BootstrapperCore.props'))" />
112
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
113
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
114
</Target>
115
</Project>