diff options
| author | StefanStojanovic <StefanStojanovic@users.noreply.github.com> | 2022-10-25 22:40:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-25 20:40:36 +0000 |
| commit | 321c30138c82390ea5ad6b0a612dff294203a877 (patch) | |
| tree | 2f27ca578d9b162eac11f0c8bee460b17138b531 /src/ext/NetFx/test | |
| parent | 98080672cdbbde00ea40a96c1ce38e8a52f24fee (diff) | |
| download | wix-321c30138c82390ea5ad6b0a612dff294203a877.tar.gz wix-321c30138c82390ea5ad6b0a612dff294203a877.tar.bz2 wix-321c30138c82390ea5ad6b0a612dff294203a877.zip | |
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 - `<netfx:DotNetCompatibilityCheck
/>`. 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
Diffstat (limited to 'src/ext/NetFx/test')
| -rw-r--r-- | src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 12 |
1 files changed, 12 insertions, 0 deletions
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 | |||
| 85 | var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage"); | 85 | var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4NetFxNativeImage"); |
| 86 | WixAssert.CompareLineByLine(new[] | 86 | WixAssert.CompareLineByLine(new[] |
| 87 | { | 87 | { |
| 88 | "Binary:Wix4NetCheck_arm64\t[Binary data]", | ||
| 89 | "Binary:Wix4NetCheck_x64\t[Binary data]", | ||
| 90 | "Binary:Wix4NetCheck_x86\t[Binary data]", | ||
| 88 | "Binary:Wix4NetFxCA_X86\t[Binary data]", | 91 | "Binary:Wix4NetFxCA_X86\t[Binary data]", |
| 92 | "CustomAction:Wix4NetFxDotNetCompatibilityCheck_X86\t1\tWix4NetFxCA_X86\tDotNetCompatibilityCheck\t", | ||
| 89 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", | 93 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", |
| 90 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", | 94 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X86\t3649\tWix4NetFxCA_X86\tExecNetFx\t", |
| 91 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_X86\t3137\tWix4NetFxCA_X86\tExecNetFx\t", | 95 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_X86\t3137\tWix4NetFxCA_X86\tExecNetFx\t", |
| @@ -104,7 +108,11 @@ namespace WixToolsetTest.Netfx | |||
| 104 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); | 108 | var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); |
| 105 | WixAssert.CompareLineByLine(new[] | 109 | WixAssert.CompareLineByLine(new[] |
| 106 | { | 110 | { |
| 111 | "Binary:Wix4NetCheck_arm64\t[Binary data]", | ||
| 112 | "Binary:Wix4NetCheck_x64\t[Binary data]", | ||
| 113 | "Binary:Wix4NetCheck_x86\t[Binary data]", | ||
| 107 | "Binary:Wix4NetFxCA_X64\t[Binary data]", | 114 | "Binary:Wix4NetFxCA_X64\t[Binary data]", |
| 115 | "CustomAction:Wix4NetFxDotNetCompatibilityCheck_X64\t1\tWix4NetFxCA_X64\tDotNetCompatibilityCheck\t", | ||
| 108 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", | 116 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", |
| 109 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", | 117 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_X64\t3649\tWix4NetFxCA_X64\tExecNetFx\t", |
| 110 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t", | 118 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_X64\t3137\tWix4NetFxCA_X64\tExecNetFx\t", |
| @@ -123,7 +131,11 @@ namespace WixToolsetTest.Netfx | |||
| 123 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); | 131 | var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4NetFxNativeImage"); |
| 124 | WixAssert.CompareLineByLine(new[] | 132 | WixAssert.CompareLineByLine(new[] |
| 125 | { | 133 | { |
| 134 | "Binary:Wix4NetCheck_arm64\t[Binary data]", | ||
| 135 | "Binary:Wix4NetCheck_x64\t[Binary data]", | ||
| 136 | "Binary:Wix4NetCheck_x86\t[Binary data]", | ||
| 126 | "Binary:Wix4NetFxCA_A64\t[Binary data]", | 137 | "Binary:Wix4NetFxCA_A64\t[Binary data]", |
| 138 | "CustomAction:Wix4NetFxDotNetCompatibilityCheck_A64\t1\tWix4NetFxCA_A64\tDotNetCompatibilityCheck\t", | ||
| 127 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", | 139 | "CustomAction:Wix4NetFxExecuteNativeImageCommitInstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", |
| 128 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", | 140 | "CustomAction:Wix4NetFxExecuteNativeImageCommitUninstall_A64\t3649\tWix4NetFxCA_A64\tExecNetFx\t", |
| 129 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_A64\t3137\tWix4NetFxCA_A64\tExecNetFx\t", | 141 | "CustomAction:Wix4NetFxExecuteNativeImageInstall_A64\t3137\tWix4NetFxCA_A64\tExecNetFx\t", |