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.

---
 src/test/examples/TestEngine/Example.TestEngine.vcxproj |  4 ++--
 src/wixext/BalCompiler.cs                               |  5 ++++-
 src/wixlib/bal.wixproj                                  | 11 +++--------
 3 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src')

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