diff options
| author | Bob Arnson <bob@firegiant.com> | 2023-08-15 18:05:47 -0400 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2023-08-15 19:09:04 -0400 |
| commit | 6f520b9def48f302625906ad961e1afa28edb3d0 (patch) | |
| tree | 623549bb92e997e07561a128bff1f58d92e4cc0d /src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | |
| parent | 59f37d218f58ef80da541a11a1d3825554c00d3f (diff) | |
| download | wix-6f520b9def48f302625906ad961e1afa28edb3d0.tar.gz wix-6f520b9def48f302625906ad961e1afa28edb3d0.tar.bz2 wix-6f520b9def48f302625906ad961e1afa28edb3d0.zip | |
Properly fragment NetFx custom actions.
FIxes https://github.com/wixtoolset/issues/issues/7677.
Diffstat (limited to '')
| -rw-r--r-- | src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index aebfe9f4..bb3b7b35 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | |||
| @@ -117,11 +117,7 @@ namespace WixToolsetTest.Netfx | |||
| 117 | var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage"); | 117 | var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage"); |
| 118 | WixAssert.CompareLineByLine(new[] | 118 | WixAssert.CompareLineByLine(new[] |
| 119 | { | 119 | { |
| 120 | "Binary:Wix4NetCheck_arm64\t[Binary data]", | ||
| 121 | "Binary:Wix4NetCheck_x64\t[Binary data]", | ||
| 122 | "Binary:Wix4NetCheck_x86\t[Binary data]", | ||
| 123 | "Binary:Wix4NetFxCA_X86\t[Binary data]", | 120 | "Binary:Wix4NetFxCA_X86\t[Binary data]", |
| 124 | "CustomAction:Wix4NetFxDotNetCompatibilityCheck_X86\t1\tWix4NetFxCA_X86\tDotNetCompatibilityCheck\t", | ||
| 125 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", | 121 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", |
| 126 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", | 122 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", |
| 127 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_X86\t3137\tWix4NetFxCA_X86\tExecNetFx\t", | 123 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_X86\t3137\tWix4NetFxCA_X86\tExecNetFx\t", |
| @@ -140,11 +136,7 @@ namespace WixToolsetTest.Netfx | |||
| 140 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); | 136 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); |
| 141 | WixAssert.CompareLineByLine(new[] | 137 | WixAssert.CompareLineByLine(new[] |
| 142 | { | 138 | { |
| 143 | "Binary:Wix4NetCheck_arm64\t[Binary data]", | ||
| 144 | "Binary:Wix4NetCheck_x64\t[Binary data]", | ||
| 145 | "Binary:Wix4NetCheck_x86\t[Binary data]", | ||
| 146 | "Binary:Wix4NetFxCA_X64\t[Binary data]", | 139 | "Binary:Wix4NetFxCA_X64\t[Binary data]", |
| 147 | "CustomAction:Wix4NetFxDotNetCompatibilityCheck_X64\t1\tWix4NetFxCA_X64\tDotNetCompatibilityCheck\t", | ||
| 148 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", | 140 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", |
| 149 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", | 141 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", |
| 150 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t", | 142 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t", |
| @@ -163,11 +155,7 @@ namespace WixToolsetTest.Netfx | |||
| 163 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); | 155 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); |
| 164 | WixAssert.CompareLineByLine(new[] | 156 | WixAssert.CompareLineByLine(new[] |
| 165 | { | 157 | { |
| 166 | "Binary:Wix4NetCheck_arm64\t[Binary data]", | ||
| 167 | "Binary:Wix4NetCheck_x64\t[Binary data]", | ||
| 168 | "Binary:Wix4NetCheck_x86\t[Binary data]", | ||
| 169 | "Binary:Wix4NetFxCA_A64\t[Binary data]", | 158 | "Binary:Wix4NetFxCA_A64\t[Binary data]", |
| 170 | "CustomAction:Wix4NetFxDotNetCompatibilityCheck_A64\t1\tWix4NetFxCA_A64\tDotNetCompatibilityCheck\t", | ||
| 171 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", | 159 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", |
| 172 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", | 160 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", |
| 173 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_A64\t3137\tWix4NetFxCA_A64\tExecNetFx\t", | 161 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_A64\t3137\tWix4NetFxCA_A64\tExecNetFx\t", |
| @@ -191,11 +179,6 @@ namespace WixToolsetTest.Netfx | |||
| 191 | "Binary:Wix4NetCheck_x86\t[Binary data]", | 179 | "Binary:Wix4NetCheck_x86\t[Binary data]", |
| 192 | "Binary:Wix4NetFxCA_X64\t[Binary data]", | 180 | "Binary:Wix4NetFxCA_X64\t[Binary data]", |
| 193 | "CustomAction:Wix4NetFxDotNetCompatibilityCheck_X64\t1\tWix4NetFxCA_X64\tDotNetCompatibilityCheck\t", | 181 | "CustomAction:Wix4NetFxDotNetCompatibilityCheck_X64\t1\tWix4NetFxCA_X64\tDotNetCompatibilityCheck\t", |
| 194 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", | ||
| 195 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", | ||
| 196 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t", | ||
| 197 | "CustomAction:Wix4NetFxExecuteNativeImageUninstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t", | ||
| 198 | "CustomAction:Wix4NetFxScheduleNativeImage_X64\t1\tWix4NetFxCA_X64\tSchedNetFx\t", | ||
| 199 | "Wix4NetFxDotNetCheck:DotNetCoreCheckManualId\tMicrosoft.NETCore.App\tx64\t7.0.1\tLatestMajor\tDOTNETCORECHECKRESULT", | 182 | "Wix4NetFxDotNetCheck:DotNetCoreCheckManualId\tMicrosoft.NETCore.App\tx64\t7.0.1\tLatestMajor\tDOTNETCORECHECKRESULT", |
| 200 | }, results.OrderBy(s => s).ToArray()); | 183 | }, results.OrderBy(s => s).ToArray()); |
| 201 | } | 184 | } |
