Update to latest tools
Bob Arnson committed
Jun 7, 2020 at 22:49 UTC
864d9ef13f33ded262a593c0c66e2463aef7a38a
3 files changed
+11
-8
appveyor.cmd
+3
@@ -10,5 +10,8 @@ msbuild -p:Configuration=Release
10
msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Bal.wixext.csproj
11
msbuild -p:Configuration=Release -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj
12
13
+msbuild -p:Configuration=Release src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj
14
+dotnet test -c Release --no-build src\test\WixToolsetTest.Bal
15
+
16
@popd
17
@endlocal
\ No newline at end of file
src/wixlib/bal.wixproj
+7
-7
@@ -1,8 +1,9 @@
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-0101\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props')" />
3
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
+ <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props" />
5
<Import Project="..\FindLocalWix.props" />
6
+
7
<PropertyGroup>
8
<ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
9
<OutputName>bal</OutputName>
@@ -47,17 +48,16 @@
48
<Project>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</Project>
49
</ProjectReference>
50
</ItemGroup>
51
+
52
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
51
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
52
- <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
53
- <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
54
- </Target>
53
+
54
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
55
<PropertyGroup>
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'))" />
60
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props'))" />
59
+ <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props'))" />
60
</Target>
61
+
62
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
63
</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-0101" developmentDependency="true" targetFramework="net40" />
4
+ <package id="WixToolset.MSBuild" version="4.0.0-build-0126" developmentDependency="true" targetFramework="net40" />
5
</packages>
\ No newline at end of file