Merge branch 'microsoft:master' into master

src/common/interop/keyboard_layout.cpp

@@ -1,11 +1,10 @@
 #include "pch.h"
+#include <array>
+#include <algorithm>
+
 #include "keyboard_layout_impl.h"
 #include "shared_constants.h"
 
-#include <winrt/Windows.UI.Core.h>
-
-using namespace winrt;
-
 LayoutMap::LayoutMap() :
     impl(new LayoutMap::LayoutMapImpl())
 {

src/common/updating/dotnet_installation.cpp

@@ -10,7 +10,7 @@ namespace fs = std::filesystem;
 
 namespace updating
 {
-    constexpr size_t REQUIRED_MINIMAL_PATCH = 13;
+    constexpr size_t REQUIRED_MINIMAL_PATCH = 14;
 
     bool dotnet_is_installed()
     {
@@ -46,7 +46,7 @@ namespace updating
 
     std::optional<fs::path> download_dotnet()
     {
-        const wchar_t DOTNET_DESKTOP_DOWNLOAD_LINK[] = L"https://download.visualstudio.microsoft.com/download/pr/aa717f57-3ae5-48fa-a3ab-0018338d0726/fb37276b1575772461701339110e7a54/windowsdesktop-runtime-3.1.13-win-x64.exe";
+        const wchar_t DOTNET_DESKTOP_DOWNLOAD_LINK[] = L"https://download.visualstudio.microsoft.com/download/pr/88437980-f813-4a01-865c-f992ad4909bb/9a936984781f6ce3526ffc946267e0ea/windowsdesktop-runtime-3.1.14-win-x64.exe";
         const wchar_t DOTNET_DESKTOP_FILENAME[] = L"windowsdesktop-runtime.exe";
 
         auto dotnet_download_path = fs::temp_directory_path() / DOTNET_DESKTOP_FILENAME;

src/common/updating/installer.cpp

@@ -193,7 +193,7 @@ namespace updating
         co_return false;
     }
 
-    bool is_old_windows_version()
+    bool is_1809_or_older()
     {
         return !Is19H1OrHigher();
     }

src/common/updating/installer.h

@@ -17,5 +17,5 @@ namespace updating
     std::optional<VersionHelper> get_installed_powertoys_version();
     std::future<bool> uninstall_previous_msix_version_async();
 
-    bool is_old_windows_version();
+    bool is_1809_or_older();
 }