[VCM] Activate the module (#13662)
This commit is contained in:
parent
afdefa2428
commit
f51ee065c2
|
@ -62,11 +62,10 @@ build:
|
||||||
- 'x64/**/*.pdb'
|
- 'x64/**/*.pdb'
|
||||||
exclude:
|
exclude:
|
||||||
- 'x64/Release/obj/**/*.pdb'
|
- 'x64/Release/obj/**/*.pdb'
|
||||||
# TODO(yuyoyuppe): uncomment when VCM should be enabled
|
- from: 'x86/Release'
|
||||||
#- from: 'x86/Release'
|
to: 'Build_Output'
|
||||||
# to: 'Build_Output'
|
include:
|
||||||
# include:
|
- 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll'
|
||||||
# - 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll'
|
|
||||||
- from: 'x64/Release'
|
- from: 'x64/Release'
|
||||||
to: 'Build_Output'
|
to: 'Build_Output'
|
||||||
include:
|
include:
|
||||||
|
@ -170,10 +169,9 @@ build:
|
||||||
- 'modules\PowerRename\PowerRenameExt.dll'
|
- 'modules\PowerRename\PowerRenameExt.dll'
|
||||||
- 'modules\ShortcutGuide\ShortcutGuide\PowerToys.ShortcutGuide.exe'
|
- 'modules\ShortcutGuide\ShortcutGuide\PowerToys.ShortcutGuide.exe'
|
||||||
- 'modules\ShortcutGuide\ShortcutGuideModuleInterface\ShortcutGuideModuleInterface.dll'
|
- 'modules\ShortcutGuide\ShortcutGuideModuleInterface\ShortcutGuideModuleInterface.dll'
|
||||||
# TODO(yuyoyuppe): uncomment when VCM should be enabled
|
- 'modules\VideoConference\VideoConferenceModule.dll'
|
||||||
#- 'modules\VideoConference\VideoConferenceModule.dll'
|
- 'modules\VideoConference\VideoConferenceProxyFilter_x64.dll'
|
||||||
#- 'modules\VideoConference\VideoConferenceProxyFilter_x64.dll'
|
- 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll'
|
||||||
#- 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll'
|
|
||||||
- 'Settings\ManagedTelemetry.dll'
|
- 'Settings\ManagedTelemetry.dll'
|
||||||
- 'Settings\Microsoft.PowerToys.Settings.UI.exe'
|
- 'Settings\Microsoft.PowerToys.Settings.UI.exe'
|
||||||
- 'Settings\Microsoft.PowerToys.Settings.UI.Lib.dll'
|
- 'Settings\Microsoft.PowerToys.Settings.UI.Lib.dll'
|
||||||
|
|
|
@ -242,10 +242,9 @@
|
||||||
</Directory>
|
</Directory>
|
||||||
<Directory Id="ShortcutGuideModuleInterfaceInstallFolder" Name="ShortcutGuideModuleInterface"/>
|
<Directory Id="ShortcutGuideModuleInterfaceInstallFolder" Name="ShortcutGuideModuleInterface"/>
|
||||||
</Directory>
|
</Directory>
|
||||||
<!-- TODO(yuyoyuppe): uncomment when VCM should be enabled -->
|
<Directory Id="VideoConferenceInstallFolder" Name="$(var.VideoConferenceProjectName)">
|
||||||
<!-- <Directory Id="VideoConferenceInstallFolder" Name="$(var.VideoConferenceProjectName)">
|
|
||||||
<Directory Id="VideoConferenceIconsFolder" Name="Icons" />
|
<Directory Id="VideoConferenceIconsFolder" Name="Icons" />
|
||||||
</Directory> -->
|
</Directory>
|
||||||
<Directory Id="FileExplorerPreviewInstallFolder" Name="FileExplorerPreview" />
|
<Directory Id="FileExplorerPreviewInstallFolder" Name="FileExplorerPreview" />
|
||||||
<Directory Id="FancyZonesInstallFolder" Name="$(var.FancyZonesProjectName)" />
|
<Directory Id="FancyZonesInstallFolder" Name="$(var.FancyZonesProjectName)" />
|
||||||
<Directory Id="AwakeInstallFolder" Name="$(var.AwakeProjectName)">
|
<Directory Id="AwakeInstallFolder" Name="$(var.AwakeProjectName)">
|
||||||
|
@ -707,8 +706,7 @@
|
||||||
</Component>
|
</Component>
|
||||||
</DirectoryRef>
|
</DirectoryRef>
|
||||||
|
|
||||||
<!-- TODO(yuyoyuppe): uncomment when VCM should be enabled -->
|
<DirectoryRef Id="VideoConferenceInstallFolder" FileSource="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\">
|
||||||
<!-- <DirectoryRef Id="VideoConferenceInstallFolder" FileSource="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\">
|
|
||||||
<Component Id="Module_VideoConference" Guid="5996527a-40fc-432e-b3ac-abc0b4bd3887" Win64="yes">
|
<Component Id="Module_VideoConference" Guid="5996527a-40fc-432e-b3ac-abc0b4bd3887" Win64="yes">
|
||||||
<Condition>WINDOWSBUILDNUMBER >= 18362</Condition>
|
<Condition>WINDOWSBUILDNUMBER >= 18362</Condition>
|
||||||
<File SelfRegCost="1" Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\VideoConferenceProxyFilter_x64.dll" KeyPath="yes">
|
<File SelfRegCost="1" Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\VideoConferenceProxyFilter_x64.dll" KeyPath="yes">
|
||||||
|
@ -736,7 +734,7 @@
|
||||||
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\Icons\On-On Dark.png" />
|
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\Icons\On-On Dark.png" />
|
||||||
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\Icons\On-On Light.png" />
|
<File Source="$(var.BinX64Dir)modules\$(var.VideoConferenceProjectName)\Icons\On-On Light.png" />
|
||||||
</Component>
|
</Component>
|
||||||
</DirectoryRef> -->
|
</DirectoryRef>
|
||||||
|
|
||||||
<DirectoryRef Id="ShortcutGuideExecutableInstallFolder" FileSource="$(var.ShortcutGuideExecutable)">
|
<DirectoryRef Id="ShortcutGuideExecutableInstallFolder" FileSource="$(var.ShortcutGuideExecutable)">
|
||||||
<Component Id="Module_ShortcutGuideExecutable" Guid="DA6E5710-F1DF-44EB-A316-300FA39544E9" Win64="yes">
|
<Component Id="Module_ShortcutGuideExecutable" Guid="DA6E5710-F1DF-44EB-A316-300FA39544E9" Win64="yes">
|
||||||
|
@ -993,9 +991,8 @@
|
||||||
<ComponentRef Id="ShortcutGuideSvgs" />
|
<ComponentRef Id="ShortcutGuideSvgs" />
|
||||||
<ComponentRef Id="Module_ShortcutGuideModuleInterface" />
|
<ComponentRef Id="Module_ShortcutGuideModuleInterface" />
|
||||||
<ComponentRef Id="Module_ShortcutGuideExecutable" />
|
<ComponentRef Id="Module_ShortcutGuideExecutable" />
|
||||||
<!-- TODO(yuyoyuppe): uncomment when VCM should be enabled -->
|
<ComponentRef Id="Module_VideoConference" />
|
||||||
<!-- <ComponentRef Id="Module_VideoConference" />
|
<ComponentRef Id="Module_VideoConferenceIcons" />
|
||||||
<ComponentRef Id="Module_VideoConferenceIcons" /> -->
|
|
||||||
<ComponentRef Id="Module_FancyZones" />
|
<ComponentRef Id="Module_FancyZones" />
|
||||||
<ComponentRef Id="DesktopShortcut" />
|
<ComponentRef Id="DesktopShortcut" />
|
||||||
<ComponentRef Id="Module_PowerRename" />
|
<ComponentRef Id="Module_PowerRename" />
|
||||||
|
|
|
@ -144,13 +144,12 @@ int runner(bool isProcessElevated, bool openSettings, bool openOobe)
|
||||||
L"modules/Awake/AwakeModuleInterface.dll"
|
L"modules/Awake/AwakeModuleInterface.dll"
|
||||||
|
|
||||||
};
|
};
|
||||||
// TODO(yuyoyuppe): uncomment when VCM should be enabled
|
const auto VCM_PATH = L"modules/VideoConference/VideoConferenceModule.dll";
|
||||||
//const auto VCM_PATH = L"modules/VideoConference/VideoConferenceModule.dll";
|
if (const auto mf = LoadLibraryA("mf.dll"))
|
||||||
//if (const auto mf = LoadLibraryA("mf.dll"))
|
{
|
||||||
//{
|
FreeLibrary(mf);
|
||||||
// FreeLibrary(mf);
|
knownModules.emplace_back(VCM_PATH);
|
||||||
// knownModules.emplace_back(VCM_PATH);
|
}
|
||||||
//}
|
|
||||||
|
|
||||||
for (const auto& moduleSubdir : knownModules)
|
for (const auto& moduleSubdir : knownModules)
|
||||||
{
|
{
|
||||||
|
|
|
@ -180,8 +180,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
||||||
Link = "https://aka.ms/PowerToysOverview_ShortcutGuide",
|
Link = "https://aka.ms/PowerToysOverview_ShortcutGuide",
|
||||||
});
|
});
|
||||||
|
|
||||||
// TODO(yuyoyuppe): uncomment when VCM should be enabled
|
Modules.Insert((int)PowerToysModulesEnum.VideoConference, new OobePowerToysModule()
|
||||||
/* Modules.Insert((int)PowerToysModulesEnum.VideoConference, new OobePowerToysModule()
|
|
||||||
{
|
{
|
||||||
ModuleName = loader.GetString("Oobe_VideoConference"),
|
ModuleName = loader.GetString("Oobe_VideoConference"),
|
||||||
Tag = "VideoConference",
|
Tag = "VideoConference",
|
||||||
|
@ -192,7 +191,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
||||||
Description = loader.GetString("Oobe_VideoConference_Description"),
|
Description = loader.GetString("Oobe_VideoConference_Description"),
|
||||||
PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/VideoConferenceMute.png",
|
PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/VideoConferenceMute.png",
|
||||||
Link = "https://aka.ms/PowerToysOverview_VideoConference",
|
Link = "https://aka.ms/PowerToysOverview_VideoConference",
|
||||||
}); */
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnClosing()
|
public void OnClosing()
|
||||||
|
|
|
@ -119,15 +119,14 @@
|
||||||
</muxc:NavigationViewItem.Icon>
|
</muxc:NavigationViewItem.Icon>
|
||||||
</muxc:NavigationViewItem>
|
</muxc:NavigationViewItem>
|
||||||
|
|
||||||
<!--TODO(yuyoyuppe): uncomment when VCM should be enabled-->
|
<muxc:NavigationViewItem x:Uid="Shell_VideoConference"
|
||||||
<!--<muxc:NavigationViewItem x:Uid="Shell_VideoConference"
|
|
||||||
helpers:NavHelper.NavigateTo="views:VideoConferencePage"
|
helpers:NavHelper.NavigateTo="views:VideoConferencePage"
|
||||||
IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}">
|
IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}">
|
||||||
<muxc:NavigationViewItem.Icon>
|
<muxc:NavigationViewItem.Icon>
|
||||||
<BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png"
|
<BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png"
|
||||||
ShowAsMonochrome="False" />
|
ShowAsMonochrome="False" />
|
||||||
</muxc:NavigationViewItem.Icon>
|
</muxc:NavigationViewItem.Icon>
|
||||||
</muxc:NavigationViewItem>-->
|
</muxc:NavigationViewItem>
|
||||||
|
|
||||||
</muxc:NavigationView.MenuItems>
|
</muxc:NavigationView.MenuItems>
|
||||||
<muxc:NavigationView.PaneFooter>
|
<muxc:NavigationView.PaneFooter>
|
||||||
|
@ -154,4 +153,4 @@
|
||||||
<Frame x:Name="shellFrame" />
|
<Frame x:Name="shellFrame" />
|
||||||
</muxc:NavigationView>
|
</muxc:NavigationView>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|
Loading…
Reference in a new issue