From cd7ee116f03a3c41a55dde62f17876ec984fed91 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Mon, 11 Mar 2013 20:15:51 +0100 Subject: [PATCH] Updated WixProjBuilder to support the new naming system for WiX --- BuildTools/WixProjBuilder/Program.cs | 8 +++++++- Installer/WixProjBuilder.exe | Bin 12288 -> 12288 bytes 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/BuildTools/WixProjBuilder/Program.cs b/BuildTools/WixProjBuilder/Program.cs index 8e9413d1d..68ffa84ff 100644 --- a/BuildTools/WixProjBuilder/Program.cs +++ b/BuildTools/WixProjBuilder/Program.cs @@ -60,7 +60,13 @@ namespace WixProjBuilder "Windows Installer XML v3.4", "Windows Installer XML v3.5", "Windows Installer XML v3.6", - "Windows Installer XML v3.7" + "Windows Installer XML v3.7", + "Windows Installer XML v3.8", + "Windows Installer XML v3.9", + "WiX Toolset v3.6", + "WiX Toolset v3.7", + "WiX Toolset v3.8", + "WiX Toolset v3.9", }; foreach(var p in known_wix_names) diff --git a/Installer/WixProjBuilder.exe b/Installer/WixProjBuilder.exe index af99ffc7158134d25a1ad9ed04751639800e4b52..a576db6ccb320c2e5655653ed59a9516215c3913 100644 GIT binary patch delta 4718 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 W2W;lk_{GY!!DO?b-h0N02J8Tnz(q^| delta 4834 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