From 6241bbf88e61f07816ea8fd028d7aaeba6bc524e Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sat, 26 Sep 2020 20:31:50 -0400
Subject: Last bit of inner text expunged.

---
 Bal.wixext.sln                                          |  6 +++---
 src/test/examples/TestEngine/Example.TestEngine.vcxproj |  4 ++--
 src/wixext/BalCompiler.cs                               |  5 ++++-
 src/wixlib/bal.wixproj                                  | 11 +++--------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Bal.wixext.sln b/Bal.wixext.sln
index 7fcfe556..eaf23ba0 100644
--- a/Bal.wixext.sln
+++ b/Bal.wixext.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29503.13
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}"
 EndProject
 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\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "src\test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}"
 EndProject
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
index cc772e37..543668d2 100644
--- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -27,9 +27,9 @@
     <ConfigurationType>Application</ConfigurationType>
     <ProjectSubSystem>Console</ProjectSubSystem>
     <TargetName>Example.TestEngine</TargetName>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs
index c836adbe..484dd9e4 100644
--- a/src/wixext/BalCompiler.cs
+++ b/src/wixext/BalCompiler.cs
@@ -280,7 +280,7 @@ namespace WixToolset.Bal
         private void ParseConditionElement(Intermediate intermediate, IntermediateSection section, XElement node)
         {
             var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
-            var condition = this.ParseHelper.GetConditionInnerText(node); // condition is the inner text of the element.
+            string condition = null;
             string message = null;
 
             foreach (var attrib in node.Attributes())
@@ -292,6 +292,9 @@ namespace WixToolset.Bal
                         case "Message":
                             message = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
+                        case "Condition":
+                            condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(node, attrib);
                             break;
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index 5c743cd9..5657ffbd 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -1,27 +1,22 @@
 <!-- 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. -->
-<Project Sdk="WixToolset.Sdk">
-
+<Project Sdk="WixToolset.Sdk" ToolsVersion="4.0">
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <BindFiles>true</BindFiles>
     <Cultures>en-us</Cultures>
   </PropertyGroup>
-
   <ItemGroup>
     <BindInputPaths Include="..\wixstdba\Resources\" />
     <BindInputPaths Include="$(OutputPath)netcoreapp3.0" />
     <BindInputPaths Include="$(OutputPath)" />
-    <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
+    <BindInputPaths Include="$(OutputPath)Win32" BindName="x86" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\dnchost\dnchost.vcxproj" />
     <ProjectReference Include="..\mbahost\mbahost.vcxproj" />
     <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb