From 6b807d4816846af40cb71d7183b854279fc7b4a8 Mon Sep 17 00:00:00 2001 From: Ronald Martin Date: Thu, 4 Feb 2021 22:24:03 -0500 Subject: Removes all trailing backslashes from registry paths. Fixes wixtoolset/issues#4753 --- src/WixToolset.Core/Compiler_2.cs | 1 + src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 { key = Path.Combine(parentKey, key); } + key = key?.TrimEnd('\\'); break; case "Root": 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 } } - [Fact(Skip = "https://github.com/wixtoolset/issues/issues/4753")] + [Fact] public void PopulatesRegistryTableWithoutExtraBackslash() { var folder = TestData.Get(@"TestData"); -- cgit v1.2.3-55-g6feb