Skip to content

Commit 0292ece

Browse files
committed
VC: disable for <18362 builds
1 parent e2288c5 commit 0292ece

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

installer/PowerToysSetup/Product.wxs

+14-8
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,23 @@
8989
NOT Installed and CREATESCHEDULEDTASK = 1
9090
</Custom>
9191
<?if $(var.HasWDK)="true" ?>
92-
<Custom Action="SetCertifyVirtualCameraDriverParam" After="RegisterPowerToysSchTask"/>
92+
<Custom Action="SetCertifyVirtualCameraDriverParam" After="RegisterPowerToysSchTask" >
93+
WINDOWSBUILDNUMBER >= 18362
94+
</Custom>
9395
<Custom Action="CertifyVirtualCameraDriver" After="SetCertifyVirtualCameraDriverParam" >
94-
NOT Installed
96+
NOT Installed and WINDOWSBUILDNUMBER >= 18362
97+
</Custom>
98+
<Custom Action="SetInstallVirtualCameraDriverParam" After="CertifyVirtualCameraDriver" >
99+
WINDOWSBUILDNUMBER >= 18362
95100
</Custom>
96-
<Custom Action="SetInstallVirtualCameraDriverParam" After="CertifyVirtualCameraDriver" />
97101
<Custom Action="InstallVirtualCameraDriver" After="SetInstallVirtualCameraDriverParam" >
98-
NOT Installed
102+
NOT Installed and WINDOWSBUILDNUMBER >= 18362
99103
</Custom>
100-
<Custom Action="SetUninstallVirtualCameraDriverParam" Before="UninstallVirtualCameraDriver" />
104+
<Custom Action="SetUninstallVirtualCameraDriverParam" Before="UninstallVirtualCameraDriver" >
105+
WINDOWSBUILDNUMBER >= 18362
106+
</Custom>
101107
<Custom Action="UninstallVirtualCameraDriver" Before="RemoveFiles">
102-
Installed
108+
Installed and WINDOWSBUILDNUMBER >= 18362
103109
</Custom>
104110
<?endif?>
105111
<Custom Action="WixCloseApplications" Before="RemoveFiles" />
@@ -674,6 +680,7 @@
674680
<?if $(var.HasWDK)="true" ?>
675681
<DirectoryRef Id="VideoConferenceInstallFolder" FileSource="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\">
676682
<Component Id="Module_VideoConference" Guid="5996527a-40fc-432e-b3ac-abc0b4bd3887" Win64="yes">
683+
<Condition>WINDOWSBUILDNUMBER >= 18362</Condition>
677684
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\VideoConferenceModule.dll" KeyPath="yes" />
678685
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\black.bmp" />
679686
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\VideoConferenceVirtualDriver\videoconferencevirtualdriver.cat" />
@@ -685,6 +692,7 @@
685692
</DirectoryRef>
686693
<DirectoryRef Id="VideoConferenceIconsFolder" FileSource="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\Icons">
687694
<Component Id="Module_VideoConferenceIcons" Guid="5996527a-40fc-432e-b34c-abc0b4bd3887" Win64="yes">
695+
<Condition>WINDOWSBUILDNUMBER >= 18362</Condition>
688696
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\Icons\Off-NotInUse Dark.png" />
689697
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\Icons\Off-NotInUse Light.png" />
690698
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\Icons\Off-Off Dark.png" />
@@ -881,10 +889,8 @@
881889
<ComponentRef Id="vcredist_dlls" />
882890
<ComponentRef Id="PowerToysSvgs" />
883891
<ComponentRef Id="Module_ShortcutGuide" />
884-
<?if $(var.HasWDK)="true" ?>
885892
<ComponentRef Id="Module_VideoConference" />
886893
<ComponentRef Id="Module_VideoConferenceIcons" />
887-
<?endif?>
888894
<ComponentRef Id="Module_FancyZones" />
889895
<ComponentRef Id="DesktopShortcut" />
890896
<ComponentRef Id="Module_PowerRename" />

0 commit comments

Comments
 (0)