diff options
author | Rob Mensching <rob@firegiant.com> | 2020-06-27 14:37:22 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2020-06-27 14:43:36 -0700 |
commit | 786575c5358b4ff48cb4cf354a5b66e4017418ff (patch) | |
tree | 6a139720bd0fee77d9c64cf8a87d2b4672839f0f | |
parent | b8c2c14a4dcd499efbc1a4740eb0bb786d1f8c60 (diff) | |
download | wix-786575c5358b4ff48cb4cf354a5b66e4017418ff.tar.gz wix-786575c5358b4ff48cb4cf354a5b66e4017418ff.tar.bz2 wix-786575c5358b4ff48cb4cf354a5b66e4017418ff.zip |
Update to latest dutil and wcautil
-rw-r--r-- | src/ca/httpca.vcxproj | 8 | ||||
-rw-r--r-- | src/ca/packages.config | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ca/httpca.vcxproj b/src/ca/httpca.vcxproj index 5d140f0b..aa88d62e 100644 --- a/src/ca/httpca.vcxproj +++ b/src/ca/httpca.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.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\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.8\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.8\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"> |
@@ -56,7 +56,7 @@ | |||
56 | <PropertyGroup> | 56 | <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> | 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> |
58 | </PropertyGroup> | 58 | </PropertyGroup> |
59 | <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'))" /> | 59 | <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'))" /> |
60 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props'))" /> | 60 | <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'))" /> |
61 | </Target> | 61 | </Target> |
62 | </Project> | 62 | </Project> |
diff --git a/src/ca/packages.config b/src/ca/packages.config index 4e9403bf..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.18" targetFramework="native" /> | 3 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> |
4 | <package id="WixToolset.WcaUtil" version="4.0.8" 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 |