From 04e2665cf230390c458edcc91ad0bac4b43e9195 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 6 Sep 2020 21:14:12 -0400 Subject: Replace BinaryKey with BinaryRef and FileKey with FileRef. --- src/WixToolset.Converters/WixConverter.cs | 20 +++++++++++++++++++- .../ConverterIntegrationFixture.cs | 4 ++-- .../WixToolsetTest.Converters/CustomActionFixture.cs | 10 +++++----- .../TestData/QtExec.bad/v4_expected.wxs | 2 +- .../TestData/QtExec/v4_expected.wxs | 2 +- 5 files changed, 28 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs index 5f6ee2df..b82c4490 100644 --- a/src/WixToolset.Converters/WixConverter.cs +++ b/src/WixToolset.Converters/WixConverter.cs @@ -469,7 +469,7 @@ namespace WixToolset.Converters if (modularization != null) { var camelCaseValue = LowercaseFirstChar(modularization.Value); - if (category.Value != camelCaseValue && + if (modularization.Value != camelCaseValue && this.OnError(ConverterTestType.ColumnModularizeCamelCase, element, "The CustomTable Modularize attribute contains an incorrectly cased '{0}' value. Lowercase the first character instead.", modularization.Name)) { modularization.Value = camelCaseValue; @@ -759,6 +759,19 @@ namespace WixToolset.Converters private void ConvertCustomActionElement(XElement xCustomAction) { var xBinaryKey = xCustomAction.Attribute("BinaryKey"); + if (xBinaryKey != null && this.OnError(ConverterTestType.CustomActionKeysAreNowRefs, xCustomAction, "The CustomAction attributes have been renamed from BinaryKey and FileKey to BinaryRef and FileRef.")) + { + xCustomAction.SetAttributeValue("BinaryRef", xBinaryKey.Value); + xBinaryKey.Remove(); + xBinaryKey = xCustomAction.Attribute("BinaryRef"); + } + + var xFileKey = xCustomAction.Attribute("FileKey"); + if (xFileKey != null && this.OnError(ConverterTestType.CustomActionKeysAreNowRefs, xCustomAction, "The CustomAction attributes have been renamed from BinaryKey and FileKey to BinaryRef and FileRef.")) + { + xCustomAction.SetAttributeValue("FileRef", xFileKey.Value); + xFileKey.Remove(); + } if (xBinaryKey?.Value == "WixCA" || xBinaryKey?.Value == "UtilCA") { @@ -1282,6 +1295,11 @@ namespace WixToolset.Converters /// The string variable type was previously treated as formatted. /// AssignVariableTypeFormatted, + + /// + /// The CustomAction attributes have been renamed from BinaryKey and FileKey to BinaryRef and FileRef. + /// + CustomActionKeysAreNowRefs, } } } diff --git a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs b/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs index 79cc3f69..09387590 100644 --- a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs +++ b/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs @@ -108,7 +108,7 @@ namespace WixToolsetTest.Converters File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName)); var result = RunConversion(targetFile); - Assert.Equal(10, result.ExitCode); + Assert.Equal(11, result.ExitCode); var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); @@ -133,7 +133,7 @@ namespace WixToolsetTest.Converters var result = RunConversion(targetFile); - Assert.Equal(10, result.ExitCode); + Assert.Equal(11, result.ExitCode); Assert.Single(result.Messages.Where(message => message.ToString().EndsWith("(QtExecCmdTimeoutAmbiguous)"))); var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); diff --git a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs b/src/test/WixToolsetTest.Converters/CustomActionFixture.cs index 4ad7dcfd..eafc171a 100644 --- a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs +++ b/src/test/WixToolsetTest.Converters/CustomActionFixture.cs @@ -25,10 +25,10 @@ namespace WixToolsetTest.Converters var expected = String.Join(Environment.NewLine, "", - " ", - " ", - " ", - " ", + " ", + " ", + " ", + " ", ""); var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo); @@ -40,7 +40,7 @@ namespace WixToolsetTest.Converters var actual = UnformattedDocumentString(document); - Assert.Equal(7, errors); + Assert.Equal(11, errors); Assert.Equal(expected, actual); } diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs b/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs index 02a06cff..0266e177 100644 --- a/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs +++ b/src/test/WixToolsetTest.Converters/TestData/QtExec.bad/v4_expected.wxs @@ -15,7 +15,7 @@ - + diff --git a/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs b/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs index 00ce8461..da4f5135 100644 --- a/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs +++ b/src/test/WixToolsetTest.Converters/TestData/QtExec/v4_expected.wxs @@ -14,7 +14,7 @@ - + -- cgit v1.2.3-55-g6feb