aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Arnson <bob@joyofsetup.com>2020-06-07 22:49:35 -0400
committerBob Arnson <bob@joyofsetup.com>2020-06-07 22:49:35 -0400
commit864d9ef13f33ded262a593c0c66e2463aef7a38a (patch)
tree1e109b16d63dcb4e9fda34c2e969df0e275824b5 /src
parentabfe02f2e31480f2cfb72b3daa641d7e723448d9 (diff)
downloadwix-864d9ef13f33ded262a593c0c66e2463aef7a38a.tar.gz
wix-864d9ef13f33ded262a593c0c66e2463aef7a38a.tar.bz2
wix-864d9ef13f33ded262a593c0c66e2463aef7a38a.zip
Update to latest tools
Diffstat (limited to 'src')
-rw-r--r--src/wixlib/bal.wixproj14
-rw-r--r--src/wixlib/packages.config2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index 23b52788..c7c9a5c3 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -1,8 +1,9 @@
1<?xml version="1.0" encoding="utf-8" ?> 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. --> 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"> 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-0101\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props')" /> 4 <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props" />
5 <Import Project="..\FindLocalWix.props" /> 5 <Import Project="..\FindLocalWix.props" />
6
6 <PropertyGroup> 7 <PropertyGroup>
7 <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid> 8 <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
8 <OutputName>bal</OutputName> 9 <OutputName>bal</OutputName>
@@ -47,17 +48,16 @@
47 <Project>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</Project> 48 <Project>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</Project>
48 </ProjectReference> 49 </ProjectReference>
49 </ItemGroup> 50 </ItemGroup>
51
50 <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " /> 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') " /> 53
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>
55 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 54 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
56 <PropertyGroup> 55 <PropertyGroup>
57 <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> 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>
58 </PropertyGroup> 57 </PropertyGroup>
59 <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'))" /> 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'))" />
61 </Target> 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')" /> 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> 63</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index 9190b5d0..6e79c4c9 100644
--- a/src/wixlib/packages.config
+++ b/src/wixlib/packages.config
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> 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 5</packages> \ No newline at end of file