aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald Martin <cpuwzd@comcast.net>2021-02-04 22:24:03 -0500
committerRob Mensching <rob@firegiant.com>2021-02-04 21:48:08 -0800
commit6b807d4816846af40cb71d7183b854279fc7b4a8 (patch)
treebb60ff8a9b12c20e8c87bd8ce293f98d3a042542
parent29817aa0f2d2e45f55061e6bb0303e94126d2417 (diff)
downloadwix-6b807d4816846af40cb71d7183b854279fc7b4a8.tar.gz
wix-6b807d4816846af40cb71d7183b854279fc7b4a8.tar.bz2
wix-6b807d4816846af40cb71d7183b854279fc7b4a8.zip
Removes all trailing backslashes from registry paths. Fixes wixtoolset/issues#4753
-rw-r--r--src/WixToolset.Core/Compiler_2.cs1
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index f5f450cb..09d56e49 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -1576,6 +1576,7 @@ namespace WixToolset.Core
1576 { 1576 {
1577 key = Path.Combine(parentKey, key); 1577 key = Path.Combine(parentKey, key);
1578 } 1578 }
1579 key = key?.TrimEnd('\\');
1579 break; 1580 break;
1580 case "Root": 1581 case "Root":
1581 if (root.HasValue) 1582 if (root.HasValue)
diff --git a/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs
index a7d6edb4..654b8740 100644
--- a/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs
@@ -111,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration
111 } 111 }
112 } 112 }
113 113
114 [Fact(Skip = "https://github.com/wixtoolset/issues/issues/4753")] 114 [Fact]
115 public void PopulatesRegistryTableWithoutExtraBackslash() 115 public void PopulatesRegistryTableWithoutExtraBackslash()
116 { 116 {
117 var folder = TestData.Get(@"TestData"); 117 var folder = TestData.Get(@"TestData");