Merge PT #12

.github/actions/spell-check/expect.txt

@@ -278,6 +278,8 @@ CTEXT
 Ctl
 CTest
 CTEXT
+CTest
+CTEXT
 CTLCOLORSTATIC
 currentculture
 CURRENTDIR
@@ -1195,6 +1197,8 @@ OWNERDRAWFIXED
 OWRj
 OWNDC
 OWNERDRAWFIXED
+OWNDC
+OWNERDRAWFIXED
 Packagemanager
 PACL
 PAINTSTRUCT
@@ -1408,6 +1412,7 @@ regkey
 regroot
 REINSTALLMODE
 reloadable
+Relogger
 remappings
 REMAPRUNDLL
 REMAPSUCCESSFUL
@@ -1742,6 +1747,7 @@ TIcon
 TILEDWINDOW
 TILEINFO
 TILEDWINDOW
+TILEDWINDOW
 TILLSON
 timedate
 timediff

.pipelines/v2/templates/job-build-project.yml

@@ -198,13 +198,13 @@ jobs:
            "packages.config" | "$(Agent.OS)"
            "packages.config"
         path: packages
-
+  
   - ${{ if eq(parameters.useLatestWinAppSDK, true)}}:
     - template: .\steps-update-winappsdk-and-restore-nuget.yml
       parameters:
         versionNumber: ${{ parameters.winAppSDKVersionNumber }}
         useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-
+  
   - ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
     - template: .\steps-restore-nuget.yml
 

.pipelines/verifyDepsJsonLibraryVersions.ps1

