From 31c583067b6c9063db4d3f5b8645d20748d67357 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 18 Nov 2017 13:10:53 -0800 Subject: [PATCH 01/12] WiX v3.11.1 --- tools/WixBuild.Version.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/WixBuild.Version.targets b/tools/WixBuild.Version.targets index 8ecfbaf98..51220bc80 100644 --- a/tools/WixBuild.Version.targets +++ b/tools/WixBuild.Version.targets @@ -7,7 +7,7 @@ 3 11 2016 - 0 + 1 $(MajorBuildNumber)$(MinorBuildNumber) $(MajorBuildNumber).$(MinorBuildNumber) From 19b5f04faee39aadce9697550d2a0e75ab478afd Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 18 Nov 2017 13:09:13 -0800 Subject: [PATCH 02/12] When elevated place clean room in system Temp folder To prevent DLL hijacking the clean room process when launched elevated, the system Temp folder will be used instead of the user's temp folder. This ensures the user cannot slip malicious DLLs into the clean room. Fixes wixtoolset/issues#5724 --- history/5724.md | 1 + src/burn/engine/cache.cpp | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 history/5724.md diff --git a/history/5724.md b/history/5724.md new file mode 100644 index 000000000..588855e8a --- /dev/null +++ b/history/5724.md @@ -0,0 +1 @@ +* RobMen - WIXBUG:5724 - fix DLL hijack of clean room when bundle launched elevated. diff --git a/src/burn/engine/cache.cpp b/src/burn/engine/cache.cpp index fd9a43889..46dc4146f 100644 --- a/src/burn/engine/cache.cpp +++ b/src/burn/engine/cache.cpp @@ -1104,13 +1104,29 @@ static HRESULT CalculateWorkingFolder( { HRESULT hr = S_OK; RPC_STATUS rs = RPC_S_OK; + BOOL fElevated = FALSE; WCHAR wzTempPath[MAX_PATH] = { }; UUID guid = {}; WCHAR wzGuid[39]; if (!vsczWorkingFolder) { - if (0 == ::GetTempPathW(countof(wzTempPath), wzTempPath)) + ProcElevated(::GetCurrentProcess(), &fElevated); + + if (fElevated) + { + if (!::GetWindowsDirectoryW(wzTempPath, countof(wzTempPath))) + { + ExitWithLastError(hr, "Failed to get windows path for working folder."); + } + + hr = PathFixedBackslashTerminate(wzTempPath, countof(wzTempPath)); + ExitOnFailure(hr, "Failed to ensure windows path for working folder ended in backslash."); + + hr = ::StringCchCatW(wzTempPath, countof(wzTempPath), L"Temp\\"); + ExitOnFailure(hr, "Failed to concat Temp directory on windows path for working folder."); + } + else if (0 == ::GetTempPathW(countof(wzTempPath), wzTempPath)) { ExitWithLastError(hr, "Failed to get temp path for working folder."); } From eb1da27165e5cbfdff664158d03b41bce01ca0da Mon Sep 17 00:00:00 2001 From: WixBuild Date: Sat, 18 Nov 2017 14:04:57 -0800 Subject: [PATCH 03/12] WixBuild: Version 3.11.1.2318 --- History.md | 4 ++++ history/5724.md | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 history/5724.md diff --git a/History.md b/History.md index 156fbb62e..c74fde8f3 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,7 @@ +## WixBuild: Version 3.11.1.2318 + +* RobMen - WIXBUG:5724 - fix DLL hijack of clean room when bundle launched elevated. + ## WixBuild: Version 3.11.0.1701 * RobMen: WIXBUG:5536 - introduce wix.nativeca.targets to simplify CPP CA projects. diff --git a/history/5724.md b/history/5724.md deleted file mode 100644 index 588855e8a..000000000 --- a/history/5724.md +++ /dev/null @@ -1 +0,0 @@ -* RobMen - WIXBUG:5724 - fix DLL hijack of clean room when bundle launched elevated. From d7bb6992bc3d00f5dc672a66a7664c37f47890b5 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 15 Sep 2019 06:54:08 -0700 Subject: [PATCH 04/12] WiX v3.11.2 --- tools/WixBuild.Version.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/WixBuild.Version.targets b/tools/WixBuild.Version.targets index 51220bc80..a0b446bc5 100644 --- a/tools/WixBuild.Version.targets +++ b/tools/WixBuild.Version.targets @@ -7,7 +7,7 @@ 3 11 2016 - 1 + 2 $(MajorBuildNumber)$(MinorBuildNumber) $(MajorBuildNumber).$(MinorBuildNumber) From cff610d8672faacc45b7157629666a866f636961 Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Mon, 18 Mar 2019 13:40:56 -0700 Subject: [PATCH 05/12] Sign binaries redistrubted with customers' bundles Fixes #5329. Only managed and native binaries that would ship within bundles are signed when requested. --- src/ext/BalExtension/mba/core/core.csproj | 1 + tools/Dotnet.targets | 60 +++++++++++++++++++++++ tools/WixBuild.Signing.targets | 57 +++++++++++++++++++++ tools/WixBuild.Tools.targets | 13 +++++ tools/WixBuild.props | 1 + tools/WixBuild.targets | 1 + tools/WixBuild.vcxproj.props | 1 + tools/WixBuild.wixproj.targets | 33 ------------- tools/appsettings.json | 13 +++++ tools/signing-filter.none.txt | 1 + 10 files changed, 148 insertions(+), 33 deletions(-) create mode 100644 tools/Dotnet.targets create mode 100644 tools/WixBuild.Signing.targets create mode 100644 tools/appsettings.json create mode 100644 tools/signing-filter.none.txt diff --git a/src/ext/BalExtension/mba/core/core.csproj b/src/ext/BalExtension/mba/core/core.csproj index 7c1b7a3cb..7162fbe75 100644 --- a/src/ext/BalExtension/mba/core/core.csproj +++ b/src/ext/BalExtension/mba/core/core.csproj @@ -14,6 +14,7 @@ true true true + true diff --git a/tools/Dotnet.targets b/tools/Dotnet.targets new file mode 100644 index 000000000..aa378082d --- /dev/null +++ b/tools/Dotnet.targets @@ -0,0 +1,60 @@ + + + + + + + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\)) + $(WixRoot)packages\tools\ + $(ProgramW6432)\dotnet\dotnet.exe + $(MSBuildProgramFiles32)\dotnet\dotnet.exe + + + + $(DotnetToolsFolder)SignClient.exe + + + + + + 1.1.7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + diff --git a/tools/WixBuild.Signing.targets b/tools/WixBuild.Signing.targets new file mode 100644 index 000000000..e008147e0 --- /dev/null +++ b/tools/WixBuild.Signing.targets @@ -0,0 +1,57 @@ + + + + + + + + + + <_SigningAppSettingsPath>$(MSBuildThisFileDirectory)appsettings.json + <_SigningFilterNonePath>$(MSBuildThisFileDirectory)signing-filter.none.txt + <_SigningName>WiX Toolset + <_SigningUrl>http://wixtoolset.org + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + diff --git a/tools/WixBuild.Tools.targets b/tools/WixBuild.Tools.targets index 18ea19b93..822acc9ca 100644 --- a/tools/WixBuild.Tools.targets +++ b/tools/WixBuild.Tools.targets @@ -15,6 +15,9 @@ + + + diff --git a/tools/WixBuild.targets b/tools/WixBuild.targets index de6d4c5aa..75cc861b5 100644 --- a/tools/WixBuild.targets +++ b/tools/WixBuild.targets @@ -6,6 +6,7 @@ + diff --git a/tools/WixBuild.vcxproj.props b/tools/WixBuild.vcxproj.props index 580045d31..27a35bea2 100644 --- a/tools/WixBuild.vcxproj.props +++ b/tools/WixBuild.vcxproj.props @@ -48,6 +48,7 @@ $(OutDir)$(MultiTargetDirSuffix)\ $(OutputPath)$(MultiTargetDirSuffix)\ + true diff --git a/tools/WixBuild.wixproj.targets b/tools/WixBuild.wixproj.targets index 3510a8047..e96926cfb 100644 --- a/tools/WixBuild.wixproj.targets +++ b/tools/WixBuild.wixproj.targets @@ -3,41 +3,8 @@ - - "$(PlatformSdkBinPath)signtool.exe" - - - - - - - - - - - - - - - - - - - - - - - - $(PrepareForBuildDependsOn); diff --git a/tools/appsettings.json b/tools/appsettings.json new file mode 100644 index 000000000..fe1c8c9b1 --- /dev/null +++ b/tools/appsettings.json @@ -0,0 +1,13 @@ +{ + "SignClient": { + "AzureAd": { + "AADInstance": "https://login.microsoftonline.com/", + "ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8", + "TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e" + }, + "Service": { + "Url": "https://codesign.dotnetfoundation.org/", + "ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001" + } + } +} diff --git a/tools/signing-filter.none.txt b/tools/signing-filter.none.txt new file mode 100644 index 000000000..44804a634 --- /dev/null +++ b/tools/signing-filter.none.txt @@ -0,0 +1 @@ +sign-no-files From bedf8fb331fa7749ac0c3ae48d1a032222741e9c Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Wed, 20 Mar 2019 15:40:34 -0700 Subject: [PATCH 06/12] Use ShouldSignObject in projects directly Resolves feedback for issue #5329 --- src/DTF/Libraries/Compression.Cab/Compression.Cab.csproj | 1 + src/DTF/Libraries/Compression.Zip/Compression.Zip.csproj | 1 + src/DTF/Libraries/Compression/Compression.csproj | 1 + src/DTF/Libraries/Resources/Resources.csproj | 1 + .../WindowsInstaller.Linq/WindowsInstaller.Linq.csproj | 1 + .../WindowsInstaller.Package/WindowsInstaller.Package.csproj | 1 + src/DTF/Libraries/WindowsInstaller/WindowsInstaller.csproj | 1 + src/DTF/Tools/SfxCA/SfxCA.vcxproj | 1 + src/ext/BalExtension/mba/core/core.csproj | 2 +- tools/WixBuild.csproj.targets | 1 + tools/WixBuild.vcxproj.props | 2 +- tools/WixBuild.vcxproj.targets | 1 + 12 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/DTF/Libraries/Compression.Cab/Compression.Cab.csproj b/src/DTF/Libraries/Compression.Cab/Compression.Cab.csproj index cf725598a..0a225dad4 100644 --- a/src/DTF/Libraries/Compression.Cab/Compression.Cab.csproj +++ b/src/DTF/Libraries/Compression.Cab/Compression.Cab.csproj @@ -12,6 +12,7 @@ true v2.0 false + true diff --git a/src/DTF/Libraries/Compression.Zip/Compression.Zip.csproj b/src/DTF/Libraries/Compression.Zip/Compression.Zip.csproj index e4fe7e30b..84dda1a46 100644 --- a/src/DTF/Libraries/Compression.Zip/Compression.Zip.csproj +++ b/src/DTF/Libraries/Compression.Zip/Compression.Zip.csproj @@ -11,6 +11,7 @@ Microsoft.Deployment.Compression.Zip true v2.0 + true diff --git a/src/DTF/Libraries/Compression/Compression.csproj b/src/DTF/Libraries/Compression/Compression.csproj index 53f8ac35f..c19a299d0 100644 --- a/src/DTF/Libraries/Compression/Compression.csproj +++ b/src/DTF/Libraries/Compression/Compression.csproj @@ -12,6 +12,7 @@ true v2.0 false + true diff --git a/src/DTF/Libraries/Resources/Resources.csproj b/src/DTF/Libraries/Resources/Resources.csproj index 5d8713293..8295e6719 100644 --- a/src/DTF/Libraries/Resources/Resources.csproj +++ b/src/DTF/Libraries/Resources/Resources.csproj @@ -10,6 +10,7 @@ Microsoft.Deployment.Resources v2.0 true + true diff --git a/src/DTF/Libraries/WindowsInstaller.Linq/WindowsInstaller.Linq.csproj b/src/DTF/Libraries/WindowsInstaller.Linq/WindowsInstaller.Linq.csproj index 8f5af668e..cc8a05e88 100644 --- a/src/DTF/Libraries/WindowsInstaller.Linq/WindowsInstaller.Linq.csproj +++ b/src/DTF/Libraries/WindowsInstaller.Linq/WindowsInstaller.Linq.csproj @@ -11,6 +11,7 @@ Microsoft.Deployment.WindowsInstaller.Linq true v3.5 + true diff --git a/src/DTF/Libraries/WindowsInstaller.Package/WindowsInstaller.Package.csproj b/src/DTF/Libraries/WindowsInstaller.Package/WindowsInstaller.Package.csproj index e96273f35..eee4c8e85 100644 --- a/src/DTF/Libraries/WindowsInstaller.Package/WindowsInstaller.Package.csproj +++ b/src/DTF/Libraries/WindowsInstaller.Package/WindowsInstaller.Package.csproj @@ -11,6 +11,7 @@ Microsoft.Deployment.WindowsInstaller.Package v2.0 true + true diff --git a/src/DTF/Libraries/WindowsInstaller/WindowsInstaller.csproj b/src/DTF/Libraries/WindowsInstaller/WindowsInstaller.csproj index 047f390fd..e1db4063f 100644 --- a/src/DTF/Libraries/WindowsInstaller/WindowsInstaller.csproj +++ b/src/DTF/Libraries/WindowsInstaller/WindowsInstaller.csproj @@ -11,6 +11,7 @@ Microsoft.Deployment.WindowsInstaller v2.0 true + true diff --git a/src/DTF/Tools/SfxCA/SfxCA.vcxproj b/src/DTF/Tools/SfxCA/SfxCA.vcxproj index 2c132bff3..b01e34df6 100644 --- a/src/DTF/Tools/SfxCA/SfxCA.vcxproj +++ b/src/DTF/Tools/SfxCA/SfxCA.vcxproj @@ -30,6 +30,7 @@ SfxCA Unicode EntryPoints.def + true diff --git a/src/ext/BalExtension/mba/core/core.csproj b/src/ext/BalExtension/mba/core/core.csproj index 7162fbe75..acca4f8e6 100644 --- a/src/ext/BalExtension/mba/core/core.csproj +++ b/src/ext/BalExtension/mba/core/core.csproj @@ -14,7 +14,7 @@ true true true - true + true diff --git a/tools/WixBuild.csproj.targets b/tools/WixBuild.csproj.targets index f71ade5ca..fcd35b224 100644 --- a/tools/WixBuild.csproj.targets +++ b/tools/WixBuild.csproj.targets @@ -11,5 +11,6 @@ $(PrepareForBuildDependsOn); WriteCSharpVersionFile + true diff --git a/tools/WixBuild.vcxproj.props b/tools/WixBuild.vcxproj.props index 27a35bea2..1364ee99d 100644 --- a/tools/WixBuild.vcxproj.props +++ b/tools/WixBuild.vcxproj.props @@ -48,7 +48,7 @@ $(OutDir)$(MultiTargetDirSuffix)\ $(OutputPath)$(MultiTargetDirSuffix)\ - true + true diff --git a/tools/WixBuild.vcxproj.targets b/tools/WixBuild.vcxproj.targets index 1f2cac98e..307561fbd 100644 --- a/tools/WixBuild.vcxproj.targets +++ b/tools/WixBuild.vcxproj.targets @@ -11,5 +11,6 @@ WriteCppVersionFile; GenerateWixInclude + true From 7b64563e601296957df410fc48ffcbcf50cd3ff6 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 8 Apr 2019 16:39:06 -0700 Subject: [PATCH 07/12] Add history entry for signing service support --- history/sign.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 history/sign.md diff --git a/history/sign.md b/history/sign.md new file mode 100644 index 000000000..d53c3f903 --- /dev/null +++ b/history/sign.md @@ -0,0 +1 @@ +* HeathS: Add support for .NET Foundation signing service \ No newline at end of file From 3b16f678e9384ed156030a4e78662259322f9d41 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 12 Sep 2019 12:07:12 -0700 Subject: [PATCH 08/12] Prevent Zip Slip when using ArchiveFileStreamContext to decompress Fixes wixtoolset/issues#6075 --- history/zipslip.md | 1 + .../Compression/ArchiveFileStreamContext.cs | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 history/zipslip.md diff --git a/history/zipslip.md b/history/zipslip.md new file mode 100644 index 000000000..4aba4497e --- /dev/null +++ b/history/zipslip.md @@ -0,0 +1 @@ +* RobMen: WIXBUG:6075 - Fix "Zip Slip" vulnerability in DTF. \ No newline at end of file diff --git a/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs b/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs index b082a1b9a..35832a575 100644 --- a/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs +++ b/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs @@ -638,6 +638,8 @@ private string TranslateFilePath(string path) if (filePath != null) { + this.ValidateArchivePath(filePath); + if (this.directory != null) { filePath = Path.Combine(this.directory, filePath); @@ -647,6 +649,16 @@ private string TranslateFilePath(string path) return filePath; } + private void ValidateArchivePath(string filePath) + { + string basePath = Path.GetFullPath(String.IsNullOrEmpty(this.directory) ? Environment.CurrentDirectory : this.directory); + string path = Path.GetFullPath(Path.Combine(basePath, filePath)); + if (!path.StartsWith(basePath, StringComparison.InvariantCultureIgnoreCase)) + { + throw new InvalidDataException("Archive cannot contain files with absolute or traversal paths."); + } + } + #endregion } } From 14fa226eccb36dc0224cbc0893b6c37909369bfb Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 16 Sep 2019 12:36:28 -0700 Subject: [PATCH 09/12] Fixes Zip Slip fix break when using ArchiveFileStreamContext to compress Fixes wixtoolset/issues#6075 --- src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs b/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs index 35832a575..b17d3f2a8 100644 --- a/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs +++ b/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs @@ -633,13 +633,13 @@ private string TranslateFilePath(string path) } else { + this.ValidateArchivePath(path); + filePath = path; } if (filePath != null) { - this.ValidateArchivePath(filePath); - if (this.directory != null) { filePath = Path.Combine(this.directory, filePath); From 2c19a69798b78571255efa6dbb5fd33a5f4882e7 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 16 Sep 2019 17:09:14 -0700 Subject: [PATCH 10/12] Refine build order in light of MSBuild ProjectReference protocol changes --- src/ext/DifxAppExtension/difxapp.proj | 6 ++++++ src/ext/UtilExtension/util.proj | 2 +- src/ext/VSExtension/vs.proj | 2 +- src/ext/ext.proj | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ext/DifxAppExtension/difxapp.proj b/src/ext/DifxAppExtension/difxapp.proj index 6c4e7dd19..1bf5473b3 100644 --- a/src/ext/DifxAppExtension/difxapp.proj +++ b/src/ext/DifxAppExtension/difxapp.proj @@ -4,6 +4,12 @@ + + Platform=x86 + + + Platform=x64 + diff --git a/src/ext/UtilExtension/util.proj b/src/ext/UtilExtension/util.proj index 488857cd5..0462f654c 100644 --- a/src/ext/UtilExtension/util.proj +++ b/src/ext/UtilExtension/util.proj @@ -4,8 +4,8 @@ - + diff --git a/src/ext/VSExtension/vs.proj b/src/ext/VSExtension/vs.proj index 2612e88a5..553ccdbf5 100644 --- a/src/ext/VSExtension/vs.proj +++ b/src/ext/VSExtension/vs.proj @@ -5,8 +5,8 @@ - + diff --git a/src/ext/ext.proj b/src/ext/ext.proj index 72c766c89..16679ccff 100644 --- a/src/ext/ext.proj +++ b/src/ext/ext.proj @@ -11,6 +11,8 @@ false + + @@ -27,7 +29,6 @@ - From 473562c0c3904216f2b6963c0ad244a8cc41e9ee Mon Sep 17 00:00:00 2001 From: WixBuild Date: Mon, 16 Sep 2019 22:41:18 -0700 Subject: [PATCH 11/12] WixBuild: Version 3.11.2.4516 --- History.md | 6 ++++++ history/sign.md | 1 - history/zipslip.md | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 history/sign.md delete mode 100644 history/zipslip.md diff --git a/History.md b/History.md index c74fde8f3..931f43f91 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,9 @@ +## WixBuild: Version 3.11.2.4516 + +* HeathS: Add support for .NET Foundation signing service + +* RobMen: WIXBUG:6075 - Fix "Zip Slip" vulnerability in DTF. + ## WixBuild: Version 3.11.1.2318 * RobMen - WIXBUG:5724 - fix DLL hijack of clean room when bundle launched elevated. diff --git a/history/sign.md b/history/sign.md deleted file mode 100644 index d53c3f903..000000000 --- a/history/sign.md +++ /dev/null @@ -1 +0,0 @@ -* HeathS: Add support for .NET Foundation signing service \ No newline at end of file diff --git a/history/zipslip.md b/history/zipslip.md deleted file mode 100644 index 4aba4497e..000000000 --- a/history/zipslip.md +++ /dev/null @@ -1 +0,0 @@ -* RobMen: WIXBUG:6075 - Fix "Zip Slip" vulnerability in DTF. \ No newline at end of file From add0a0a8f6ddd35070c9fd171fb6ad02cea6657b Mon Sep 17 00:00:00 2001 From: Coder686375 Date: Tue, 6 Jul 2021 14:30:41 -0400 Subject: [PATCH 12/12] WIXBUG:2691 - Extend horizontal lines by 3 pixels --- src/ext/UIExtension/wixlib/AdvancedWelcomeEulaDlg.wxs | 2 +- src/ext/UIExtension/wixlib/BrowseDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/CustomizeDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/DiskCostDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/ExitDialog.wxs | 2 +- src/ext/UIExtension/wixlib/FatalError.wxs | 2 +- src/ext/UIExtension/wixlib/FeaturesDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/FilesInUse.wxs | 4 ++-- src/ext/UIExtension/wixlib/InstallDirDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/InstallScopeDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/LicenseAgreementDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/MaintenanceTypeDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/MaintenanceWelcomeDlg.wxs | 2 +- src/ext/UIExtension/wixlib/MsiRMFilesInUse.wxs | 4 ++-- src/ext/UIExtension/wixlib/OutOfDiskDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/OutOfRbDiskDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/PrepareDlg.wxs | 2 +- src/ext/UIExtension/wixlib/ProgressDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/ResumeDlg.wxs | 2 +- src/ext/UIExtension/wixlib/SetupTypeDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/UserExit.wxs | 2 +- src/ext/UIExtension/wixlib/VerifyReadyDlg.wxs | 4 ++-- src/ext/UIExtension/wixlib/WelcomeDlg.wxs | 2 +- src/ext/UIExtension/wixlib/WelcomeEulaDlg.wxs | 2 +- 24 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/ext/UIExtension/wixlib/AdvancedWelcomeEulaDlg.wxs b/src/ext/UIExtension/wixlib/AdvancedWelcomeEulaDlg.wxs index d5ba41495..28966d54b 100644 --- a/src/ext/UIExtension/wixlib/AdvancedWelcomeEulaDlg.wxs +++ b/src/ext/UIExtension/wixlib/AdvancedWelcomeEulaDlg.wxs @@ -7,7 +7,7 @@ - + diff --git a/src/ext/UIExtension/wixlib/CustomizeDlg.wxs b/src/ext/UIExtension/wixlib/CustomizeDlg.wxs index 4f6248eb4..1e668ce2d 100644 --- a/src/ext/UIExtension/wixlib/CustomizeDlg.wxs +++ b/src/ext/UIExtension/wixlib/CustomizeDlg.wxs @@ -29,8 +29,8 @@ - - + + diff --git a/src/ext/UIExtension/wixlib/DiskCostDlg.wxs b/src/ext/UIExtension/wixlib/DiskCostDlg.wxs index 9fcc23268..fe3b6656a 100644 --- a/src/ext/UIExtension/wixlib/DiskCostDlg.wxs +++ b/src/ext/UIExtension/wixlib/DiskCostDlg.wxs @@ -11,8 +11,8 @@ - - + + diff --git a/src/ext/UIExtension/wixlib/ExitDialog.wxs b/src/ext/UIExtension/wixlib/ExitDialog.wxs index 00e0a7bd3..895dbe012 100644 --- a/src/ext/UIExtension/wixlib/ExitDialog.wxs +++ b/src/ext/UIExtension/wixlib/ExitDialog.wxs @@ -10,7 +10,7 @@ - +