Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-01-16 01:06:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51 from zadjii-msft/merge-wasdk-1.6

Browse Source 
Merge latest PowerToys main with Windows App SDK 1.6
This commit is contained in:
Clint Rutkas
2024-09-12 08:51:34 -07:00
committed by GitHub
parent d89d2c9c1c a1a2677c2d
commit f464b6979c
124 changed files with 191 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/spell-check/expect.txt vendored
View File

@@ -266,6 +266,7 @@ CSettings
cso
CSRW
CStyle
cswinrt
CSY
CTest
currentculture

11
.github/policies/resourceManagement.yml vendored
View File

@@ -241,6 +241,17 @@ configuration:
then:
- addReply:
reply: Hi! Your last comment indicates to our system, that you might want to contribute to this feature/fix this bug. Thank you! Please make us aware on our ["Would you like to contribute to PowerToys?" thread](https://github.com/microsoft/PowerToys/issues/28769), as we don't see all the comments. <br /><br />_I'm a bot (beep!) so please excuse any mistakes I may make_
description:
- if:
- payloadType: Issues
- isAction:
action: Opened
- bodyContains:
pattern: 'Area\(s\) with issue\?\s*\nWorkspaces'
isRegex: True
then:
- addLabel:
label: Product-Workspaces
description:
onFailure:
onSuccess:

10
Directory.Packages.props
View File

@@ -35,15 +35,19 @@
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
<PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2365.46" />
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
<!-- 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="8.0.0" />
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.7" />
<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. -->
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.0.8" />
<!--
TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.
This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
-->
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
<PackageVersion Include="ModernWpfUI" Version="0.9.4" />

6
NOTICE.md
View File

@@ -1325,13 +1325,13 @@ EXHIBIT A -Mozilla Public License.
- Microsoft.Extensions.Logging 8.0.0
- Microsoft.Extensions.Logging.Abstractions 8.0.0
- Microsoft.Toolkit.Uwp.Notifications 7.1.2
- Microsoft.Web.WebView2 1.0.2365.46
- Microsoft.Web.WebView2 1.0.2739.15
- Microsoft.Win32.SystemEvents 8.0.0
- Microsoft.Windows.Compatibility 8.0.7
- Microsoft.Windows.CsWin32 0.2.46-beta
- Microsoft.Windows.CsWinRT 2.0.8
- Microsoft.Windows.CsWinRT 2.1.1
- Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
- Microsoft.WindowsAppSDK 1.5.240428000
- Microsoft.WindowsAppSDK 1.6.240829007
- Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
- Microsoft.Xaml.Behaviors.Wpf 1.1.39
- ModernWpfUI 0.9.4

16
README.md
View File

@@ -43,17 +43,17 @@ Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and cl
<!-- items that need to be updated release to release -->
[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.85%22
[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.84%22
[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.0/PowerToysUserSetup-0.84.0-x64.exe
[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.0/PowerToysUserSetup-0.84.0-arm64.exe
[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.0/PowerToysSetup-0.84.0-x64.exe
[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.0/PowerToysSetup-0.84.0-arm64.exe
[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysUserSetup-0.84.1-x64.exe
[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysUserSetup-0.84.1-arm64.exe
[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysSetup-0.84.1-x64.exe
[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysSetup-0.84.1-arm64.exe
| Description | Filename | sha256 hash |
|----------------|----------|-------------|
| Per user - x64 | [PowerToysUserSetup-0.84.0-x64.exe][ptUserX64] | 6792180D697ED9FDF9AA7B3F0AB92767CF4C79B526715C802F545E2DCB201BE3 |
| Per user - ARM64 | [PowerToysUserSetup-0.84.0-arm64.exe][ptUserArm64] | 3D071F009B5E3DBAD21D7450ADB53CBC85CAFB21016E44F414E2A03C188D2FAF |
| Machine wide - x64 | [PowerToysSetup-0.84.0-x64.exe][ptMachineX64] | 67B7E685AAF635803A87D8EE96CA1AF5024910B0BF00A9277CD77C810D049446 |
| Machine wide - ARM64 | [PowerToysSetup-0.84.0-arm64.exe][ptMachineArm64] | 259DA1EFB33A616CF64840B8D8AB84F86A43F61687578B43849D5DE11F77AF82 |
| Per user - x64 | [PowerToysUserSetup-0.84.1-x64.exe][ptUserX64] | 1CDAF3482B031D84DAE15188DE292FB44C5D211698089921040D94B256EBD3CA |
| Per user - ARM64 | [PowerToysUserSetup-0.84.1-arm64.exe][ptUserArm64] | E0207EF5147EE281D4F438E87A30586D8CAA24DE948950FF1B12E05454622CD9 |
| Machine wide - x64 | [PowerToysSetup-0.84.1-x64.exe][ptMachineX64] | 10DF9774DE1857051E135B9790A18A92C5C7F42587C733DEE991186E67231EE0 |
| Machine wide - ARM64 | [PowerToysSetup-0.84.1-arm64.exe][ptMachineArm64] | EB5DDA5EFBA17E813DBF24AFF668DDF5424ED3659234ABBC15441D478D812699 |
This is our preferred method.

8
src/Common.Dotnet.CsWinRT.props
View File

@@ -2,6 +2,7 @@
<!-- Some items may be set in Directory.Build.props in root -->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WindowsSdkPackageVersion>10.0.20348.38</WindowsSdkPackageVersion>
<TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
@@ -33,4 +34,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" />
</ItemGroup>
<!-- this may need to be removed on future CsWinRT upgrades-->
<Target Name="RemoveCsWinRTPackageAnalyzer" BeforeTargets="CoreCompile">
<ItemGroup>
<Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />   
</ItemGroup>
</Target>
</Project>

2
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs
View File

@@ -9,7 +9,7 @@ namespace AdvancedPaste.Controls
{
[TemplatePart(Name = LoadingGrid, Type = typeof(Grid))]
[TemplatePart(Name = LoadingBrush, Type = typeof(AnimatedBorderBrush))]
public class AnimatedContentControl : ContentControl
public partial class AnimatedContentControl : ContentControl
{
internal const string LoadingGrid = "PART_LoadingGrid";
internal const string LoadingBrush = "PART_LoadingBrush";

2
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data;
namespace AdvancedPaste.Converters;
public sealed class CountToDoubleConverter : IValueConverter
public sealed partial class CountToDoubleConverter : IValueConverter
{
public double ValueIfZero { get; set; }

2
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs
View File

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Data;
namespace AdvancedPaste.Converters;
public sealed class CountToVisibilityConverter : IValueConverter
public sealed partial class CountToVisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

2
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data;
namespace EnvironmentVariablesUILib.Converters;
public class EnvironmentStateToBoolConverter : IValueConverter
public partial class EnvironmentStateToBoolConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

2
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs
View File

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Data;
namespace EnvironmentVariablesUILib.Converters;
public class EnvironmentStateToMessageConverter : IValueConverter
public partial class EnvironmentStateToMessageConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

2
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs
View File

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Data;
namespace EnvironmentVariablesUILib.Converters;
public class EnvironmentStateToTitleConverter : IValueConverter
public partial class EnvironmentStateToTitleConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

2
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs
View File

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Data;
namespace EnvironmentVariablesUILib.Converters;
public class EnvironmentStateToVisibilityConverter : IValueConverter
public partial class EnvironmentStateToVisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

2
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Data;
namespace EnvironmentVariablesUILib.Converters;
public class VariableTypeToGlyphConverter : IValueConverter
public partial class VariableTypeToGlyphConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

3
src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs
View File

@@ -4,11 +4,10 @@
using System;
using Microsoft.UI.Xaml.Data;
using PowerToys.FileLocksmithLib.Interop;
namespace PowerToys.FileLocksmithUI.Converters
{
public sealed class FileCountConverter : IValueConverter
public sealed partial class FileCountConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

3
src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs
View File

@@ -5,11 +5,10 @@
using System;
using System.IO;
using Microsoft.UI.Xaml.Data;
using PowerToys.FileLocksmithLib.Interop;
namespace PowerToys.FileLocksmithUI.Converters
{
public sealed class FileListToDescriptionConverter : IValueConverter
public sealed partial class FileListToDescriptionConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

3
src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs
View File

@@ -7,11 +7,10 @@ using System.Drawing;
using System.IO;
using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Media.Imaging;
using Windows.Storage;
namespace PowerToys.FileLocksmithUI.Converters
{
public sealed class PidToIconConverter : IValueConverter
public sealed partial class PidToIconConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

4
src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs
View File

@@ -3,14 +3,12 @@
// See the LICENSE file in the project root for more information.
using System;
using System.Globalization;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data;
using PowerToys.FileLocksmithLib.Interop;
namespace PowerToys.FileLocksmithUI.Converters
{
public sealed class UserToSystemWarningVisibilityConverter : IValueConverter
public sealed partial class UserToSystemWarningVisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

10
src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" />
<Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props')" />
<Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
<Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
@@ -141,7 +141,8 @@
<Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -152,7 +153,8 @@
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets'))" />
</Target>
</Project>

3
src/modules/MeasureTool/MeasureToolCore/packages.config
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
<package id="Microsoft.WindowsAppSDK" version="1.5.240428000" targetFramework="native" />
<package id="Microsoft.WindowsAppSDK" version="1.6.240829007" targetFramework="native" />
</packages>

5
src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs
View File

@@ -56,6 +56,11 @@ namespace MeasureToolUI
this.SetIsMaximizable(false);
IsTitleBarVisible = false;
// Remove the caption style from the window style. Windows App SDK 1.6 added it, which made the title bar and borders appear for Measure Tool. This code removes it.
var windowStyle = GetWindowLong(hwnd, GWL_STYLE);
windowStyle = windowStyle & (~WS_CAPTION);
_ = SetWindowLong(hwnd, GWL_STYLE, windowStyle);
_coreLogic = core;
Closed += MainWindow_Closed;
DisplayArea displayArea = DisplayArea.GetFromWindowId(windowId, DisplayAreaFallback.Nearest);

9
src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs
View File

@@ -15,4 +15,13 @@ internal static class NativeMethods
internal const uint SWP_NOMOVE = 0x0002;
internal const uint SWP_NOACTIVATE = 0x0010;
internal const uint SWP_SHOWWINDOW = 0x0040;
[DllImport("user32.dll", SetLastError = true)]
internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
[DllImport("user32.dll")]
internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
internal const int GWL_STYLE = -16;
internal const int WS_CAPTION = 0x00C00000;
}

4
src/modules/cmdpal/.vsconfig
View File

@@ -17,8 +17,6 @@
"Microsoft.VisualStudio.Component.NuGet",
"Microsoft.Component.ClickOnce",
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
"Microsoft.NetCore.Component.Runtime.6.0",
"Microsoft.NetCore.Component.Runtime.7.0",
"Microsoft.NetCore.Component.SDK",
"Microsoft.VisualStudio.Component.FSharp",
"Microsoft.ComponentGroup.ClickOnce.Publish",
@@ -39,7 +37,7 @@
"Microsoft.VisualStudio.ComponentGroup.WindowsAppSDK.Cs",
"Microsoft.ComponentGroup.Blend",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Component.Windows11SDK.22000",
"Microsoft.VisualStudio.Component.Windows10SDK.20348",
"Microsoft.VisualStudio.Component.Windows10SDK.19041"
]
}

2
src/modules/cmdpal/Exts/HackerNewsExtension/CommentAction.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace HackerNewsExtension;
internal sealed class CommentAction : InvokableCommand
internal sealed partial class CommentAction : InvokableCommand
{
private readonly NewsPost _post;

2
src/modules/cmdpal/Exts/HackerNewsExtension/HackerNewsActionsProvider.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace HackerNewsExtension;
public class HackerNewsActionsProvider : ICommandProvider
public partial class HackerNewsActionsProvider : ICommandProvider
{
public string DisplayName => $"Hacker News Commands";

2
src/modules/cmdpal/Exts/HackerNewsExtension/HackerNewsPage.cs
View File

@@ -13,7 +13,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace HackerNewsExtension;
internal sealed class HackerNewsPage : ListPage
internal sealed partial class HackerNewsPage : ListPage
{
public HackerNewsPage()
{

2
src/modules/cmdpal/Exts/HackerNewsExtension/LinkAction.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace HackerNewsExtension;
internal sealed class LinkAction : InvokableCommand
internal sealed partial class LinkAction : InvokableCommand
{
private readonly NewsPost _post;

2
src/modules/cmdpal/Exts/HackerNewsExtension/SampleExtension.cs
View File

@@ -12,7 +12,7 @@ namespace HackerNewsExtension;
[ComVisible(true)]
[Guid("283DDB0F-1AD9-406F-B359-699BFBD2DA68")]
[ComDefaultInterface(typeof(IExtension))]
public sealed class SampleExtension : IExtension
public sealed partial class SampleExtension : IExtension
{
private readonly ManualResetEvent _extensionDisposedEvent;

4
src/modules/cmdpal/Exts/MastodonExtension/MastodonExtensionPage.cs
View File

@@ -9,7 +9,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace MastodonExtension;
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "This is sample code")]
internal sealed class MastodonExtensionPage : ListPage
internal sealed partial class MastodonExtensionPage : ListPage
{
public MastodonExtensionPage()
{
@@ -31,7 +31,7 @@ internal sealed class MastodonExtensionPage : ListPage
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "This is sample code")]
public class MastodonExtensionActionsProvider : ICommandProvider
public partial class MastodonExtensionActionsProvider : ICommandProvider
{
public string DisplayName => $"Mastodon extension for cmdpal Commands";

2
src/modules/cmdpal/Exts/MastodonExtension/SampleExtension.cs
View File

@@ -12,7 +12,7 @@ namespace MastodonExtension;
[ComVisible(true)]
[Guid("f0e93f1a-2b64-4896-abcc-8d2145480ede")]
[ComDefaultInterface(typeof(IExtension))]
public sealed class SampleExtension : IExtension
public sealed partial class SampleExtension : IExtension
{
private readonly ManualResetEvent _extensionDisposedEvent;

2
src/modules/cmdpal/Exts/MediaControlsExtension/MediaActionsProvider.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions;
namespace MediaControlsExtension;
public class MediaActionsProvider : ICommandProvider
public partial class MediaActionsProvider : ICommandProvider
{
public string DisplayName => $"Media controls actions";

2
src/modules/cmdpal/Exts/MediaControlsExtension/MediaListItem.cs
View File

@@ -9,7 +9,7 @@ using Windows.Media.Control;
namespace MediaControlsExtension;
internal sealed class MediaListItem : ListItem
internal sealed partial class MediaListItem : ListItem
{
private GlobalSystemMediaTransportControlsSession _mediaSession;

2
src/modules/cmdpal/Exts/MediaControlsExtension/PrevNextTrackAction.cs
View File

@@ -8,7 +8,7 @@ using Windows.Media.Control;
namespace MediaControlsExtension;
internal sealed class PrevNextTrackAction : InvokableCommand
internal sealed partial class PrevNextTrackAction : InvokableCommand
{
private readonly GlobalSystemMediaTransportControlsSession _mediaSession;
private readonly bool _previous;

2
src/modules/cmdpal/Exts/MediaControlsExtension/SampleExtension.cs
View File

@@ -12,7 +12,7 @@ namespace MediaControlsExtension;
[ComVisible(true)]
[Guid("bb60a98a-0197-4378-9b40-b684f4068d1d")]
[ComDefaultInterface(typeof(IExtension))]
public sealed class SampleExtension : IExtension
public sealed partial class SampleExtension : IExtension
{
private readonly ManualResetEvent _extensionDisposedEvent;

2
src/modules/cmdpal/Exts/MediaControlsExtension/TogglePlayMediaAction.cs
View File

@@ -7,7 +7,7 @@ using Windows.Media.Control;
namespace MediaControlsExtension;
public sealed class TogglePlayMediaAction : InvokableCommand
public sealed partial class TogglePlayMediaAction : InvokableCommand
{
public GlobalSystemMediaTransportControlsSession MediaSession { get; set; }

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkForm.cs
View File

@@ -10,7 +10,7 @@ using Windows.Foundation;
namespace Microsoft.CmdPal.Ext.Bookmarks;
internal sealed class AddBookmarkForm : Form
internal sealed partial class AddBookmarkForm : Form
{
internal event TypedEventHandler<object, object?>? AddedAction;

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkPage.cs
View File

@@ -8,7 +8,7 @@ using Windows.Foundation;
namespace Microsoft.CmdPal.Ext.Bookmarks;
internal sealed class AddBookmarkPage : FormPage
internal sealed partial class AddBookmarkPage : FormPage
{
private readonly AddBookmarkForm _addBookmark = new();

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderForm.cs
View File

@@ -12,7 +12,7 @@ using Windows.System;
namespace Microsoft.CmdPal.Ext.Bookmarks;
internal sealed class BookmarkPlaceholderForm : Form
internal sealed partial class BookmarkPlaceholderForm : Form
{
private readonly List<string> _placeholderNames;

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderPage.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace Microsoft.CmdPal.Ext.Bookmarks;
internal sealed class BookmarkPlaceholderPage : FormPage
internal sealed partial class BookmarkPlaceholderPage : FormPage
{
private readonly IForm _bookmarkPlaceholder;

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs
View File

@@ -11,7 +11,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace Microsoft.CmdPal.Ext.Bookmarks;
public class BookmarksCommandProvider : ICommandProvider
public partial class BookmarksCommandProvider : ICommandProvider
{
public string DisplayName => $"Bookmarks";

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/OpenInTerminalAction.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace Microsoft.CmdPal.Ext.Bookmarks;
internal sealed class OpenInTerminalAction : InvokableCommand
internal sealed partial class OpenInTerminalAction : InvokableCommand
{
private readonly string _folder;

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Bookmark/UrlAction.cs
View File

@@ -8,7 +8,7 @@ using Windows.System;
namespace Microsoft.CmdPal.Ext.Bookmarks;
public class UrlAction : InvokableCommand
public partial class UrlAction : InvokableCommand
{
private bool IsContainsPlaceholder => _url.Contains('{') && _url.Contains('}');

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorAction.cs
View File

@@ -10,7 +10,7 @@ using Windows.ApplicationModel.DataTransfer;
// and more about our project templates, see: http://aka.ms/winui-project-info.
namespace Microsoft.CmdPal.Ext.Calc;
public class CalculatorAction : InvokableCommand
public partial class CalculatorAction : InvokableCommand
{
private bool _success;
private string _result = string.Empty;

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorCommandProvider.cs
View File

@@ -9,7 +9,7 @@ using Microsoft.CmdPal.Extensions;
// and more about our project templates, see: http://aka.ms/winui-project-info.
namespace Microsoft.CmdPal.Ext.Calc;
public class CalculatorCommandProvider : ICommandProvider
public partial class CalculatorCommandProvider : ICommandProvider
{
public string DisplayName => $"Calculator";

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Calc/CalculatorTopLevelListItem.cs
View File

@@ -11,7 +11,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
// and more about our project templates, see: http://aka.ms/winui-project-info.
namespace Microsoft.CmdPal.Ext.Calc;
public class CalculatorTopLevelListItem : ListItem, IFallbackHandler
public partial class CalculatorTopLevelListItem : ListItem, IFallbackHandler
{
public CalculatorTopLevelListItem()
: base(new CalculatorAction())

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.CmdPalSettings/SettingsCommandProvider.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace Microsoft.CmdPal.Ext.Settings;
public class SettingsCommandProvider : ICommandProvider
public partial class SettingsCommandProvider : ICommandProvider
{
public string DisplayName => $"Settings";

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.CmdPalSettings/SettingsForm.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace Microsoft.CmdPal.Ext.Settings;
internal sealed class SettingsForm : Form
internal sealed partial class SettingsForm : Form
{
public SettingsForm()
{

2
src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.CmdPalSettings/SettingsPage.cs
View File

@@ -9,7 +9,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
// and more about our project templates, see: http://aka.ms/winui-project-info.
namespace Microsoft.CmdPal.Ext.Settings;
internal sealed class SettingsPage : FormPage
internal sealed partial class SettingsPage : FormPage
{
private readonly SettingsForm _settings = new();

2
src/modules/cmdpal/Exts/ProcessMonitorExtension/ProcessListPage.cs
View File

@@ -11,7 +11,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace ProcessMonitorExtension;
internal sealed class ProcessListPage : ListPage
internal sealed partial class ProcessListPage : ListPage
{
public ProcessListPage()
{

2
src/modules/cmdpal/Exts/ProcessMonitorExtension/ProcessMonitorCommandProvider.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace ProcessMonitorExtension;
internal sealed class ProcessMonitorCommandProvider : ICommandProvider
internal sealed partial class ProcessMonitorCommandProvider : ICommandProvider
{
public string DisplayName => "Process Monitor Commands";

2
src/modules/cmdpal/Exts/ProcessMonitorExtension/SampleExtension.cs
View File

@@ -12,7 +12,7 @@ namespace ProcessMonitorExtension;
[ComVisible(true)]
[Guid("8BD7A6C4-7185-4426-AE8D-61E438A3E740")]
[ComDefaultInterface(typeof(IExtension))]
public sealed class SampleExtension : IExtension
public sealed partial class SampleExtension : IExtension
{
private readonly ManualResetEvent _extensionDisposedEvent;

2
src/modules/cmdpal/Exts/ProcessMonitorExtension/SwitchToProcess.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace ProcessMonitorExtension;
internal sealed class SwitchToProcess : InvokableCommand
internal sealed partial class SwitchToProcess : InvokableCommand
{
[DllImport("user32.dll")]
public static extern void SwitchToThisWindow(IntPtr hWnd, bool fAltTab);

2
src/modules/cmdpal/Exts/ProcessMonitorExtension/TerminateProcess.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace ProcessMonitorExtension;
internal sealed class TerminateProcess : InvokableCommand
internal sealed partial class TerminateProcess : InvokableCommand
{
private readonly ProcessItem _process;

2
src/modules/cmdpal/Exts/SSHKeychainExtension/Commands/LaunchSSHHostCommand.cs
View File

@@ -14,7 +14,7 @@ using SSHKeychainExtension.Data;
namespace SSHKeychainExtension.Commands;
internal sealed class LaunchSSHHostCommand : InvokableCommand
internal sealed partial class LaunchSSHHostCommand : InvokableCommand
{
private readonly SSHKeychainItem _host;

2
src/modules/cmdpal/Exts/SSHKeychainExtension/CommentAction.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SSHKeychainExtension;
internal sealed class CommentAction : InvokableCommand
internal sealed partial class CommentAction : InvokableCommand
{
private readonly NewsPost _post;

2
src/modules/cmdpal/Exts/SSHKeychainExtension/LinkAction.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SSHKeychainExtension;
internal sealed class LinkAction : InvokableCommand
internal sealed partial class LinkAction : InvokableCommand
{
private readonly NewsPost _post;

2
src/modules/cmdpal/Exts/SSHKeychainExtension/Pages/SSHHostsListPage.cs
View File

@@ -20,7 +20,7 @@ using SSHKeychainExtension.Data;
namespace SSHKeychainExtension;
internal sealed class SSHHostsListPage : ListPage
internal sealed partial class SSHHostsListPage : ListPage
{
private static readonly string _defaultConfigFile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "\\.ssh\\config";

2
src/modules/cmdpal/Exts/SSHKeychainExtension/SSHKeychainCommandsProvider.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SSHKeychainExtension;
public class SSHKeychainCommandsProvider : ICommandProvider
public partial class SSHKeychainCommandsProvider : ICommandProvider
{
public string DisplayName => $"SSH Keychain Commands";

2
src/modules/cmdpal/Exts/SSHKeychainExtension/SampleExtension.cs
View File

@@ -12,7 +12,7 @@ namespace SSHKeychainExtension;
[ComVisible(true)]
[Guid("D07A5785-2334-4686-9A49-AE19D992284F")]
[ComDefaultInterface(typeof(IExtension))]
public sealed class SampleExtension : IExtension
public sealed partial class SampleExtension : IExtension
{
private readonly ManualResetEvent _extensionDisposedEvent;

2
src/modules/cmdpal/Exts/SamplePagesExtension/Forms/SampleForm.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SamplePagesExtension;
internal sealed class SampleForm : Form
internal sealed partial class SampleForm : Form
{
public SampleForm()
{

2
src/modules/cmdpal/Exts/SamplePagesExtension/Pages/SampleDynamicListPage.cs
View File

@@ -18,7 +18,7 @@ using Microsoft.UI.Windowing;
namespace SamplePagesExtension;
internal sealed class SampleDynamicListPage : DynamicListPage
internal sealed partial class SampleDynamicListPage : DynamicListPage
{
public SampleDynamicListPage()
{

2
src/modules/cmdpal/Exts/SamplePagesExtension/Pages/SampleFormPage.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SamplePagesExtension;
internal sealed class SampleFormPage : FormPage
internal sealed partial class SampleFormPage : FormPage
{
private readonly SampleForm sampleForm = new();

2
src/modules/cmdpal/Exts/SamplePagesExtension/Pages/SampleListPage.cs
View File

@@ -18,7 +18,7 @@ using Microsoft.UI.Windowing;
namespace SamplePagesExtension;
internal sealed class SampleListPage : ListPage
internal sealed partial class SampleListPage : ListPage
{
public SampleListPage()
{

2
src/modules/cmdpal/Exts/SamplePagesExtension/Pages/SampleListPageWithDetails.cs
View File

@@ -18,7 +18,7 @@ using Microsoft.UI.Windowing;
namespace SamplePagesExtension;
internal sealed class SampleListPageWithDetails : ListPage
internal sealed partial class SampleListPageWithDetails : ListPage
{
public SampleListPageWithDetails()
{

2
src/modules/cmdpal/Exts/SamplePagesExtension/Pages/SampleMarkdownPage.cs
View File

@@ -18,7 +18,7 @@ using Microsoft.UI.Windowing;
namespace SamplePagesExtension;
internal sealed class SampleMarkdownPage : MarkdownPage
internal sealed partial class SampleMarkdownPage : MarkdownPage
{
private readonly string _markdown = @"
# Markdown Guide

2
src/modules/cmdpal/Exts/SamplePagesExtension/SampleExtension.cs
View File

@@ -12,7 +12,7 @@ namespace SamplePagesExtension;
[ComVisible(true)]
[Guid("6112D28D-6341-45C8-92C3-83ED55853A9F")]
[ComDefaultInterface(typeof(IExtension))]
public sealed class SampleExtension : IExtension
public sealed partial class SampleExtension : IExtension
{
private readonly ManualResetEvent _extensionDisposedEvent;

2
src/modules/cmdpal/Exts/SamplePagesExtension/SamplePagesCommandsProvider.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SamplePagesExtension;
public class SamplePagesCommandsProvider : ICommandProvider
public partial class SamplePagesCommandsProvider : ICommandProvider
{
public string DisplayName => $"Sample Pages Commands";

2
src/modules/cmdpal/Exts/SpongebotExtension/CopyTextAction.cs
View File

@@ -8,7 +8,7 @@ using Windows.ApplicationModel.DataTransfer;
namespace SpongebotExtension;
public class CopyTextAction : InvokableCommand
public partial class CopyTextAction : InvokableCommand
{
internal string Text { get; set; }

2
src/modules/cmdpal/Exts/SpongebotExtension/SampleExtension.cs
View File

@@ -12,7 +12,7 @@ namespace SpongebotExtension;
[ComVisible(true)]
[Guid("a50859fc-a214-4852-b47b-62ada70df7bc")]
[ComDefaultInterface(typeof(IExtension))]
public sealed class SampleExtension : IExtension
public sealed partial class SampleExtension : IExtension
{
private readonly ManualResetEvent _extensionDisposedEvent;

2
src/modules/cmdpal/Exts/SpongebotExtension/SpongeSettingsForm.cs
View File

@@ -10,7 +10,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SpongebotExtension;
internal sealed class SpongeSettingsForm : Form
internal sealed partial class SpongeSettingsForm : Form
{
public override string TemplateJson()
{

2
src/modules/cmdpal/Exts/SpongebotExtension/SpongebotCommandsProvider.cs
View File

@@ -9,7 +9,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SpongebotExtension;
internal sealed class SpongebotCommandsProvider : ICommandProvider
internal sealed partial class SpongebotCommandsProvider : ICommandProvider
{
public string DisplayName => $"Spongebob, mocking";

2
src/modules/cmdpal/Exts/SpongebotExtension/SpongebotPage.cs
View File

@@ -12,7 +12,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SpongebotExtension;
public class SpongebotPage : MarkdownPage, IFallbackHandler
public partial class SpongebotPage : MarkdownPage, IFallbackHandler
{
public CopyTextAction CopyTextAction { get; set; } = new(string.Empty);

2
src/modules/cmdpal/Exts/SpongebotExtension/SpongebotSettingsPage.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace SpongebotExtension;
internal sealed class SpongebotSettingsPage : FormPage
internal sealed partial class SpongebotSettingsPage : FormPage
{
private readonly SpongeSettingsForm settingsForm = new();

2
src/modules/cmdpal/Exts/TemplateExtension/SampleExtension.cs
View File

@@ -12,7 +12,7 @@ namespace TemplateExtension;
[ComVisible(true)]
[Guid("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF")]
[ComDefaultInterface(typeof(IExtension))]
public sealed class SampleExtension : IExtension
public sealed partial class SampleExtension : IExtension
{
private readonly ManualResetEvent _extensionDisposedEvent;

4
src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionPage.cs
View File

@@ -9,7 +9,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace TemplateExtension;
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "This is sample code")]
internal sealed class TemplateExtensionPage : ListPage
internal sealed partial class TemplateExtensionPage : ListPage
{
public TemplateExtensionPage()
{
@@ -31,7 +31,7 @@ internal sealed class TemplateExtensionPage : ListPage
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "This is sample code")]
public class TemplateExtensionActionsProvider : ICommandProvider
public partial class TemplateExtensionActionsProvider : ICommandProvider
{
public string DisplayName => $"TemplateDisplayName Commands";

1
src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj
View File

@@ -15,6 +15,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.WindowsAppSDK" />
<PackageReference Include="Microsoft.Web.WebView2" /> <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
</ItemGroup>
<ItemGroup>

5
src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
View File

@@ -2,8 +2,9 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PathToRoot>..\..\..\..\</PathToRoot>
<WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.5.240428000</WasdkNuget>
<WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.6.240829007</WasdkNuget>
<CppWinRTNuget>$(PathToRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5</CppWinRTNuget>
<WebView2Nuget>$(PathToRoot)packages\Microsoft.Web.WebView2.1.0.2739.15</WebView2Nuget>
</PropertyGroup>
<Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" />
<Import Project="$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.props')" />
@@ -188,6 +189,7 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="$(WebView2Nuget)\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(WebView2Nuget)\build\native\Microsoft.Web.WebView2.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -198,6 +200,7 @@
<Error Condition="!Exists('$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props'))" />
<Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets'))" />
<Error Condition="!Exists('$(WebView2Nuget)\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(WebView2Nuget)\build\native\Microsoft.Web.WebView2.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
</Target>
<ItemGroup>

1
src/modules/cmdpal/Microsoft.Terminal.UI/packages.config
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- The packages.config acts as the global version for all of the NuGet packages contained within. -->
<packages>
<package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240122.1" targetFramework="native" developmentDependency="true" />
</packages>

2
src/modules/cmdpal/WindowsCommandPalette/Builtins/Apps/AllAppsPage.cs
View File

@@ -10,7 +10,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace WindowsCommandPalette.BuiltinCommands.AllApps;
public sealed class AllAppsPage : ListPage
public sealed partial class AllAppsPage : ListPage
{
private ISection allAppsSection = new ListSection();

2
src/modules/cmdpal/WindowsCommandPalette/Builtins/Apps/AppAction.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace WindowsCommandPalette.BuiltinCommands.AllApps;
internal sealed class AppAction : InvokableCommand
internal sealed partial class AppAction : InvokableCommand
{
private readonly AppItem _app;

2
src/modules/cmdpal/WindowsCommandPalette/Builtins/Apps/AppListItem.cs
View File

@@ -6,7 +6,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace WindowsCommandPalette.BuiltinCommands.AllApps;
internal sealed class AppListItem : ListItem
internal sealed partial class AppListItem : ListItem
{
private readonly AppItem _app;

2
src/modules/cmdpal/WindowsCommandPalette/Builtins/Apps/OpenPathAction.cs
View File

@@ -8,7 +8,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace WindowsCommandPalette.BuiltinCommands.AllApps;
// NOTE this is pretty close to what we'd put in the SDK
internal sealed class OpenPathAction(string target) : InvokableCommand
internal sealed partial class OpenPathAction(string target) : InvokableCommand
{
private readonly string _target = target;

2
src/modules/cmdpal/WindowsCommandPalette/Builtins/QuitAction/QuitAction.cs
View File

@@ -8,7 +8,7 @@ using Windows.Foundation;
namespace WindowsCommandPalette.BuiltinCommands;
public class QuitAction : InvokableCommand, IFallbackHandler
public partial class QuitAction : InvokableCommand, IFallbackHandler
{
public event TypedEventHandler<object?, object?>? QuitRequested;

2
src/modules/cmdpal/WindowsCommandPalette/Builtins/QuitAction/QuitCommandProvider.cs
View File

@@ -8,7 +8,7 @@ using Windows.Foundation;
namespace WindowsCommandPalette.BuiltinCommands;
public class QuitCommandProvider : ICommandProvider
public partial class QuitCommandProvider : ICommandProvider
{
public string DisplayName => string.Empty;

2
src/modules/cmdpal/WindowsCommandPalette/Builtins/ReloadExtensionsAction.cs
View File

@@ -8,7 +8,7 @@ using Windows.Foundation;
namespace WindowsCommandPalette.BuiltinCommands;
public class ReloadExtensionsAction : InvokableCommand, IFallbackHandler
public partial class ReloadExtensionsAction : InvokableCommand, IFallbackHandler
{
public ReloadExtensionsAction()
{

2
src/modules/cmdpal/WindowsCommandPalette/Builtins/ReloadExtensionsCommandProvider.cs
View File

@@ -8,7 +8,7 @@ using Windows.Foundation;
namespace WindowsCommandPalette.BuiltinCommands;
public class ReloadExtensionsCommandProvider : ICommandProvider
public partial class ReloadExtensionsCommandProvider : ICommandProvider
{
public string DisplayName => string.Empty;

2
src/modules/cmdpal/WindowsCommandPalette/FilteredListSection.cs
View File

@@ -16,7 +16,7 @@ namespace DeveloperCommandPalette;
// The FilteredListSection is for when we've got any filter at all. It starts by
// enumerating all actions and apps, and returns the subset that matches.
public sealed class FilteredListSection : ISection, INotifyCollectionChanged
public sealed partial class FilteredListSection : ISection, INotifyCollectionChanged
{
public event NotifyCollectionChangedEventHandler? CollectionChanged;

2
src/modules/cmdpal/WindowsCommandPalette/MainListItem.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace DeveloperCommandPalette;
public sealed class MainListItem : ListItem
public sealed partial class MainListItem : ListItem
{
public IListItem Item { get; set; }

2
src/modules/cmdpal/WindowsCommandPalette/MainListPage.cs
View File

@@ -10,7 +10,7 @@ using WindowsCommandPalette.Views;
namespace DeveloperCommandPalette;
public sealed class MainListPage : DynamicListPage
public sealed partial class MainListPage : DynamicListPage
{
private readonly MainViewModel _mainViewModel;
private readonly MainListSection _mainSection;

2
src/modules/cmdpal/WindowsCommandPalette/MainListSection.cs
View File

@@ -11,7 +11,7 @@ using WindowsCommandPalette.Views;
namespace DeveloperCommandPalette;
// The MainListSection is for all non-recent actions. No apps.
public sealed class MainListSection : ISection, INotifyCollectionChanged
public sealed partial class MainListSection : ISection, INotifyCollectionChanged
{
public event NotifyCollectionChangedEventHandler? CollectionChanged;

2
src/modules/cmdpal/WindowsCommandPalette/RecentsListSection.cs
View File

@@ -11,7 +11,7 @@ using WindowsCommandPalette.Views;
namespace DeveloperCommandPalette;
public sealed class RecentsListSection : ListSection, INotifyCollectionChanged
public sealed partial class RecentsListSection : ListSection, INotifyCollectionChanged
{
public event NotifyCollectionChangedEventHandler? CollectionChanged;

2
src/modules/cmdpal/WindowsCommandPalette/Views/ErrorListItem.xaml.cs
View File

@@ -6,7 +6,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace WindowsCommandPalette.Views;
public sealed class ErrorListItem : ListItem
public sealed partial class ErrorListItem : ListItem
{
public ErrorListItem(Exception ex)
: base(new NoOpAction())

2
src/modules/cmdpal/WindowsCommandPalette/Views/NoOpAction.xaml.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CmdPal.Extensions.Helpers;
namespace WindowsCommandPalette.Views;
public sealed class NoOpAction : InvokableCommand
public sealed partial class NoOpAction : InvokableCommand
{
public override ICommandResult Invoke()
{

2
src/modules/cmdpal/WindowsCommandPalette/Views/StringNotEmptyToVisibilityConverter.xaml.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.UI.Xaml.Data;
namespace WindowsCommandPalette.Views;
public sealed class StringNotEmptyToVisibilityConverter : IValueConverter
public sealed partial class StringNotEmptyToVisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, string language)
{

1
src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions.Helpers/Microsoft.CmdPal.Extensions.Helpers.csproj
View File

@@ -23,6 +23,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.WindowsAppSDK" />
<PackageReference Include="Microsoft.Web.WebView2" /> <!-- This line forces the WebView2 version used by Windows App SDK to be the one we expect from Directory.Packages.props . -->
</ItemGroup>
<ItemGroup>

5
src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions/Microsoft.CmdPal.Extensions.vcxproj
View File

@@ -2,9 +2,10 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PathToRoot>..\..\..\..\..\</PathToRoot>
<WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.5.240428000</WasdkNuget>
<WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.6.240829007</WasdkNuget>
<CppWinRTNuget>$(PathToRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5</CppWinRTNuget>
<WindowsSdkBuildToolsNuget>$(PathToRoot)packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428</WindowsSdkBuildToolsNuget>
<WebView2Nuget>$(PathToRoot)packages\Microsoft.Web.WebView2.1.0.2739.15</WebView2Nuget>
</PropertyGroup>
<Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" />
@@ -171,6 +172,7 @@
<Import Project="$(WindowsSdkBuildToolsNuget)\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(WindowsSdkBuildToolsNuget)\build\Microsoft.Windows.SDK.BuildTools.targets')" />
<Import Project="$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="$(WebView2Nuget)\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(WebView2Nuget)\build\native\Microsoft.Web.WebView2.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -182,6 +184,7 @@
<Error Condition="!Exists('$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(CppWinRTNuget)\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props'))" />
<Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets'))" />
<Error Condition="!Exists('$(WebView2Nuget)\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(WebView2Nuget)\build\native\Microsoft.Web.WebView2.targets'))" />
</Target>
<ItemGroup>
<ResourceCompile Include="version.rc" />

3
src/modules/cmdpal/extensionsdk/Microsoft.CmdPal.Extensions/packages.config
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
<package id="Microsoft.WindowsAppSDK" version="1.5.240428000" targetFramework="native" />
<package id="Microsoft.WindowsAppSDK" version="1.6.240829007" targetFramework="native" />
</packages>

2
src/modules/cmdpal/extensionsdk/nuget/Microsoft.Windows.CommandPalette.Extensions.nuspec
View File

@@ -15,7 +15,7 @@
<projectUrl>https://github.com/microsoft/powertoys</projectUrl> <!-- TODO!: make repo lmao -->
<dependencies>
<group targetFramework="net8.0-windows10.0.19041.0">
<dependency id="Microsoft.Windows.CsWinRT" version="2.0.1" />
<dependency id="Microsoft.Windows.CsWinRT" version="2.1.1" />
</group>
</dependencies>
</metadata>

4
src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
View File

@@ -162,7 +162,7 @@
<Import Project="..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.7\build\native\Microsoft.VCRTForwarders.140.targets" Condition="Exists('..\..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.7\build\native\Microsoft.VCRTForwarders.140.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets')" />
<Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" />
</ImportGroup>
<Import Project="..\..\..\..\deps\spdlog.props" />
<Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
@@ -179,7 +179,7 @@
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.7\build\native\Microsoft.VCRTForwarders.140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.7\build\native\Microsoft.VCRTForwarders.140.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.props'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets'))" />
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets'))" />
</Target>
<Target Name="FakeResourcesPriMerge" BeforeTargets="FinalizeBuildStatus" DependsOnTargets="CopyFilesToOutputDirectory">
<Message Text="Renaming Microsoft.UI.Xaml.pri to resources.pri" />

2
src/modules/keyboardmanager/KeyboardManagerEditor/packages.config
View File

@@ -3,6 +3,6 @@
<package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.3" targetFramework="native" />
<package id="Microsoft.UI.Xaml" version="2.8.2-prerelease.220830001" targetFramework="native" />
<package id="Microsoft.VCRTForwarders.140" version="1.0.7" targetFramework="native" />
<package id="Microsoft.Web.WebView2" version="1.0.2365.46" targetFramework="native" />
<package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
</packages>

Some files were not shown because too many files have changed in this diff Show More