diff --git a/.configurations/configuration.dsc.yaml b/.configurations/configuration.dsc.yaml
index 4649f8d3ea7f..a6256da51268 100644
--- a/.configurations/configuration.dsc.yaml
+++ b/.configurations/configuration.dsc.yaml
@@ -11,7 +11,7 @@ properties:
- resource: Microsoft.WinGet.DSC/WinGetPackage
id: vsPackage
directives:
- description: Install Visual Studio 2022 (any edition is OK)
+ description: Install Visual Studio 2022 Community (Any edition will work)
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
@@ -31,4 +31,4 @@ properties:
# Next steps:
# Open a terminal
# Navigate to the folder you cloned PowerToys to.
- # Run git submodule update --init --recursive
\ No newline at end of file
+ # Run git submodule update --init --recursive
diff --git a/.configurations/configuration.vsEnterprise.dsc.yaml b/.configurations/configuration.vsEnterprise.dsc.yaml
new file mode 100644
index 000000000000..34d73f497558
--- /dev/null
+++ b/.configurations/configuration.vsEnterprise.dsc.yaml
@@ -0,0 +1,34 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
+properties:
+ resources:
+ - resource: Microsoft.Windows.Developer/DeveloperMode
+ directives:
+ description: Enable Developer Mode
+ allowPrerelease: true
+ settings:
+ Ensure: Present
+ - resource: Microsoft.WinGet.DSC/WinGetPackage
+ id: vsPackage
+ directives:
+ description: Install Visual Studio 2022 Enterprise (Any edition will work)
+ allowPrerelease: true
+ settings:
+ id: Microsoft.VisualStudio.2022.Enterprise
+ source: winget
+ - resource: Microsoft.VisualStudio.DSC/VSComponents
+ dependsOn:
+ - vsPackage
+ directives:
+ description: Install required VS workloads
+ allowPrerelease: true
+ settings:
+ productId: Microsoft.VisualStudio.Product.Enterprise
+ channelId: VisualStudio.17.Release
+ vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
+ configurationVersion: 0.2.0
+
+ # Next steps:
+ # Open a terminal
+ # Navigate to the folder you cloned PowerToys to.
+ # Run git submodule update --init --recursive
diff --git a/.configurations/configuration.vsProfessional.dsc.yaml b/.configurations/configuration.vsProfessional.dsc.yaml
new file mode 100644
index 000000000000..3c08d05856e2
--- /dev/null
+++ b/.configurations/configuration.vsProfessional.dsc.yaml
@@ -0,0 +1,34 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
+properties:
+ resources:
+ - resource: Microsoft.Windows.Developer/DeveloperMode
+ directives:
+ description: Enable Developer Mode
+ allowPrerelease: true
+ settings:
+ Ensure: Present
+ - resource: Microsoft.WinGet.DSC/WinGetPackage
+ id: vsPackage
+ directives:
+ description: Install Visual Studio 2022 Professional (Any edition will work)
+ allowPrerelease: true
+ settings:
+ id: Microsoft.VisualStudio.2022.Professional
+ source: winget
+ - resource: Microsoft.VisualStudio.DSC/VSComponents
+ dependsOn:
+ - vsPackage
+ directives:
+ description: Install required VS workloads
+ allowPrerelease: true
+ settings:
+ productId: Microsoft.VisualStudio.Product.Professional
+ channelId: VisualStudio.17.Release
+ vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
+ configurationVersion: 0.2.0
+
+ # Next steps:
+ # Open a terminal
+ # Navigate to the folder you cloned PowerToys to.
+ # Run git submodule update --init --recursive
diff --git a/Directory.Packages.props b/Directory.Packages.props
index b33b85c02b48..fb932734c25c 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -73,7 +73,7 @@
-
+
diff --git a/NOTICE.md b/NOTICE.md
index a19be5c74d61..52ae54cf0e8d 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1353,7 +1353,7 @@ EXHIBIT A -Mozilla Public License.
- System.Data.SqlClient 4.8.6
- System.Diagnostics.EventLog 8.0.0
- System.Diagnostics.PerformanceCounter 8.0.0
-- System.Drawing.Common 8.0.1
+- System.Drawing.Common 8.0.2
- System.IO.Abstractions 17.2.3
- System.IO.Abstractions.TestingHelpers 17.2.3
- System.Management 8.0.0
diff --git a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
index 81235042b486..0bc8deb1f515 100644
--- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
+++ b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
@@ -1,6 +1,6 @@
-
+ {32f3882b-f2d6-4586-b5ed-11e39e522bd3}
@@ -164,13 +164,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/installer/PowerToysSetupCustomActions/packages.config b/installer/PowerToysSetupCustomActions/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/installer/PowerToysSetupCustomActions/packages.config
+++ b/installer/PowerToysSetupCustomActions/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/ActionRunner/actionRunner.vcxproj b/src/ActionRunner/actionRunner.vcxproj
index 8809611842f1..cc41616bba78 100644
--- a/src/ActionRunner/actionRunner.vcxproj
+++ b/src/ActionRunner/actionRunner.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -61,15 +61,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/ActionRunner/packages.config b/src/ActionRunner/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/ActionRunner/packages.config
+++ b/src/ActionRunner/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/Update/PowerToys.Update.vcxproj b/src/Update/PowerToys.Update.vcxproj
index 914732926ceb..172a7027a635 100644
--- a/src/Update/PowerToys.Update.vcxproj
+++ b/src/Update/PowerToys.Update.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -67,15 +67,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/Update/packages.config b/src/Update/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/Update/packages.config
+++ b/src/Update/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/common/GPOWrapper/GPOWrapper.vcxproj b/src/common/GPOWrapper/GPOWrapper.vcxproj
index 7cb115d6aae7..032d4d19fb0f 100644
--- a/src/common/GPOWrapper/GPOWrapper.vcxproj
+++ b/src/common/GPOWrapper/GPOWrapper.vcxproj
@@ -1,6 +1,6 @@
-
+ truetrue
@@ -118,13 +118,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/common/GPOWrapper/packages.config b/src/common/GPOWrapper/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/common/GPOWrapper/packages.config
+++ b/src/common/GPOWrapper/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/common/SettingsAPI/SettingsAPI.vcxproj b/src/common/SettingsAPI/SettingsAPI.vcxproj
index c8a06a1a9e56..bf2eaec6dc72 100644
--- a/src/common/SettingsAPI/SettingsAPI.vcxproj
+++ b/src/common/SettingsAPI/SettingsAPI.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0
@@ -54,15 +54,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/common/SettingsAPI/packages.config b/src/common/SettingsAPI/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/common/SettingsAPI/packages.config
+++ b/src/common/SettingsAPI/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/common/Themes/Themes.vcxproj b/src/common/Themes/Themes.vcxproj
index c60dde82a724..f9772c874f8b 100644
--- a/src/common/Themes/Themes.vcxproj
+++ b/src/common/Themes/Themes.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{98537082-0FDB-40DE-ABD8-0DC5A4269BAB}
@@ -46,13 +46,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/common/Themes/packages.config b/src/common/Themes/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/common/Themes/packages.config
+++ b/src/common/Themes/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj
index f3dd518759b7..aff6610d6632 100644
--- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj
+++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{1A066C63-64B3-45F8-92FE-664E1CCE8077}
@@ -57,13 +57,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/common/UnitTests-CommonLib/packages.config b/src/common/UnitTests-CommonLib/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/common/UnitTests-CommonLib/packages.config
+++ b/src/common/UnitTests-CommonLib/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/common/logger/logger.vcxproj b/src/common/logger/logger.vcxproj
index f4915e78e356..49efbd6f862f 100644
--- a/src/common/logger/logger.vcxproj
+++ b/src/common/logger/logger.vcxproj
@@ -1,6 +1,6 @@
-
+ Debug
@@ -83,13 +83,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/common/logger/packages.config b/src/common/logger/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/common/logger/packages.config
+++ b/src/common/logger/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
index 9b4443c38082..077333a664dd 100644
--- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
+++ b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
@@ -1,6 +1,6 @@
-
+ truetrue
@@ -96,13 +96,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/common/notifications/BackgroundActivator/packages.config b/src/common/notifications/BackgroundActivator/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/common/notifications/BackgroundActivator/packages.config
+++ b/src/common/notifications/BackgroundActivator/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
index 394fd21d9b57..3a96d7d46fa1 100644
--- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
+++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{031AC72E-FA28-4AB7-B690-6F7B9C28AA73}
@@ -64,7 +64,7 @@
-
+
@@ -81,7 +81,7 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/common/notifications/BackgroundActivatorDLL/packages.config b/src/common/notifications/BackgroundActivatorDLL/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/common/notifications/BackgroundActivatorDLL/packages.config
+++ b/src/common/notifications/BackgroundActivatorDLL/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/common/notifications/notifications.vcxproj b/src/common/notifications/notifications.vcxproj
index c0438616ad57..9ff883079321 100644
--- a/src/common/notifications/notifications.vcxproj
+++ b/src/common/notifications/notifications.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}
@@ -43,15 +43,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/common/notifications/packages.config b/src/common/notifications/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/common/notifications/packages.config
+++ b/src/common/notifications/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/common/updating/packages.config b/src/common/updating/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/common/updating/packages.config
+++ b/src/common/updating/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/common/updating/updating.vcxproj b/src/common/updating/updating.vcxproj
index dfd2817d8376..48c3d5d483b5 100644
--- a/src/common/updating/updating.vcxproj
+++ b/src/common/updating/updating.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{17DA04DF-E393-4397-9CF0-84DABE11032E}
@@ -57,15 +57,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
index fabdbc9c2531..ebaed7e24f4d 100644
--- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
+++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
@@ -1,6 +1,6 @@
-
+ truetrue
@@ -122,6 +122,7 @@
+
@@ -154,7 +155,7 @@
-
+
@@ -162,8 +163,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/CropAndLock/CropAndLock/DispatcherQueue.desktop.interop.h b/src/modules/CropAndLock/CropAndLock/DispatcherQueue.desktop.interop.h
new file mode 100644
index 000000000000..2991b438a448
--- /dev/null
+++ b/src/modules/CropAndLock/CropAndLock/DispatcherQueue.desktop.interop.h
@@ -0,0 +1,51 @@
+#pragma once
+#include
+#include
+#include
+
+// This file is added as a workaround for: https://github.com/microsoft/cppwinrt/issues/1391
+// robmikh.common needs to be updated to support newer versions of C++/WinRT https://github.com/robmikh/robmikh.common/issues/2
+// Applying workaround from https://github.com/robmikh/Win32CaptureSample/commit/fc758e343ca886795b05af5003d9a3bb85ff4da2
+
+namespace robmikh::common::desktop
+{
+ namespace impl
+ {
+ inline void ShutdownAndThenPostQuitMessage(winrt::Windows::System::DispatcherQueueController const& controller, int exitCode)
+ {
+ auto action = controller.ShutdownQueueAsync();
+ action.Completed([exitCode](auto&&, auto&&)
+ {
+ PostQuitMessage(exitCode);
+ });
+ }
+ }
+
+ inline auto CreateDispatcherQueueControllerForCurrentThread()
+ {
+ namespace abi = ABI::Windows::System;
+
+ DispatcherQueueOptions options
+ {
+ sizeof(DispatcherQueueOptions),
+ DQTYPE_THREAD_CURRENT,
+ DQTAT_COM_NONE
+ };
+
+ winrt::Windows::System::DispatcherQueueController controller{ nullptr };
+ winrt::check_hresult(CreateDispatcherQueueController(options, reinterpret_cast(winrt::put_abi(controller))));
+ return controller;
+ }
+
+ inline int ShutdownDispatcherQueueControllerAndWait(winrt::Windows::System::DispatcherQueueController const& controller, int exitCode)
+ {
+ impl::ShutdownAndThenPostQuitMessage(controller, exitCode);
+ MSG msg = {};
+ while (GetMessageW(&msg, nullptr, 0, 0))
+ {
+ TranslateMessage(&msg);
+ DispatchMessageW(&msg);
+ }
+ return static_cast(msg.wParam);
+ }
+}
diff --git a/src/modules/CropAndLock/CropAndLock/packages.config b/src/modules/CropAndLock/CropAndLock/packages.config
index fe9625b6da89..f53ff9a92d4f 100644
--- a/src/modules/CropAndLock/CropAndLock/packages.config
+++ b/src/modules/CropAndLock/CropAndLock/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/modules/CropAndLock/CropAndLock/pch.h b/src/modules/CropAndLock/CropAndLock/pch.h
index fe9e5e635e13..720033cbca09 100644
--- a/src/modules/CropAndLock/CropAndLock/pch.h
+++ b/src/modules/CropAndLock/CropAndLock/pch.h
@@ -26,6 +26,7 @@
// WIL
#include
+#include
// DirectX
#include
@@ -53,7 +54,10 @@
#include
#include
#include
-#include
+// robmikh.common needs to be updated to support newer versions of C++/WinRT https://github.com/robmikh/robmikh.common/issues/2
+// Applying workaround from https://github.com/robmikh/Win32CaptureSample/commit/fc758e343ca886795b05af5003d9a3bb85ff4da2
+// #include
+#include "DispatcherQueue.desktop.interop.h"
#include
#include
#include
diff --git a/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj b/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj
index 6c44320941b7..6aa29bfe95e6 100644
--- a/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj
+++ b/src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -101,7 +101,7 @@
-
+
@@ -110,8 +110,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config b/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config
+++ b/src/modules/CropAndLock/CropAndLockModuleInterface/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj b/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj
index 6bf3bb3b20c3..b332a8c8e44c 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj
@@ -1,5 +1,6 @@
+
@@ -76,6 +77,7 @@
+
@@ -107,5 +109,13 @@
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj.filters b/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj.filters
index 14b6af8966d7..8ecdef4543cf 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj.filters
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj.filters
@@ -43,6 +43,7 @@
Resource Files
+
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/packages.config b/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/packages.config
new file mode 100644
index 000000000000..09bfc449e21c
--- /dev/null
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj b/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj
index e9186c86a53b..43760403b96a 100644
--- a/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj
+++ b/src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -264,13 +264,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/FileLocksmith/FileLocksmithExt/packages.config b/src/modules/FileLocksmith/FileLocksmithExt/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/FileLocksmith/FileLocksmithExt/packages.config
+++ b/src/modules/FileLocksmith/FileLocksmithExt/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml
index c7b9023cb8f3..8c5b744fb5fc 100644
--- a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml
+++ b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml
@@ -76,9 +76,23 @@
-
+
@@ -153,8 +153,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/MeasureTool/MeasureToolCore/packages.config b/src/modules/MeasureTool/MeasureToolCore/packages.config
index 627512b77879..43c18505d630 100644
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/src/modules/MeasureTool/MeasureToolCore/packages.config
@@ -1,6 +1,6 @@
-
+
diff --git a/src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj b/src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj
index 034db5680bcf..727520bc5467 100644
--- a/src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{92C39820-9F84-4529-BC7D-22AAE514D63B}
@@ -82,13 +82,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/MeasureTool/MeasureToolModuleInterface/packages.config b/src/modules/MeasureTool/MeasureToolModuleInterface/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/MeasureTool/MeasureToolModuleInterface/packages.config
+++ b/src/modules/MeasureTool/MeasureToolModuleInterface/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
index 48a933394637..5b53ada1a79d 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{e94fd11c-0591-456f-899f-efc0ca548336}
@@ -121,13 +121,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/MouseUtils/FindMyMouse/packages.config b/src/modules/MouseUtils/FindMyMouse/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/MouseUtils/FindMyMouse/packages.config
+++ b/src/modules/MouseUtils/FindMyMouse/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
index a80e9e95d141..b5e3be202aaa 100644
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{782a61be-9d85-4081-b35c-1ccc9dcc1e88}
@@ -119,13 +119,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/MouseUtils/MouseHighlighter/packages.config b/src/modules/MouseUtils/MouseHighlighter/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/MouseUtils/MouseHighlighter/packages.config
+++ b/src/modules/MouseUtils/MouseHighlighter/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj b/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
index bb0be49bd89a..0cfc9bf811b6 100644
--- a/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
+++ b/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{8a08d663-4995-40e3-b42c-3f910625f284}
@@ -117,13 +117,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/MouseUtils/MouseJump/packages.config b/src/modules/MouseUtils/MouseJump/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/MouseUtils/MouseJump/packages.config
+++ b/src/modules/MouseUtils/MouseJump/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
index 5cb02f361795..0310019c504b 100644
--- a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{eae14c0e-7a6b-45da-9080-a7d8c077ba6e}
@@ -119,13 +119,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/packages.config b/src/modules/MouseUtils/MousePointerCrosshairs/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/MouseUtils/MousePointerCrosshairs/packages.config
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj
index 276c65385530..91f3fd958557 100644
--- a/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj
+++ b/src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{2833C9C6-AB32-4048-A5C7-A70898337B57}
diff --git a/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj b/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj
index 4f53db3f3123..c270fbd6409b 100644
--- a/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj
+++ b/src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -73,13 +73,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/PowerOCR/PowerOCRModuleInterface/packages.config b/src/modules/PowerOCR/PowerOCRModuleInterface/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/PowerOCR/PowerOCRModuleInterface/packages.config
+++ b/src/modules/PowerOCR/PowerOCRModuleInterface/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj
index 144e8cdf7a08..b1be2d5c8200 100644
--- a/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj
+++ b/src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -130,13 +130,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/ShortcutGuide/ShortcutGuide/packages.config b/src/modules/ShortcutGuide/ShortcutGuide/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/ShortcutGuide/ShortcutGuide/packages.config
+++ b/src/modules/ShortcutGuide/ShortcutGuide/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj
index 1621a8a46024..22853eb9dfa6 100644
--- a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj
+++ b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -78,13 +78,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/packages.config b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/packages.config
+++ b/src/modules/ShortcutGuide/ShortcutGuideModuleInterface/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
index 39233d7ed593..581326eaf5e4 100644
--- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
+++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
@@ -2,7 +2,7 @@
-
+
@@ -191,15 +191,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/alwaysontop/AlwaysOnTop/packages.config b/src/modules/alwaysontop/AlwaysOnTop/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/alwaysontop/AlwaysOnTop/packages.config
+++ b/src/modules/alwaysontop/AlwaysOnTop/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj
index ad8e3e138bb2..0e6ebada6956 100644
--- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj
+++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{48A0A19E-A0BE-4256-ACF8-CC3B80291AF9}
@@ -67,7 +67,7 @@
-
+
@@ -75,8 +75,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/packages.config b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/packages.config
+++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj
index 6e4556e7f627..3aba624af3d4 100644
--- a/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj
+++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{5e7360a8-d048-4ed3-8f09-0bfd64c5529a}
@@ -66,15 +66,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/awake/AwakeModuleInterface/packages.config b/src/modules/awake/AwakeModuleInterface/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/awake/AwakeModuleInterface/packages.config
+++ b/src/modules/awake/AwakeModuleInterface/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj b/src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj
index a7fd427c2af5..c0fa3ec63e97 100644
--- a/src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj
+++ b/src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+
+ 17.0Win32Proj
@@ -100,8 +100,19 @@
+
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj.filters b/src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj.filters
index 1834d3ae8849..6fc7e0e5b4b6 100644
--- a/src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj.filters
+++ b/src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj.filters
@@ -1,6 +1,5 @@
-
+{4FC737F1-C7A5-4376-A066-2A32D752A2FF}
@@ -42,4 +41,7 @@
Resource Files
+
+
+
\ No newline at end of file
diff --git a/src/modules/cmdNotFound/CmdNotFoundModuleInterface/packages.config b/src/modules/cmdNotFound/CmdNotFoundModuleInterface/packages.config
new file mode 100644
index 000000000000..09bfc449e21c
--- /dev/null
+++ b/src/modules/cmdNotFound/CmdNotFoundModuleInterface/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj
index 84e4d5cc4116..99042906fe8b 100644
--- a/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj
+++ b/src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -73,13 +73,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/colorPicker/ColorPicker/packages.config b/src/modules/colorPicker/ColorPicker/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/colorPicker/ColorPicker/packages.config
+++ b/src/modules/colorPicker/ColorPicker/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
index 643aad98cf6b..a26e00dcb193 100644
--- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
+++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
@@ -2,7 +2,7 @@
-
+ true
@@ -160,15 +160,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/fancyzones/FancyZones/packages.config b/src/modules/fancyzones/FancyZones/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/fancyzones/FancyZones/packages.config
+++ b/src/modules/fancyzones/FancyZones/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
index d2e5b1ca43db..e3be24801aa5 100644
--- a/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -154,15 +154,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/fancyzones/FancyZonesLib/packages.config b/src/modules/fancyzones/FancyZonesLib/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/fancyzones/FancyZonesLib/packages.config
+++ b/src/modules/fancyzones/FancyZonesLib/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj
index 12a82f47e270..4d0f7fbece17 100644
--- a/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj
+++ b/src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{48804216-2A0E-4168-A6D8-9CD068D14227}
@@ -69,7 +69,7 @@
-
+
@@ -77,8 +77,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/fancyzones/FancyZonesModuleInterface/packages.config b/src/modules/fancyzones/FancyZonesModuleInterface/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/fancyzones/FancyZonesModuleInterface/packages.config
+++ b/src/modules/fancyzones/FancyZonesModuleInterface/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj
index 160abae1fa1a..685c63ca1747 100644
--- a/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj
+++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}
@@ -85,15 +85,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config b/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config
+++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj
index c8d82684896a..bd62017a6ca3 100644
--- a/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj
+++ b/src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -120,15 +120,15 @@ MakeAppx.exe pack /d . /p $(OutDir)ImageResizerContextMenuPackage.msix /nv
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/imageresizer/ImageResizerContextMenu/packages.config b/src/modules/imageresizer/ImageResizerContextMenu/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/imageresizer/ImageResizerContextMenu/packages.config
+++ b/src/modules/imageresizer/ImageResizerContextMenu/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
index d8ae785f46ce..e669a76994ae 100644
--- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
+++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -138,13 +138,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/imageresizer/dll/packages.config b/src/modules/imageresizer/dll/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/imageresizer/dll/packages.config
+++ b/src/modules/imageresizer/dll/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/App.xaml b/src/modules/imageresizer/ui/App.xaml
index 27b50ccee35e..d177d900e6ae 100644
--- a/src/modules/imageresizer/ui/App.xaml
+++ b/src/modules/imageresizer/ui/App.xaml
@@ -18,6 +18,7 @@
+
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Views/EnumToIntConverter.cs b/src/modules/imageresizer/ui/Views/EnumToIntConverter.cs
new file mode 100644
index 000000000000..fcfd151c7775
--- /dev/null
+++ b/src/modules/imageresizer/ui/Views/EnumToIntConverter.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Brice Lambson
+// The Brice Lambson licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information. Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace ImageResizer.Views
+{
+ [ValueConversion(typeof(Enum), typeof(int))]
+ internal class EnumToIntConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ => (int)value;
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ => targetType.GetEnumValues().GetValue((int)value);
+ }
+}
diff --git a/src/modules/imageresizer/ui/Views/EnumValueConverter.cs b/src/modules/imageresizer/ui/Views/EnumValueConverter.cs
index 4eb0abdd25b5..efe421ff5672 100644
--- a/src/modules/imageresizer/ui/Views/EnumValueConverter.cs
+++ b/src/modules/imageresizer/ui/Views/EnumValueConverter.cs
@@ -16,6 +16,11 @@ public class EnumValueConverter : IValueConverter
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var type = value?.GetType();
+ if (!type.IsEnum)
+ {
+ return value;
+ }
+
var builder = new StringBuilder();
builder
diff --git a/src/modules/imageresizer/ui/Views/InputPage.xaml b/src/modules/imageresizer/ui/Views/InputPage.xaml
index 0b90254fd025..b38879f0bad3 100644
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml
@@ -179,9 +179,9 @@
HorizontalAlignment="Stretch"
AutomationProperties.Name="{x:Static p:Resources.Resize_Type}"
ItemsSource="{Binding ResizeFitValues, Mode=OneWay}"
- SelectedIndex="0">
+ SelectedIndex="{Binding ElementName=SizeComboBox, Path=SelectedValue.Fit, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-
+
+ SelectedIndex="{Binding ElementName=SizeComboBox, Path=SelectedValue.Unit, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-
+
-
+ 81010002
@@ -163,7 +163,7 @@
-
+
@@ -177,8 +177,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config b/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config
index 96e6f248fefb..a97821046a9c 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config
+++ b/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config
@@ -4,5 +4,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj
index 9163e6690365..b34cdbc5282b 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj
@@ -2,7 +2,7 @@
-
+ 16.0Win32Proj
@@ -98,7 +98,7 @@
-
+
@@ -108,8 +108,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config
index 76411065b08d..59cfa6485165 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj
index 9d9e6c92c0d1..2b1ec311d0f2 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorTest/KeyboardManagerEditorTest.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{62173D9A-6724-4C00-A1C8-FB646480A9EC}
@@ -67,13 +67,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorTest/packages.config b/src/modules/keyboardmanager/KeyboardManagerEditorTest/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorTest/packages.config
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorTest/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj
index e67ddc52d959..96e6a3627536 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEngine/KeyboardManagerEngine.vcxproj
@@ -1,6 +1,6 @@
-
+ truetrue
@@ -80,13 +80,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEngine/packages.config b/src/modules/keyboardmanager/KeyboardManagerEngine/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEngine/packages.config
+++ b/src/modules/keyboardmanager/KeyboardManagerEngine/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj
index 6819b31d923c..f0c1c5670211 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -59,15 +59,14 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/packages.config b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/packages.config
index 2c654a3e7df1..9cdcd1b1c8e0 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/packages.config
+++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj
index d694a53867ee..5c5e1e90bbc5 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{7f4b3a60-bc27-45a7-8000-68b0b6ea7466}
@@ -72,13 +72,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineTest/packages.config b/src/modules/keyboardmanager/KeyboardManagerEngineTest/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEngineTest/packages.config
+++ b/src/modules/keyboardmanager/KeyboardManagerEngineTest/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj
index ebcd470c6129..3fdd3822564a 100644
--- a/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj
+++ b/src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0{8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}
@@ -75,13 +75,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/common/packages.config b/src/modules/keyboardmanager/common/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/keyboardmanager/common/packages.config
+++ b/src/modules/keyboardmanager/common/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
index 5fb50af17edf..b66361ff9973 100644
--- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
+++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{89f34af7-1c34-4a72-aa6e-534bcf972bd9}
@@ -73,13 +73,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/dll/packages.config b/src/modules/keyboardmanager/dll/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/keyboardmanager/dll/packages.config
+++ b/src/modules/keyboardmanager/dll/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
index 9984a9431ec9..667b63a8ca88 100644
--- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
+++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -76,15 +76,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/launcher/Microsoft.Launcher/packages.config b/src/modules/launcher/Microsoft.Launcher/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/launcher/Microsoft.Launcher/packages.config
+++ b/src/modules/launcher/Microsoft.Launcher/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/WorkspacesHelper/VSCodeWorkspacesApi.cs b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/WorkspacesHelper/VSCodeWorkspacesApi.cs
index 0be408dc4947..6152d4c391f5 100644
--- a/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/WorkspacesHelper/VSCodeWorkspacesApi.cs
+++ b/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.VSCodeWorkspaces/WorkspacesHelper/VSCodeWorkspacesApi.cs
@@ -46,7 +46,7 @@ private VSCodeWorkspace ParseVSCodeUriAndAuthority(string uri, string authority,
path = path[1..];
}
- if (!DoesPathExist(path, workspaceEnv.Value, machineName))
+ if (!DoesPathExist(path, workspaceEnv.Value))
{
return null;
}
@@ -72,18 +72,11 @@ private VSCodeWorkspace ParseVSCodeUriAndAuthority(string uri, string authority,
};
}
- private bool DoesPathExist(string path, WorkspaceEnvironment workspaceEnv, string machineName)
+ private bool DoesPathExist(string path, WorkspaceEnvironment workspaceEnv)
{
- if (workspaceEnv == WorkspaceEnvironment.Local || workspaceEnv == WorkspaceEnvironment.RemoteWSL)
+ if (workspaceEnv == WorkspaceEnvironment.Local)
{
- var resolvedPath = path;
-
- if (workspaceEnv == WorkspaceEnvironment.RemoteWSL)
- {
- resolvedPath = $"\\\\wsl$\\{machineName}{resolvedPath.Replace('/', '\\')}";
- }
-
- return Directory.Exists(resolvedPath) || File.Exists(resolvedPath);
+ return Directory.Exists(path) || File.Exists(path);
}
// If the workspace environment is not Local or WSL, assume the path exists
diff --git a/src/modules/pasteplain/PastePlainModuleInterface/PastePlainModuleInterface.vcxproj b/src/modules/pasteplain/PastePlainModuleInterface/PastePlainModuleInterface.vcxproj
index 5eeeafeb1bcc..22371b89478f 100644
--- a/src/modules/pasteplain/PastePlainModuleInterface/PastePlainModuleInterface.vcxproj
+++ b/src/modules/pasteplain/PastePlainModuleInterface/PastePlainModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -73,13 +73,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/pasteplain/PastePlainModuleInterface/packages.config b/src/modules/pasteplain/PastePlainModuleInterface/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/pasteplain/PastePlainModuleInterface/packages.config
+++ b/src/modules/pasteplain/PastePlainModuleInterface/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/peek/peek/peek.vcxproj b/src/modules/peek/peek/peek.vcxproj
index 95fa2bf1e551..4dae4791d3ca 100644
--- a/src/modules/peek/peek/peek.vcxproj
+++ b/src/modules/peek/peek/peek.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{a1425b53-3d61-4679-8623-e64a0d3d0a48}
@@ -60,7 +60,7 @@
-
+
@@ -70,8 +70,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj b/src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj
index c8ecde851563..38592d22d90f 100644
--- a/src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj
+++ b/src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj
@@ -1,6 +1,6 @@
-
+ truetrue
@@ -120,13 +120,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/poweraccent/PowerAccentKeyboardService/packages.config b/src/modules/poweraccent/PowerAccentKeyboardService/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/poweraccent/PowerAccentKeyboardService/packages.config
+++ b/src/modules/poweraccent/PowerAccentKeyboardService/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj b/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj
index 0e9ef9a69ce3..e60d4a42d9bd 100644
--- a/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj
+++ b/src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{34A354C5-23C7-4343-916C-C52DAF4FC39D}
@@ -67,15 +67,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/poweraccent/PowerAccentModuleInterface/packages.config b/src/modules/poweraccent/PowerAccentModuleInterface/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/poweraccent/PowerAccentModuleInterface/packages.config
+++ b/src/modules/poweraccent/PowerAccentModuleInterface/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
index 053695376f11..a5a93705d7ab 100644
--- a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
+++ b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -121,15 +121,15 @@ MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/powerrename/PowerRenameContextMenu/packages.config b/src/modules/powerrename/PowerRenameContextMenu/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/powerrename/PowerRenameContextMenu/packages.config
+++ b/src/modules/powerrename/PowerRenameContextMenu/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
index 2f911fcd22db..c4d45a2c8b1f 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
@@ -2,7 +2,7 @@
-
+ truetrue
@@ -203,7 +203,7 @@
-
+
@@ -215,8 +215,8 @@
-
-
+
+
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml
index 8ee568b2a6dd..b385360c1d82 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml
@@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+ xmlns:controls="using:Microsoft.UI.Xaml.Controls"
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
@@ -11,11 +12,109 @@
-
-
-
-
-
-
+ Background="{ThemeResource AccentSplitButtonBorderBrushDivider}" />
-
-
-
-
-
-
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
index c3c30cbeb9bb..83610f1a3b3f 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
@@ -593,7 +593,7 @@
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Click="button_rename_Click"
- Style="{StaticResource SplitAccentButtonStyle}">
+ Style="{StaticResource AccentSplitButtonStyle}">
diff --git a/src/modules/powerrename/PowerRenameUILib/packages.config b/src/modules/powerrename/PowerRenameUILib/packages.config
index 040eedefa77c..f331e94090b0 100644
--- a/src/modules/powerrename/PowerRenameUILib/packages.config
+++ b/src/modules/powerrename/PowerRenameUILib/packages.config
@@ -2,7 +2,7 @@
-
+
diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj b/src/modules/powerrename/dll/PowerRenameExt.vcxproj
index 7e07bca3322f..0e269b53f1a1 100644
--- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj
+++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -73,7 +73,7 @@
-
+
@@ -81,8 +81,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/powerrename/dll/packages.config b/src/modules/powerrename/dll/packages.config
index 17131cfe2fec..ecc3202cd393 100644
--- a/src/modules/powerrename/dll/packages.config
+++ b/src/modules/powerrename/dll/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/powerrename/lib/PowerRenameLib.vcxproj b/src/modules/powerrename/lib/PowerRenameLib.vcxproj
index d55914f19e02..143f531169f7 100644
--- a/src/modules/powerrename/lib/PowerRenameLib.vcxproj
+++ b/src/modules/powerrename/lib/PowerRenameLib.vcxproj
@@ -1,6 +1,6 @@
-
+ {51920F1F-C28C-4ADF-8660-4238766796C2}Win32Proj
@@ -76,7 +76,7 @@
-
+
@@ -84,8 +84,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/powerrename/lib/packages.config b/src/modules/powerrename/lib/packages.config
index 17131cfe2fec..ecc3202cd393 100644
--- a/src/modules/powerrename/lib/packages.config
+++ b/src/modules/powerrename/lib/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj
index 21f6f06adab7..edb4c22d36dd 100644
--- a/src/modules/powerrename/testapp/PowerRenameTest.vcxproj
+++ b/src/modules/powerrename/testapp/PowerRenameTest.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}
@@ -66,7 +66,7 @@
-
+
@@ -74,8 +74,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/powerrename/testapp/packages.config b/src/modules/powerrename/testapp/packages.config
index 17131cfe2fec..ecc3202cd393 100644
--- a/src/modules/powerrename/testapp/packages.config
+++ b/src/modules/powerrename/testapp/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj
index 2d1a18246d21..542019a9ee4e 100644
--- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj
+++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj
@@ -1,6 +1,6 @@
-
+ {2151F984-E006-4A9F-92EF-C6DDE3DC8413}Win32Proj
@@ -76,7 +76,7 @@
-
+
@@ -84,8 +84,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/powerrename/unittests/packages.config b/src/modules/powerrename/unittests/packages.config
index 17131cfe2fec..ecc3202cd393 100644
--- a/src/modules/powerrename/unittests/packages.config
+++ b/src/modules/powerrename/unittests/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj b/src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj
index 094c55e6cb98..8881cce555ac 100644
--- a/src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj
+++ b/src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -109,13 +109,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/GcodePreviewHandlerCpp/packages.config b/src/modules/previewpane/GcodePreviewHandlerCpp/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/previewpane/GcodePreviewHandlerCpp/packages.config
+++ b/src/modules/previewpane/GcodePreviewHandlerCpp/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj
index 9b2e7d8b11d8..9e3f08dbf7bc 100644
--- a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj
+++ b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -106,15 +106,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config b/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config
+++ b/src/modules/previewpane/GcodeThumbnailProviderCpp/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj b/src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj
index 642ffa77a74a..906194f470b0 100644
--- a/src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj
+++ b/src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -118,13 +118,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/MarkdownPreviewHandlerCpp/packages.config b/src/modules/previewpane/MarkdownPreviewHandlerCpp/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/previewpane/MarkdownPreviewHandlerCpp/packages.config
+++ b/src/modules/previewpane/MarkdownPreviewHandlerCpp/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj b/src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj
index 3095a6f3746d..265c3a8c11d6 100644
--- a/src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj
+++ b/src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -109,13 +109,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/MonacoPreviewHandlerCpp/packages.config b/src/modules/previewpane/MonacoPreviewHandlerCpp/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/previewpane/MonacoPreviewHandlerCpp/packages.config
+++ b/src/modules/previewpane/MonacoPreviewHandlerCpp/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj b/src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj
index 242a7c25ca85..cdf06b44318b 100644
--- a/src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj
+++ b/src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -106,13 +106,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/PdfPreviewHandlerCpp/packages.config b/src/modules/previewpane/PdfPreviewHandlerCpp/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/previewpane/PdfPreviewHandlerCpp/packages.config
+++ b/src/modules/previewpane/PdfPreviewHandlerCpp/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj
index fc45a56d6781..02194147655c 100644
--- a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj
+++ b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -106,15 +106,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config b/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config
+++ b/src/modules/previewpane/PdfThumbnailProviderCpp/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/QoiPreviewHandlerCpp/QoiPreviewHandlerCpp.vcxproj b/src/modules/previewpane/QoiPreviewHandlerCpp/QoiPreviewHandlerCpp.vcxproj
index 28307d2d309d..4da8cdb19650 100644
--- a/src/modules/previewpane/QoiPreviewHandlerCpp/QoiPreviewHandlerCpp.vcxproj
+++ b/src/modules/previewpane/QoiPreviewHandlerCpp/QoiPreviewHandlerCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -109,13 +109,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/QoiPreviewHandlerCpp/packages.config b/src/modules/previewpane/QoiPreviewHandlerCpp/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/previewpane/QoiPreviewHandlerCpp/packages.config
+++ b/src/modules/previewpane/QoiPreviewHandlerCpp/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj b/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj
index ac1ae6fac53b..ebfe79391ba0 100644
--- a/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj
+++ b/src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -106,15 +106,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config b/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config
+++ b/src/modules/previewpane/QoiThumbnailProviderCpp/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj b/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj
index 337a8c4b5336..e994e5766507 100644
--- a/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj
+++ b/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -106,15 +106,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/StlThumbnailProviderCpp/packages.config b/src/modules/previewpane/StlThumbnailProviderCpp/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/previewpane/StlThumbnailProviderCpp/packages.config
+++ b/src/modules/previewpane/StlThumbnailProviderCpp/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj b/src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj
index 94eeae7e2999..56d680ce4bf4 100644
--- a/src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj
+++ b/src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -109,13 +109,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/SvgPreviewHandlerCpp/packages.config b/src/modules/previewpane/SvgPreviewHandlerCpp/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/src/modules/previewpane/SvgPreviewHandlerCpp/packages.config
+++ b/src/modules/previewpane/SvgPreviewHandlerCpp/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj
index 7eff3bdf6776..cfa896cfb9ea 100644
--- a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj
+++ b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -106,15 +106,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config b/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config
+++ b/src/modules/previewpane/SvgThumbnailProviderCpp/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/powerpreview/packages.config b/src/modules/previewpane/powerpreview/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/previewpane/powerpreview/packages.config
+++ b/src/modules/previewpane/powerpreview/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/previewpane/powerpreview/powerpreview.vcxproj b/src/modules/previewpane/powerpreview/powerpreview.vcxproj
index 67572b3a694c..682702b4e0c1 100644
--- a/src/modules/previewpane/powerpreview/powerpreview.vcxproj
+++ b/src/modules/previewpane/powerpreview/powerpreview.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -91,15 +91,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj b/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj
index 911f2fe41906..43b439b09e26 100644
--- a/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj
+++ b/src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj
@@ -1,6 +1,6 @@
-
+ Debug
@@ -119,15 +119,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/registrypreview/RegistryPreviewExt/packages.config b/src/modules/registrypreview/RegistryPreviewExt/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/registrypreview/RegistryPreviewExt/packages.config
+++ b/src/modules/registrypreview/RegistryPreviewExt/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj b/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj
index 7b205f729654..826ee3f2d372 100644
--- a/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj
+++ b/src/modules/videoconference/VideoConferenceModule/VideoConference.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{5ABA70DE-3A3F-41F6-A1F5-D1F74F54F9BB}
@@ -163,15 +163,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/modules/videoconference/VideoConferenceModule/packages.config b/src/modules/videoconference/VideoConferenceModule/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/videoconference/VideoConferenceModule/packages.config
+++ b/src/modules/videoconference/VideoConferenceModule/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj
index d720b314df79..c97bb89b9a8a 100644
--- a/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj
+++ b/src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj
@@ -1,6 +1,6 @@
-
+ Debug
@@ -134,15 +134,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/modules/videoconference/VideoConferenceShared/packages.config b/src/modules/videoconference/VideoConferenceShared/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/modules/videoconference/VideoConferenceShared/packages.config
+++ b/src/modules/videoconference/VideoConferenceShared/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/runner/packages.config b/src/runner/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/src/runner/packages.config
+++ b/src/runner/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj
index d3f1272bc4a6..0336716fec64 100644
--- a/src/runner/runner.vcxproj
+++ b/src/runner/runner.vcxproj
@@ -1,6 +1,6 @@
-
+
@@ -126,15 +126,15 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
index 8ce7e68484b8..734146a66378 100644
--- a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
+++ b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
@@ -1,6 +1,6 @@
-
+ 16.0Win32Proj
@@ -80,14 +80,14 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/tools/BugReportTool/BugReportTool/packages.config b/tools/BugReportTool/BugReportTool/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/tools/BugReportTool/BugReportTool/packages.config
+++ b/tools/BugReportTool/BugReportTool/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/tools/WebcamReportTool/WebcamReportTool.vcxproj b/tools/WebcamReportTool/WebcamReportTool.vcxproj
index 7a56bd2082cc..feab9a984277 100644
--- a/tools/WebcamReportTool/WebcamReportTool.vcxproj
+++ b/tools/WebcamReportTool/WebcamReportTool.vcxproj
@@ -1,6 +1,6 @@
-
+ v143
@@ -62,14 +62,14 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/tools/WebcamReportTool/packages.config b/tools/WebcamReportTool/packages.config
index 2c654a3e7df1..ff4b05964868 100644
--- a/tools/WebcamReportTool/packages.config
+++ b/tools/WebcamReportTool/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj
index b0fa51879204..e9ed3777d7b3 100644
--- a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj
+++ b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj
@@ -1,6 +1,6 @@
-
+ 15.0{64A80062-4D8B-4229-8A38-DFA1D7497749}
@@ -110,13 +110,13 @@
-
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/tools/project_template/ModuleTemplate/packages.config b/tools/project_template/ModuleTemplate/packages.config
index 47bae1882fcb..09bfc449e21c 100644
--- a/tools/project_template/ModuleTemplate/packages.config
+++ b/tools/project_template/ModuleTemplate/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file