From 2a27f9032aa115bc2f88d9be695d9b049db1a894 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 11 Aug 2018 01:06:40 -0700 Subject: Track files to enable clean builds in MSBuild --- .../Bind/CabinetResolver.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs index 759fa586..541dacf8 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs @@ -48,7 +48,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // to be built to and check if there is a cabinet that can be reused. if (!String.IsNullOrEmpty(this.CabCachePath)) { - string cabinetName = Path.GetFileName(cabinetPath); + var cabinetName = Path.GetFileName(cabinetPath); resolved.Path = Path.Combine(this.CabCachePath, cabinetName); if (CheckFileExists(resolved.Path)) @@ -57,10 +57,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind // 1. any files are added or removed // 2. order of files changed or names changed // 3. modified time changed - bool cabinetValid = true; + var cabinetValid = true; var cabinet = new Cabinet(resolved.Path); - List fileList = cabinet.Enumerate(); + var fileList = cabinet.Enumerate(); if (filesWithPath.Count() != fileList.Count) { @@ -68,16 +68,16 @@ namespace WixToolset.Core.WindowsInstaller.Bind } else { - int i = 0; - foreach (BindFileWithPath file in filesWithPath) + var i = 0; + foreach (var file in filesWithPath) { // First check that the file identifiers match because that is quick and easy. - CabinetFileInfo cabFileInfo = fileList[i]; + var cabFileInfo = fileList[i]; cabinetValid = (cabFileInfo.FileId == file.Id); if (cabinetValid) { // Still valid so ensure the file sizes are the same. - FileInfo fileInfo = new FileInfo(file.Path); + var fileInfo = new FileInfo(file.Path); cabinetValid = (cabFileInfo.Size == fileInfo.Length); if (cabinetValid) { -- cgit v1.2.3-55-g6feb