diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-16 21:52:31 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-16 22:01:33 +1000 |
commit | bb7b3dc1bc20629e04014b3f049cc30625a1a06c (patch) | |
tree | f8f1d17274294783da440659c941d74883ee049a /src/dnchost | |
parent | f5bb3cb1a730f9d3c2cbd5b3ab136354a8420c54 (diff) | |
download | wix-bb7b3dc1bc20629e04014b3f049cc30625a1a06c.tar.gz wix-bb7b3dc1bc20629e04014b3f049cc30625a1a06c.tar.bz2 wix-bb7b3dc1bc20629e04014b3f049cc30625a1a06c.zip |
WIXFEAT:6164 Update to latest balutil.
Diffstat (limited to 'src/dnchost')
-rw-r--r-- | src/dnchost/dnchost.vcxproj | 12 | ||||
-rw-r--r-- | src/dnchost/packages.config | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index e2b8b529..f61c084e 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj | |||
@@ -1,9 +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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
4 | <Import Project="..\..\packages\WixToolset.BalUtil.4.0.19\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.19\build\WixToolset.BalUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" /> |
5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" /> |
6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" /> | 6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" /> |
7 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
8 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
9 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
@@ -69,9 +69,9 @@ | |||
69 | <PropertyGroup> | 69 | <PropertyGroup> |
70 | <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> | 70 | <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> |
71 | </PropertyGroup> | 71 | </PropertyGroup> |
72 | <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.19\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.19\build\WixToolset.BalUtil.props'))" /> | 72 | <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props'))" /> |
73 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.15\build\WixToolset.BootstrapperCore.Native.props'))" /> | 73 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" /> |
74 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" /> | 74 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" /> |
75 | <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'))" /> | 75 | <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'))" /> |
76 | </Target> | 76 | </Target> |
77 | </Project> \ No newline at end of file | 77 | </Project> \ No newline at end of file |
diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index c8911ea5..fdcf876c 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config | |||
@@ -2,7 +2,7 @@ | |||
2 | <packages> | 2 | <packages> |
3 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" /> | 3 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" /> |
4 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> | 4 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> |
5 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.15" targetFramework="native" /> | 5 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> |
6 | <package id="WixToolset.BalUtil" version="4.0.19" targetFramework="native" /> | 6 | <package id="WixToolset.BalUtil" version="4.0.22" targetFramework="native" /> |
7 | <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" /> | 7 | <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" /> |
8 | </packages> \ No newline at end of file | 8 | </packages> \ No newline at end of file |