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/wixext/NetfxTableDefinitions.cs | |
| 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/wixext/NetfxTableDefinitions.cs')
| -rw-r--r-- | src/ext/NetFx/wixext/NetfxTableDefinitions.cs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/ext/NetFx/wixext/NetfxTableDefinitions.cs b/src/ext/NetFx/wixext/NetfxTableDefinitions.cs index 57e35323..6be1abe7 100644 --- a/src/ext/NetFx/wixext/NetfxTableDefinitions.cs +++ b/src/ext/NetFx/wixext/NetfxTableDefinitions.cs | |||
| @@ -22,9 +22,25 @@ namespace WixToolset.Netfx | |||
| 22 | symbolIdIsPrimaryKey: true | 22 | symbolIdIsPrimaryKey: true |
| 23 | ); | 23 | ); |
| 24 | 24 | ||
| 25 | public static readonly TableDefinition NetFxDotNetCompatibilityCheck = new TableDefinition( | ||
| 26 | "Wix4NetFxDotNetCheck", | ||
| 27 | NetfxSymbolDefinitions.NetFxDotNetCompatibilityCheck, | ||
| 28 | new[] | ||
| 29 | { | ||
| 30 | new ColumnDefinition("NetFxDotNetCompatibilityCheck", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The primary key, a non-localized token.", modularizeType: ColumnModularizeType.Column), | ||
| 31 | new ColumnDefinition("RuntimeType", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "The type of .NET runtime being checked for. Possible values: aspnet, desktop and core", modularizeType: ColumnModularizeType.Column), | ||
| 32 | new ColumnDefinition("Platform", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Sets the platform for the .NET runtime being checked for. Possible values: x86, x64 and arm64", modularizeType: ColumnModularizeType.Column), | ||
| 33 | new ColumnDefinition("Version", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Version, description: "The version of the .NET runtime being checked for (e.g. 3.1.10, 5.0.1).", modularizeType: ColumnModularizeType.Column), | ||
| 34 | new ColumnDefinition("RollForward", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Sets the roll-forward policy that the application is using. Possible values: latestmajor, major, latestminor, minor, latestpatch and disable", modularizeType: ColumnModularizeType.Column), | ||
| 35 | new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, description: "Name of the property in which to place the result of the check.", modularizeType: ColumnModularizeType.Column), | ||
| 36 | }, | ||
| 37 | symbolIdIsPrimaryKey: true | ||
| 38 | ); | ||
| 39 | |||
| 25 | public static readonly TableDefinition[] All = new[] | 40 | public static readonly TableDefinition[] All = new[] |
| 26 | { | 41 | { |
| 27 | NetFxNativeImage, | 42 | NetFxNativeImage, |
| 43 | NetFxDotNetCompatibilityCheck | ||
| 28 | }; | 44 | }; |
| 29 | } | 45 | } |
| 30 | } | 46 | } |
