Skip to content

Remove OPT_NO_FTS/LTS #39141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2022
Merged

Remove OPT_NO_FTS/LTS #39141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/Installers/Windows/HostOptions/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

<!-- Custom Actions to assign a default of 0 to all switches -->
<CustomAction Id="Set_OPT_NO_ANCM" Property="OPT_NO_ANCM" Value="0" />
<CustomAction Id="Set_OPT_NO_FTS" Property="OPT_NO_FTS" Value="0" />
<CustomAction Id="Set_OPT_NO_LTS" Property="OPT_NO_LTS" Value="0" />
<CustomAction Id="Set_OPT_NO_SHAREDFX" Property="OPT_NO_SHAREDFX" Value="0" />
<CustomAction Id="Set_OPT_NO_RUNTIME" Property="OPT_NO_RUNTIME" Value="0" />
<CustomAction Id="Set_OPT_NO_X86" Property="OPT_NO_X86" Value="0" />
Expand All @@ -22,8 +20,6 @@
<!-- Second option is to use registry values, if present. -->
<!-- Third option is to set the options all to 0, which we do here. -->
<Custom Action="Set_OPT_NO_ANCM" After="AppSearch">NOT OPT_NO_ANCM OR OPT_NO_ANCM=""</Custom>
<Custom Action="Set_OPT_NO_FTS" After="AppSearch">NOT OPT_NO_FTS OR OPT_NO_FTS=""</Custom>
<Custom Action="Set_OPT_NO_LTS" After="AppSearch">NOT OPT_NO_LTS OR OPT_NO_LTS=""</Custom>
<Custom Action="Set_OPT_NO_SHAREDFX" After="AppSearch">NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=""</Custom>
<Custom Action="Set_OPT_NO_RUNTIME" After="AppSearch">NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=""</Custom>
<Custom Action="Set_OPT_NO_X86" After="AppSearch">NOT OPT_NO_X86 OR OPT_NO_X86=""</Custom>
Expand Down Expand Up @@ -57,8 +53,6 @@
<Component Id="OPT" Guid="*">
<RegistryKey Root="HKLM" Key="$(var.ProductOptionsKey)">
<RegistryValue Name="OPT_NO_ANCM" Type="integer" Value="[OPT_NO_ANCM]" KeyPath="yes" />
<RegistryValue Name="OPT_NO_FTS" Type="integer" Value="[OPT_NO_FTS]" />
<RegistryValue Name="OPT_NO_LTS" Type="integer" Value="[OPT_NO_LTS]" />
<RegistryValue Name="OPT_NO_SHAREDFX" Type="integer" Value="[OPT_NO_SHAREDFX]" />
<RegistryValue Name="OPT_NO_RUNTIME" Type="integer" Value="[OPT_NO_RUNTIME]" />
<RegistryValue Name="OPT_NO_X86" Type="integer" Value="[OPT_NO_X86]" />
Expand Down
8 changes: 2 additions & 6 deletions src/Installers/Windows/WindowsHostingBundle/Bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,15 @@
<Variable Name="BundleNameShort" Value="$(var.BundleNameShort)"/>
<Variable Name="BundleNameSub" Value="$(var.BundleNameSub)"/>
<Variable Name="OPT_NO_ANCM" bal:Overridable="yes"/>
<Variable Name="OPT_NO_FTS" bal:Overridable="yes"/>
<Variable Name="OPT_NO_LTS" bal:Overridable="yes"/>
<Variable Name="OPT_NO_SHAREDFX" bal:Overridable="yes"/>
<Variable Name="OPT_NO_RUNTIME" bal:Overridable="yes"/>
<Variable Name="OPT_NO_X86" bal:Overridable="yes"/>
<Variable Name="OPT_NO_SHARED_CONFIG_CHECK" bal:Overridable="yes" />

<!-- Use values from the registry for switches, if the registry values are set & the user hasn't passed any switches from the command line -->

<?define Options=OPT_NO_ANCM;OPT_NO_FTS;OPT_NO_LTS;OPT_NO_SHAREDFX;OPT_NO_RUNTIME;OPT_NO_X86;OPT_NO_SHARED_CONFIG_CHECK ?>
<?define RegistrySeachCondition="NOT (OPT_NO_ANCM OR OPT_NO_ANCM=0 OR OPT_NO_FTS OR OPT_NO_FTS=0 OR OPT_NO_LTS OR OPT_NO_LTS=0 OR OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=0 OR OPT_NO_RUNTIME OR OPT_NO_RUNTIME=0 OR OPT_NO_X86 OR OPT_NO_X86=0 OR OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK=0)" ?>
<?define Options=OPT_NO_ANCM;OPT_NO_SHAREDFX;OPT_NO_RUNTIME;OPT_NO_X86;OPT_NO_SHARED_CONFIG_CHECK ?>
<?define RegistrySeachCondition="NOT (OPT_NO_ANCM OR OPT_NO_ANCM=0 OR OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=0 OR OPT_NO_RUNTIME OR OPT_NO_RUNTIME=0 OR OPT_NO_X86 OR OPT_NO_X86=0 OR OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK=0)" ?>

<?foreach Option in $(var.Options) ?>
<util:RegistrySearch Id="$(var.Option)_should_be_set"
Expand Down Expand Up @@ -97,8 +95,6 @@
<Chain ParallelCache="yes">
<MsiPackage SourceFile="$(var.HostOptions.TargetPath)">
<MsiProperty Name="OPT_NO_ANCM" Value="[OPT_NO_ANCM]"/>
<MsiProperty Name="OPT_NO_FTS" Value="[OPT_NO_FTS]"/>
<MsiProperty Name="OPT_NO_LTS" Value="[OPT_NO_LTS]"/>
<MsiProperty Name="OPT_NO_SHAREDFX" Value="[OPT_NO_SHAREDFX]"/>
<MsiProperty Name="OPT_NO_RUNTIME" Value="[OPT_NO_RUNTIME]"/>
<MsiProperty Name="OPT_NO_X86" Value="[OPT_NO_X86]"/>
Expand Down