diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/examples/TestEngine/Example.TestEngine.vcxproj | 4 | ||||
| -rw-r--r-- | src/wixext/BalCompiler.cs | 5 | ||||
| -rw-r--r-- | src/wixlib/bal.wixproj | 11 |
3 files changed, 9 insertions, 11 deletions
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 @@ | |||
| 27 | <ConfigurationType>Application</ConfigurationType> | 27 | <ConfigurationType>Application</ConfigurationType> |
| 28 | <ProjectSubSystem>Console</ProjectSubSystem> | 28 | <ProjectSubSystem>Console</ProjectSubSystem> |
| 29 | <TargetName>Example.TestEngine</TargetName> | 29 | <TargetName>Example.TestEngine</TargetName> |
| 30 | <PlatformToolset>v141</PlatformToolset> | 30 | <PlatformToolset>v142</PlatformToolset> |
| 31 | <CharacterSet>Unicode</CharacterSet> | 31 | <CharacterSet>Unicode</CharacterSet> |
| 32 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | 32 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> |
| 33 | </PropertyGroup> | 33 | </PropertyGroup> |
| 34 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 34 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 35 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 35 | <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 | |||
| 280 | private void ParseConditionElement(Intermediate intermediate, IntermediateSection section, XElement node) | 280 | private void ParseConditionElement(Intermediate intermediate, IntermediateSection section, XElement node) |
| 281 | { | 281 | { |
| 282 | var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); | 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; | 284 | string message = null; |
| 285 | 285 | ||
| 286 | foreach (var attrib in node.Attributes()) | 286 | foreach (var attrib in node.Attributes()) |
| @@ -292,6 +292,9 @@ namespace WixToolset.Bal | |||
| 292 | case "Message": | 292 | case "Message": |
| 293 | message = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); | 293 | message = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); |
| 294 | break; | 294 | break; |
| 295 | case "Condition": | ||
| 296 | condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); | ||
| 297 | break; | ||
| 295 | default: | 298 | default: |
| 296 | this.ParseHelper.UnexpectedAttribute(node, attrib); | 299 | this.ParseHelper.UnexpectedAttribute(node, attrib); |
| 297 | break; | 300 | 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 @@ | |||
| 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. --> | 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"> | 2 | <Project Sdk="WixToolset.Sdk" ToolsVersion="4.0"> |
| 3 | |||
| 4 | <PropertyGroup> | 3 | <PropertyGroup> |
| 5 | <OutputType>Library</OutputType> | 4 | <OutputType>Library</OutputType> |
| 6 | <BindFiles>true</BindFiles> | 5 | <BindFiles>true</BindFiles> |
| 7 | <Cultures>en-us</Cultures> | 6 | <Cultures>en-us</Cultures> |
| 8 | </PropertyGroup> | 7 | </PropertyGroup> |
| 9 | |||
| 10 | <ItemGroup> | 8 | <ItemGroup> |
| 11 | <BindInputPaths Include="..\wixstdba\Resources\" /> | 9 | <BindInputPaths Include="..\wixstdba\Resources\" /> |
| 12 | <BindInputPaths Include="$(OutputPath)netcoreapp3.0" /> | 10 | <BindInputPaths Include="$(OutputPath)netcoreapp3.0" /> |
| 13 | <BindInputPaths Include="$(OutputPath)" /> | 11 | <BindInputPaths Include="$(OutputPath)" /> |
| 14 | <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' /> | 12 | <BindInputPaths Include="$(OutputPath)Win32" BindName="x86" /> |
| 15 | </ItemGroup> | 13 | </ItemGroup> |
| 16 | |||
| 17 | <ItemGroup> | 14 | <ItemGroup> |
| 18 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" /> | 15 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" /> |
| 19 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" /> | 16 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" /> |
| 20 | <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" /> | 17 | <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" /> |
| 21 | </ItemGroup> | 18 | </ItemGroup> |
| 22 | |||
| 23 | <ItemGroup> | 19 | <ItemGroup> |
| 24 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> | 20 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> |
| 25 | </ItemGroup> | 21 | </ItemGroup> |
| 26 | 22 | </Project> \ No newline at end of file | |
| 27 | </Project> | ||
