Last bit of inner text expunged.
Bob Arnson committed
Sep 26, 2020 at 20:31 UTC
6241bbf88e61f07816ea8fd028d7aaeba6bc524e
4 files changed
+12
-14
Bal.wixext.sln
+3
-3
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
3
# Visual Studio Version 16
4
VisualStudioVersion = 16.0.29503.13
5
MinimumVisualStudioVersion = 10.0.40219.1
6
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}"
7
+EndProject
8
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}"
9
EndProject
10
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "src\mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}"
@@ -17,9 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.Host", "src\
19
EndProject
20
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}"
21
EndProject
20
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}"
21
-EndProject
22
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}"
22
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}"
23
EndProject
24
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "src\test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}"
25
EndProject
src/test/examples/TestEngine/Example.TestEngine.vcxproj
+2
-2
@@ -27,9 +27,9 @@
27
<ConfigurationType>Application</ConfigurationType>
28
<ProjectSubSystem>Console</ProjectSubSystem>
29
<TargetName>Example.TestEngine</TargetName>
30
- <PlatformToolset>v141</PlatformToolset>
30
+ <PlatformToolset>v142</PlatformToolset>
31
<CharacterSet>Unicode</CharacterSet>
32
- <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
32
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
33
</PropertyGroup>
34
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
35
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
src/wixext/BalCompiler.cs
+4
-1
@@ -280,7 +280,7 @@ namespace WixToolset.Bal
280
private void ParseConditionElement(Intermediate intermediate, IntermediateSection section, XElement node)
281
{
282
var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
283
- var condition = this.ParseHelper.GetConditionInnerText(node); // condition is the inner text of the element.
283
+ string condition = null;
284
string message = null;
285
286
foreach (var attrib in node.Attributes())
@@ -292,6 +292,9 @@ namespace WixToolset.Bal
292
case "Message":
293
message = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
294
break;
295
+ case "Condition":
296
+ condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
297
+ break;
298
default:
299
this.ParseHelper.UnexpectedAttribute(node, attrib);
300
break;
src/wixlib/bal.wixproj
+3
-8
@@ -1,27 +1,22 @@
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
-<Project Sdk="WixToolset.Sdk">
3
-
2
+<Project Sdk="WixToolset.Sdk" ToolsVersion="4.0">
3
<PropertyGroup>
4
<OutputType>Library</OutputType>
5
<BindFiles>true</BindFiles>
6
<Cultures>en-us</Cultures>
7
</PropertyGroup>
9
-
8
<ItemGroup>
9
<BindInputPaths Include="..\wixstdba\Resources\" />
10
<BindInputPaths Include="$(OutputPath)netcoreapp3.0" />
11
<BindInputPaths Include="$(OutputPath)" />
14
- <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
12
+ <BindInputPaths Include="$(OutputPath)Win32" BindName="x86" />
13
</ItemGroup>
16
-
14
<ItemGroup>
15
<ProjectReference Include="..\dnchost\dnchost.vcxproj" />
16
<ProjectReference Include="..\mbahost\mbahost.vcxproj" />
17
<ProjectReference Include="..\wixstdba\wixstdba.vcxproj" />
18
</ItemGroup>
22
-
19
<ItemGroup>
20
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
21
</ItemGroup>
26
-
27
-</Project>
22
+</Project>
\ No newline at end of file