From 321c30138c82390ea5ad6b0a612dff294203a877 Mon Sep 17 00:00:00 2001 From: StefanStojanovic Date: Tue, 25 Oct 2022 22:40:36 +0200 Subject: Add NetFx .NET compatibility check for MSI (#262) Adds new custom element in NetFx extension for running NetCoreCheck.exe tool from within the MSI installer - ``. The checks are run before evaluating launch conditions, so their results can be used in those conditions. There is no limitation on the number of checks that can be run, so installer may query various runtimes on different platforms and versions and with different roll forward policies. Fixes https://github.com/wixtoolset/issues/issues/6264 --- .../NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/ext/NetFx/test') diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index 6a75f30f..a03d47d6 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs @@ -85,7 +85,11 @@ namespace WixToolsetTest.Netfx var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage"); WixAssert.CompareLineByLine(new[] { + "Binary:Wix4NetCheck_arm64\t[Binary data]", + "Binary:Wix4NetCheck_x64\t[Binary data]", + "Binary:Wix4NetCheck_x86\t[Binary data]", "Binary:Wix4NetFxCA_X86\t[Binary data]", + "CustomAction:Wix4NetFxDotNetCompatibilityCheck_X86\t1\tWix4NetFxCA_X86\tDotNetCompatibilityCheck\t", "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", "CustomAction:Wix4NetFxExecuteNativeImageInstall_X86\t3137\tWix4NetFxCA_X86\tExecNetFx\t", @@ -104,7 +108,11 @@ namespace WixToolsetTest.Netfx var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); WixAssert.CompareLineByLine(new[] { + "Binary:Wix4NetCheck_arm64\t[Binary data]", + "Binary:Wix4NetCheck_x64\t[Binary data]", + "Binary:Wix4NetCheck_x86\t[Binary data]", "Binary:Wix4NetFxCA_X64\t[Binary data]", + "CustomAction:Wix4NetFxDotNetCompatibilityCheck_X64\t1\tWix4NetFxCA_X64\tDotNetCompatibilityCheck\t", "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", "CustomAction:Wix4NetFxExecuteNativeImageInstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t", @@ -123,7 +131,11 @@ namespace WixToolsetTest.Netfx var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); WixAssert.CompareLineByLine(new[] { + "Binary:Wix4NetCheck_arm64\t[Binary data]", + "Binary:Wix4NetCheck_x64\t[Binary data]", + "Binary:Wix4NetCheck_x86\t[Binary data]", "Binary:Wix4NetFxCA_A64\t[Binary data]", + "CustomAction:Wix4NetFxDotNetCompatibilityCheck_A64\t1\tWix4NetFxCA_A64\tDotNetCompatibilityCheck\t", "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", "CustomAction:Wix4NetFxExecuteNativeImageInstall_A64\t3137\tWix4NetFxCA_A64\tExecNetFx\t", -- cgit v1.2.3-55-g6feb