diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml index fdaea129f6..76a345c085 100644 --- a/.pipelines/pipeline.user.windows.yml +++ b/.pipelines/pipeline.user.windows.yml @@ -62,10 +62,10 @@ build: exclude: - 'x64/Release/obj/**/*.pdb' # TODO(yuyoyuppe): uncomment when VCM should be enabled - #- from: 'x86/Release' - # to: 'Build_Output' - # include: - # - 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll' + - from: 'x86/Release' + to: 'Build_Output' + include: + - 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll' - from: 'x64/Release' to: 'Build_Output' include: @@ -166,8 +166,9 @@ build: - 'modules\ShortcutGuide\ShortcutGuide\PowerToys.ShortcutGuide.exe' - 'modules\ShortcutGuide\ShortcutGuideModuleInterface\ShortcutGuideModuleInterface.dll' # TODO(yuyoyuppe): uncomment when VCM should be enabled - #- 'modules\VideoConference\VideoConferenceModule.dll' - #- 'modules\VideoConference\VideoConferenceProxyFilter_x64.dll' + - 'modules\VideoConference\VideoConferenceModule.dll' + - 'modules\VideoConference\VideoConferenceProxyFilter_x64.dll' + - 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll' - 'Settings\ManagedTelemetry.dll' - 'Settings\Microsoft.PowerToys.Settings.UI.exe' - 'Settings\Microsoft.PowerToys.Settings.UI.Lib.dll' diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 1810508c85..eace29a3d2 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -222,9 +222,9 @@ - + @@ -650,7 +650,7 @@ - + @@ -926,8 +926,8 @@ - + + diff --git a/src/common/updating/updating.h b/src/common/updating/updating.h index a5a15e47de..85f549e491 100644 --- a/src/common/updating/updating.h +++ b/src/common/updating/updating.h @@ -27,7 +27,7 @@ namespace updating std::future> download_new_version(const new_version_download_info& new_version); std::filesystem::path get_pending_updates_path(); - std::future> get_github_version_info_async(const bool prerelease = false); + std::future> get_github_version_info_async(const bool prerelease = true); // non-localized constexpr inline std::wstring_view INSTALLER_FILENAME_PATTERN = L"powertoyssetup"; diff --git a/src/runner/main.cpp b/src/runner/main.cpp index 564b489751..121be470b5 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -145,12 +145,12 @@ int runner(bool isProcessElevated, bool openSettings, bool openOobe) }; // TODO(yuyoyuppe): uncomment when VCM should be enabled - //const auto VCM_PATH = L"modules/VideoConference/VideoConferenceModule.dll"; - //if (const auto mf = LoadLibraryA("mf.dll")) - //{ - // FreeLibrary(mf); - // knownModules.emplace_back(VCM_PATH); - //} + const auto VCM_PATH = L"modules/VideoConference/VideoConferenceModule.dll"; + if (const auto mf = LoadLibraryA("mf.dll")) + { + FreeLibrary(mf); + knownModules.emplace_back(VCM_PATH); + } for (const auto& moduleSubdir : knownModules) { diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs index c3aa2bd440..63b0844c3b 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs @@ -180,7 +180,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views Link = "https://aka.ms/PowerToysOverview_ShortcutGuide", }); - /* Modules.Insert((int)PowerToysModulesEnum.VideoConference, new OobePowerToysModule() + // TODO(yuyoyuppe): uncomment when VCM should be enabled + Modules.Insert((int)PowerToysModulesEnum.VideoConference, new OobePowerToysModule() { ModuleName = loader.GetString("Oobe_VideoConference"), Tag = "VideoConference", @@ -191,7 +192,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views Description = loader.GetString("Oobe_VideoConference_Description"), PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/VideoConferenceMute.png", Link = "https://aka.ms/PowerToysOverview_VideoConference", - }); */ + }); } public void OnClosing() diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml index 6bf5be0c50..2e3ffa6115 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml @@ -131,7 +131,7 @@ - + @@ -168,4 +168,4 @@ - \ No newline at end of file +