@@ -46,10 +46,11 @@ Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude UITests-FancyZone
                             $dllName = Split-Path $_.Name -leaf
                             if([bool]($_.Value.PSObject.Properties.name -match 'fileVersion')) {
                                 $dllFileVersion = $_.Value.fileVersion
-                                if ([string]::IsNullOrEmpty($dllFileVersion) -and $dllName.StartsWith('PowerToys.'))` {
+                                if (([string]::IsNullOrEmpty($dllFileVersion) -or ($dllFileVersion -eq '0.0.0.0')) -and $dllName.StartsWith('PowerToys.'))` {
                                     # After VS 17.11 update some of PowerToys dlls have no fileVersion in deps.json even though the 
                                     # version is correctly set. This is a workaround to skip our dlls as we are confident that all of
                                     # our dlls share the same version across the dependencies.
+									# After VS 17.13 these error versions started appearing as 0.0.0.0 so we've added that case to the condition as well.
                                     continue
                                 }
 

.pipelines/versionAndSignCheck.ps1

@@ -19,6 +19,7 @@ $versionExceptions = @(
     "Microsoft.Xaml.Interactions.dll",
     "Microsoft.Xaml.Interactivity.dll",
     "hyjiacan.py4n.dll",
+    "TraceReloggerLib.dll",
     "Microsoft.WindowsAppRuntime.Release.Net.dll",
     "Microsoft.Windows.Widgets.Projection.dll",
     "WinRT.Host.Shim.dll",
@@ -64,6 +65,11 @@ if ($items.Count -eq 0) {
 }
 
 $items | ForEach-Object {
+    if ($_.VersionInfo.FileVersion -eq "0.0.0.0" -and $_.Name -notmatch $versionExceptions) {
+        # These items are exceptions that actually have the 0.0.0.0 version.
+        Write-Host "Version set to 0.0.0.0: " + $_.FullName
+        $totalFailure++;
+    }
     if ($_.VersionInfo.FileVersion -eq "1.0.0.0" -and $_.Name -notmatch $versionExceptions) {
         # These items are exceptions that actually have the 1.0.0.0 version.
         Write-Host "Version set to 1.0.0.0: " + $_.FullName

Directory.Packages.props

@@ -31,24 +31,23 @@
     <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <PackageVersion Include="MessagePack" Version="2.5.187" />
-    <PackageVersion Include="Microsoft.CmdPal.Extensions.SDK" Version="0.0.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.2" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"  Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"  Version="9.0.2" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.2" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.2" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.120-preview" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.2" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
     <!-- 
@@ -74,26 +73,26 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.19.27" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.1" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.2" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.1" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.1" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.1" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.2" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.2" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.2" />
     <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.1" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.2" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.1" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.2" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.2" />
     <PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
-    <PackageVersion Include="System.Management" Version="9.0.1" />
+    <PackageVersion Include="System.Management" Version="9.0.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.1" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.1" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.1" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.1" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.2" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.2" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.2" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.2" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.5.1" />

NOTICE.md

@@ -1324,22 +1324,22 @@ EXHIBIT A -Mozilla Public License.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 2.5.187
-- Microsoft.Bcl.AsyncInterfaces 9.0.1
+- Microsoft.Bcl.AsyncInterfaces 9.0.2
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.1
+- Microsoft.Data.Sqlite 9.0.2
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
-- Microsoft.Extensions.DependencyInjection 9.0.1
-- Microsoft.Extensions.Hosting 9.0.1
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.1
-- Microsoft.Extensions.Logging 9.0.1
-- Microsoft.Extensions.Logging.Abstractions 9.0.1
+- Microsoft.Extensions.DependencyInjection 9.0.2
+- Microsoft.Extensions.Hosting 9.0.2
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.2
+- Microsoft.Extensions.Logging 9.0.2
+- Microsoft.Extensions.Logging.Abstractions 9.0.2
 - Microsoft.NET.ILLink.Tasks (A)
 - Microsoft.SemanticKernel 1.15.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2903.40
-- Microsoft.Win32.SystemEvents 9.0.1
-- Microsoft.Windows.Compatibility 9.0.1
+- Microsoft.Win32.SystemEvents 9.0.2
+- Microsoft.Windows.Compatibility 9.0.2
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.1.5
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
@@ -1358,25 +1358,25 @@ EXHIBIT A -Mozilla Public License.
 - SharpCompress 0.37.2
 - StreamJsonRpc 2.19.27
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.1
+- System.CodeDom 9.0.2
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.1
-- System.Configuration.ConfigurationManager 9.0.1
-- System.Data.OleDb 9.0.1
+- System.ComponentModel.Composition 9.0.2
+- System.Configuration.ConfigurationManager 9.0.2
+- System.Data.OleDb 9.0.2
 - System.Data.SqlClient 4.8.6
-- System.Diagnostics.EventLog 9.0.1
-- System.Diagnostics.PerformanceCounter 9.0.1
-- System.Drawing.Common 9.0.1
+- System.Diagnostics.EventLog 9.0.2
+- System.Diagnostics.PerformanceCounter 9.0.2
+- System.Drawing.Common 9.0.2
 - System.IO.Abstractions 21.0.29
 - System.IO.Abstractions.TestingHelpers 21.0.29
-- System.Management 9.0.1
+- System.Management 9.0.2
 - System.Net.Http 4.3.4
 - System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.1
-- System.ServiceProcess.ServiceController 9.0.1
-- System.Text.Encoding.CodePages 9.0.1
-- System.Text.Json 9.0.1
+- System.Runtime.Caching 9.0.2
+- System.ServiceProcess.ServiceController 9.0.2
+- System.Text.Encoding.CodePages 9.0.2
+- System.Text.Json 9.0.2
 - System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0

doc/devdocs/settingsv2/runner-ipc.md

@@ -3,8 +3,8 @@
 The Settings v2 process uses two way IPC to communicate with the runner process.
 
 ## Initialization
-- On the settings' side, the two way IPC delegates are contained with the [`ShellPage.xaml.cs`](/src/settings-ui/Settings.UI/Views/ShellPage.xaml.cs) file. The delegates are static and the views for all the powerToys send the ipc information to the viewmodels as `ShellPage.DefaultSndMSGCallBack`.
-- These delegates are initialized within the [`MainWindow.xaml.cs`](/src/settings-ui/Settings.UI/MainWindow.xaml.cs) file in the `Settings.Runner` project.
+- On the settings' side, the two way IPC delegates are contained with the [`ShellPage.xaml.cs`](/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs) file. The delegates are static and the views for all the powerToys send the ipc information to the viewmodels as `ShellPage.DefaultSndMSGCallBack`.
+- These delegates are initialized within the [`MainWindow.xaml.cs`](/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs) file in the `Settings.Runner` project.
 
 
 ## Types of IPC delegates
@@ -14,12 +14,12 @@ The Settings v2 process uses two way IPC to communicate with the runner process.
 3. `CheckForUpdates`
 
 ## Sending information to runner
-- The settings process communicates with the runner by using the delegates defined within the [`ShellPage.xaml.cs`](/src/settings-ui/Settings.UI/Views/ShellPage.xaml.cs) file.
+- The settings process communicates with the runner by using the delegates defined within the [`ShellPage.xaml.cs`](/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml.cs) file.
 - Depending on the type of object sending the information, the json is created accordingly.
 - If any information has been modified by the user in the GeneralSettings page, then the json file sent to the runner has the name set to `general`, whereas if any information has been modified by the user in any powertoy related settings page, the name of the json file being communicated with the runner is set to `powertoy`.
 
 ## Receiving information from runner
-- The `ShellPage`object has a `IPCResponseHandleList` which is a list of functions which handle IPC responses. 
+- The `ShellPage` object has a `IPCResponseHandleList` which is a list of functions which handle IPC responses. 
 
 ```csharp
 // receive IPC Message
@@ -43,4 +43,4 @@ Program.IPCMessageReceivedCallback = (string msg) =>
 ```
 
 - Whenever any information is sent from the runner each of the functions in the handle list perform their action on that json object.
-- One example of where information sent from the runner is being processed by the settings is in [`GeneralPage.xaml.cs`](/src/settings-ui/Settings.UI/Views/GeneralPage.xaml.cs) when the user clicks the check for updates button. The information displayed after, such as the user has the latest version installed is a result of this handle.
+- One example of where information sent from the runner is being processed by the settings is in [`GeneralPage.xaml.cs`](/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs) when the user clicks the check for updates button. The information displayed after, such as the user has the latest version installed is a result of this handle.