From b6c72d725d3c2e9b35f2821640bb58efe8a28f1e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 26 Jan 2016 22:25:52 -0800 Subject: [PATCH] Fix Component Rules violations. All resources should be installed by one and only one Component, where Component is defined by the Component/@Guid. The SetupRegistry_x64 and SetupRegistry_x86 Components were sharing the env vars across the 32-bit and 64-bit packages. That is a Component Rule violation. The fix is simple. Since the 32-bit registration is always required, let it handle the env var installation. The code is cleaner as well. --- packaging/windows/registrykeys.wxs | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/packaging/windows/registrykeys.wxs b/packaging/windows/registrykeys.wxs index c3d44aac6..047ceae8a 100644 --- a/packaging/windows/registrykeys.wxs +++ b/packaging/windows/registrykeys.wxs @@ -3,31 +3,29 @@ - - - + + + - - - - + + + + - - - - - + + +