diff options
author | Rob Mensching <rob@firegiant.com> | 2020-06-27 15:11:16 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2020-06-27 15:14:32 -0700 |
commit | 9388b29e0745de390ca15e5e113326ac59d8b34c (patch) | |
tree | b887dbf234276c5cdee058faa53f4ef061821f91 | |
parent | c8481ac86c8b00b0b2085c2a3c8dc97f921d4003 (diff) | |
download | wix-9388b29e0745de390ca15e5e113326ac59d8b34c.tar.gz wix-9388b29e0745de390ca15e5e113326ac59d8b34c.tar.bz2 wix-9388b29e0745de390ca15e5e113326ac59d8b34c.zip |
Update to latest dutil and wcautil
-rw-r--r-- | src/ca/iisca.vcxproj | 8 | ||||
-rw-r--r-- | src/ca/packages.config | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ca/iisca.vcxproj b/src/ca/iisca.vcxproj index 70ec61f1..893130ed 100644 --- a/src/ca/iisca.vcxproj +++ b/src/ca/iisca.vcxproj | |||
@@ -2,8 +2,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 | 3 | ||
4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> |
6 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.11\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.11\build\WixToolset.WcaUtil.props')" /> | 6 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" /> |
7 | 7 | ||
8 | <ItemGroup Label="ProjectConfigurations"> | 8 | <ItemGroup Label="ProjectConfigurations"> |
9 | <ProjectConfiguration Include="Debug|Win32"> | 9 | <ProjectConfiguration Include="Debug|Win32"> |
@@ -132,7 +132,7 @@ | |||
132 | <PropertyGroup> | 132 | <PropertyGroup> |
133 | <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> | 133 | <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> |
134 | </PropertyGroup> | 134 | </PropertyGroup> |
135 | <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'))" /> | 135 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> |
136 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.11\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.11\build\WixToolset.WcaUtil.props'))" /> | 136 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" /> |
137 | </Target> | 137 | </Target> |
138 | </Project> | 138 | </Project> |
diff --git a/src/ca/packages.config b/src/ca/packages.config index 97a06c72..e3dc0e43 100644 --- a/src/ca/packages.config +++ b/src/ca/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="WixToolset.DUtil" version="4.0.23" targetFramework="native" /> | 3 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> |
4 | <package id="WixToolset.WcaUtil" version="4.0.11" targetFramework="native" /> | 4 | <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" /> |
5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |