diff options
Diffstat (limited to 'src/test')
2 files changed, 6 insertions, 6 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs index 20044235..7ec3104c 100644 --- a/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs | |||
@@ -94,7 +94,7 @@ namespace WixToolsetTest.CoreIntegration | |||
94 | } | 94 | } |
95 | } | 95 | } |
96 | 96 | ||
97 | [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6370")] | 97 | [Fact] |
98 | public void PopulatesBAManifestWithPayloadInformation() | 98 | public void PopulatesBAManifestWithPayloadInformation() |
99 | { | 99 | { |
100 | var folder = TestData.Get(@"TestData"); | 100 | var folder = TestData.Get(@"TestData"); |
@@ -131,10 +131,10 @@ namespace WixToolsetTest.CoreIntegration | |||
131 | { "WixPayloadProperties", new List<string> { "Size" } }, | 131 | { "WixPayloadProperties", new List<string> { "Size" } }, |
132 | }; | 132 | }; |
133 | Assert.Equal(4, payloadElements.Count); | 133 | Assert.Equal(4, payloadElements.Count); |
134 | Assert.Equal("<WixPayloadProperties Payload='credwiz.exe' Package='credwiz.exe' Container='WixAttachedContainer' Name='credwiz.exe' Size='*' LayoutOnly='no' />", payloadElements[0].GetTestXml(ignoreAttributesByElementName)); | 134 | Assert.Equal("<WixPayloadProperties Package='credwiz.exe' Payload='SourceFilePayload' Container='WixAttachedContainer' Name='SharedPayloadsBetweenPackages.wxs' Size='*' LayoutOnly='no' />", payloadElements[0].GetTestXml(ignoreAttributesByElementName)); |
135 | Assert.Equal("<WixPayloadProperties Payload='payue_e5DuhsDGlzJxWYPhqr6S7rkc' Package='credwiz.exe' Container='WixAttachedContainer' Name='SharedPayloadsBetweenPackages.wxs' Size='*' LayoutOnly='no' />", payloadElements[1].GetTestXml(ignoreAttributesByElementName)); | 135 | Assert.Equal("<WixPayloadProperties Package='credwiz.exe' Payload='credwiz.exe' Container='WixAttachedContainer' Name='credwiz.exe' Size='*' LayoutOnly='no' />", payloadElements[1].GetTestXml(ignoreAttributesByElementName)); |
136 | Assert.Equal("<WixPayloadProperties Payload='cscript.exe' Package='cscript.exe' Container='WixAttachedContainer' Name='cscript.exe' Size='*' LayoutOnly='no' />", payloadElements[2].GetTestXml(ignoreAttributesByElementName)); | 136 | Assert.Equal("<WixPayloadProperties Package='cscript.exe' Payload='SourceFilePayload' Container='WixAttachedContainer' Name='SharedPayloadsBetweenPackages.wxs' Size='*' LayoutOnly='no' />", payloadElements[2].GetTestXml(ignoreAttributesByElementName)); |
137 | Assert.Equal("<WixPayloadProperties Payload='payue_e5DuhsDGlzJxWYPhqr6S7rkc' Package='cscript.exe' Container='WixAttachedContainer' Name='SharedPayloadsBetweenPackages.wxs' Size='*' LayoutOnly='no' />", payloadElements[3].GetTestXml(ignoreAttributesByElementName)); | 137 | Assert.Equal("<WixPayloadProperties Package='cscript.exe' Payload='cscript.exe' Container='WixAttachedContainer' Name='cscript.exe' Size='*' LayoutOnly='no' />", payloadElements[3].GetTestXml(ignoreAttributesByElementName)); |
138 | } | 138 | } |
139 | } | 139 | } |
140 | 140 | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs index 2588ffc1..3457a3b7 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs | |||
@@ -12,7 +12,7 @@ | |||
12 | </Fragment> | 12 | </Fragment> |
13 | <Fragment> | 13 | <Fragment> |
14 | <PayloadGroup Id="SharedPayloads"> | 14 | <PayloadGroup Id="SharedPayloads"> |
15 | <Payload SourceFile="$(sys.SOURCEFILEPATH)" /> | 15 | <Payload Id="SourceFilePayload" SourceFile="$(sys.SOURCEFILEPATH)" /> |
16 | </PayloadGroup> | 16 | </PayloadGroup> |
17 | </Fragment> | 17 | </Fragment> |
18 | </Wix> | 18 | </Wix> |