aboutsummaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-03-30 19:04:12 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-03-30 21:59:51 -0500
commit5cbe372f0a512babc5db7f519fc407eb40606346 (patch)
tree3b89c7662af4026df104abf4119c9042b78c05b6 /src/engine
parent65b905667b8567cd9b40c220eb18bd729276e7a6 (diff)
downloadwix-5cbe372f0a512babc5db7f519fc407eb40606346.tar.gz
wix-5cbe372f0a512babc5db7f519fc407eb40606346.tar.bz2
wix-5cbe372f0a512babc5db7f519fc407eb40606346.zip
Rename cache types in the manifest to remove, keep, force.
Contributes to #5125
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/engine.vcxproj4
-rw-r--r--src/engine/package.cpp6
-rw-r--r--src/engine/packages.config2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/engine.vcxproj b/src/engine/engine.vcxproj
index 263edf12..e418e6f4 100644
--- a/src/engine/engine.vcxproj
+++ b/src/engine/engine.vcxproj
@@ -1,7 +1,7 @@
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.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" /> 4 <Import Project="..\..\packages\WixToolset.DUtil.4.0.65\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.65\build\WixToolset.DUtil.props')" />
5 <ItemGroup Label="ProjectConfigurations"> 5 <ItemGroup Label="ProjectConfigurations">
6 <ProjectConfiguration Include="Debug|Win32"> 6 <ProjectConfiguration Include="Debug|Win32">
7 <Configuration>Debug</Configuration> 7 <Configuration>Debug</Configuration>
@@ -165,7 +165,7 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
165 <PropertyGroup> 165 <PropertyGroup>
166 <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> 166 <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>
167 </PropertyGroup> 167 </PropertyGroup>
168 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" /> 168 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.65\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.65\build\WixToolset.DUtil.props'))" />
169 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> 169 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
170 </Target> 170 </Target>
171</Project> \ No newline at end of file 171</Project> \ No newline at end of file
diff --git a/src/engine/package.cpp b/src/engine/package.cpp
index 124b356b..6ff59fe4 100644
--- a/src/engine/package.cpp
+++ b/src/engine/package.cpp
@@ -116,15 +116,15 @@ extern "C" HRESULT PackagesParseFromXml(
116 hr = XmlGetAttributeEx(pixnNode, L"Cache", &scz); 116 hr = XmlGetAttributeEx(pixnNode, L"Cache", &scz);
117 if (SUCCEEDED(hr)) 117 if (SUCCEEDED(hr))
118 { 118 {
119 if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"no", -1)) 119 if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"remove", -1))
120 { 120 {
121 pPackage->cacheType = BURN_CACHE_TYPE_NO; 121 pPackage->cacheType = BURN_CACHE_TYPE_NO;
122 } 122 }
123 else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"yes", -1)) 123 else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"keep", -1))
124 { 124 {
125 pPackage->cacheType = BURN_CACHE_TYPE_YES; 125 pPackage->cacheType = BURN_CACHE_TYPE_YES;
126 } 126 }
127 else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"always", -1)) 127 else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"force", -1))
128 { 128 {
129 pPackage->cacheType = BURN_CACHE_TYPE_ALWAYS; 129 pPackage->cacheType = BURN_CACHE_TYPE_ALWAYS;
130 } 130 }
diff --git a/src/engine/packages.config b/src/engine/packages.config
index 56c62f29..84e3078b 100644
--- a/src/engine/packages.config
+++ b/src/engine/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="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> 3 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4 <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" /> 4 <package id="WixToolset.DUtil" version="4.0.65" targetFramework="native" />
5</packages> \ No newline at end of file 5</packages> \ No newline at end of file