diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-27 13:46:23 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-27 13:46:23 -0700 |
| commit | b38e2bfb0fe419155df164e2bcefbbe34bad6a70 (patch) | |
| tree | 3f181f9e120e9be94665b789f2fe97a69f52c1d6 /src | |
| parent | 5b85ba2b9823f4b6db4f5c4bff96a27cd41d39f8 (diff) | |
| download | wix-b38e2bfb0fe419155df164e2bcefbbe34bad6a70.tar.gz wix-b38e2bfb0fe419155df164e2bcefbbe34bad6a70.tar.bz2 wix-b38e2bfb0fe419155df164e2bcefbbe34bad6a70.zip | |
Update to latest dutil and wcautil
Diffstat (limited to 'src')
| -rw-r--r-- | src/ca/fwca.vcxproj | 8 | ||||
| -rw-r--r-- | src/ca/packages.config | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ca/fwca.vcxproj b/src/ca/fwca.vcxproj index c2addf82..f35e7177 100644 --- a/src/ca/fwca.vcxproj +++ b/src/ca/fwca.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|ARM"> | 9 | <ProjectConfiguration Include="Debug|ARM"> |
| @@ -84,7 +84,7 @@ | |||
| 84 | <PropertyGroup> | 84 | <PropertyGroup> |
| 85 | <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> | 85 | <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> |
| 86 | </PropertyGroup> | 86 | </PropertyGroup> |
| 87 | <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'))" /> | 87 | <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'))" /> |
| 88 | <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'))" /> | 88 | <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'))" /> |
| 89 | </Target> | 89 | </Target> |
| 90 | </Project> | 90 | </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 |