diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-27 02:09:47 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-27 02:09:47 -0700 |
| commit | 9cb68482fea8700bc3bf39139d8840dcabadbb6a (patch) | |
| tree | 5b4fdd67420214cd789a1a52292d986ea3c8121e /src | |
| parent | a58147fcf877d2b21d98f7fc8aae66be8eef7d45 (diff) | |
| download | wix-9cb68482fea8700bc3bf39139d8840dcabadbb6a.tar.gz wix-9cb68482fea8700bc3bf39139d8840dcabadbb6a.tar.bz2 wix-9cb68482fea8700bc3bf39139d8840dcabadbb6a.zip | |
Update to latest dutil and wcautil
Diffstat (limited to 'src')
| -rw-r--r-- | src/ca/netfxca.vcxproj | 8 | ||||
| -rw-r--r-- | src/ca/packages.config | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ca/netfxca.vcxproj b/src/ca/netfxca.vcxproj index b68c265b..dec54dca 100644 --- a/src/ca/netfxca.vcxproj +++ b/src/ca/netfxca.vcxproj | |||
| @@ -1,8 +1,8 @@ | |||
| 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.DUtil.4.0.26\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.26\build\WixToolset.DUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> |
| 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.13\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.13\build\WixToolset.WcaUtil.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" /> |
| 6 | <ItemGroup Label="ProjectConfigurations"> | 6 | <ItemGroup Label="ProjectConfigurations"> |
| 7 | <ProjectConfiguration Include="Debug|Win32"> | 7 | <ProjectConfiguration Include="Debug|Win32"> |
| 8 | <Configuration>Debug</Configuration> | 8 | <Configuration>Debug</Configuration> |
| @@ -70,7 +70,7 @@ | |||
| 70 | <PropertyGroup> | 70 | <PropertyGroup> |
| 71 | <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 | <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> |
| 72 | </PropertyGroup> | 72 | </PropertyGroup> |
| 73 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.26\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.26\build\WixToolset.DUtil.props'))" /> | 73 | <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'))" /> |
| 74 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.13\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.13\build\WixToolset.WcaUtil.props'))" /> | 74 | <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'))" /> |
| 75 | </Target> | 75 | </Target> |
| 76 | </Project> \ No newline at end of file | 76 | </Project> \ No newline at end of file |
diff --git a/src/ca/packages.config b/src/ca/packages.config index 3a296ead..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.26" targetFramework="native" /> | 3 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> |
| 4 | <package id="WixToolset.WcaUtil" version="4.0.13" 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 |