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

devdevdev

Browse Source
This commit is contained in:
vanzue
2025-12-03 16:31:12 +08:00
parent 473507b254
commit 01c87b5a6a
3 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
installer/PowerToysSetupVNext/CmdPalExtPowerToys.wxs
View File

@@ -5,15 +5,7 @@
<Fragment> <Fragment>
<DirectoryRef Id="WinUI3AppsInstallFolder"> <DirectoryRef Id="WinUI3AppsInstallFolder">
<Directory Id="CmdPalExtensionsInstallFolder" Name="CmdPalExtensions"> <Directory Id="CmdPalExtensionsInstallFolder" Name="CmdPalExtensions">
<Directory Id="CmdPalExtPowerToysInstallFolder" Name="Microsoft.CmdPal.Ext.PowerToys"> <Directory Id="CmdPalExtPowerToysInstallFolder" Name="Microsoft.CmdPal.Ext.PowerToys" />
<Directory Id="CmdPalExtPowerToysDepsInstallFolder" Name="Dependencies">
<?if $(sys.BUILDARCH) = x64 ?>
<Directory Id="CmdPalExtPowerToysDepsX64InstallFolder" Name="x64" />
<?else?>
<Directory Id="CmdPalExtPowerToysDepsArm64InstallFolder" Name="arm64" />
<?endif?>
</Directory>
</Directory>
</Directory> </Directory>
</DirectoryRef> </DirectoryRef>
@@ -30,41 +22,14 @@
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<?if $(sys.BUILDARCH) = x64 ?>
<DirectoryRef Id="CmdPalExtPowerToysDepsX64InstallFolder" FileSource="$(var.CmdPalExtPowerToysBuildDir)AppPackages\Microsoft.CmdPal.Ext.PowerToys_$(var.CmdPalExtPowerToysVersion)_Test\Dependencies\x64">
<Component Id="Module_CmdPal_Ext_PowerToys_Deps" Guid="A8F7A6D9-3D58-4D8D-9DF8-4B011E18BA22" Bitness="always64">
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="Module_CmdPal_Ext_PowerToys_Deps" Value="" KeyPath="yes" />
</RegistryKey>
<File Id="Microsoft.WindowsAppRuntime.1.8.msix" Source="$(var.CmdPalExtPowerToysBuildDir)AppPackages\Microsoft.CmdPal.Ext.PowerToys_$(var.CmdPalExtPowerToysVersion)_Test\Dependencies\x64\Microsoft.WindowsAppRuntime.1.8.msix" />
</Component>
</DirectoryRef>
<?else?>
<DirectoryRef Id="CmdPalExtPowerToysDepsArm64InstallFolder" FileSource="$(var.CmdPalExtPowerToysBuildDir)AppPackages\Microsoft.CmdPal.Ext.PowerToys_$(var.CmdPalExtPowerToysVersion)_Test\Dependencies\arm64">
<Component Id="Module_CmdPal_Ext_PowerToys_Deps" Guid="A8F7A6D9-3D58-4D8D-9DF8-4B011E18BA22" Bitness="always64">
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="Module_CmdPal_Ext_PowerToys_Deps" Value="" KeyPath="yes" />
</RegistryKey>
<File Id="Microsoft.WindowsAppRuntime.1.8.msix" Source="$(var.CmdPalExtPowerToysBuildDir)AppPackages\Microsoft.CmdPal.Ext.PowerToys_$(var.CmdPalExtPowerToysVersion)_Test\Dependencies\arm64\Microsoft.WindowsAppRuntime.1.8.msix" />
</Component>
</DirectoryRef>
<?endif?>
<ComponentGroup Id="CmdPalExtPowerToysComponentGroup"> <ComponentGroup Id="CmdPalExtPowerToysComponentGroup">
<Component Id="RemoveCmdPalExtPowerToysFolder" Guid="E09A8F26-74D8-42FD-88F1-9A3D6B5C7799" Directory="INSTALLFOLDER"> <Component Id="RemoveCmdPalExtPowerToysFolder" Guid="E09A8F26-74D8-42FD-88F1-9A3D6B5C7799" Directory="INSTALLFOLDER">
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components"> <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="RemoveCmdPalExtPowerToysFolder" Value="" KeyPath="yes" /> <RegistryValue Type="string" Name="RemoveCmdPalExtPowerToysFolder" Value="" KeyPath="yes" />
</RegistryKey> </RegistryKey>
<RemoveFolder Id="RemoveCmdPalExtPowerToysInstallDirFolder" Directory="CmdPalExtPowerToysInstallFolder" On="uninstall" /> <RemoveFolder Id="RemoveCmdPalExtPowerToysInstallDirFolder" Directory="CmdPalExtPowerToysInstallFolder" On="uninstall" />
<RemoveFolder Id="RemoveCmdPalExtPowerToysDepsInstallDirFolder" Directory="CmdPalExtPowerToysDepsInstallFolder" On="uninstall" />
<?if $(sys.BUILDARCH) = x64 ?>
<RemoveFolder Id="RemoveCmdPalExtPowerToysDepsX64InstallDirFolder" Directory="CmdPalExtPowerToysDepsX64InstallFolder" On="uninstall" />
<?else?>
<RemoveFolder Id="RemoveCmdPalExtPowerToysDepsArm64InstallDirFolder" Directory="CmdPalExtPowerToysDepsArm64InstallFolder" On="uninstall" />
<?endif?>
</Component> </Component>
<ComponentRef Id="Module_CmdPal_Ext_PowerToys" /> <ComponentRef Id="Module_CmdPal_Ext_PowerToys" />
<ComponentRef Id="Module_CmdPal_Ext_PowerToys_Deps" />
</ComponentGroup> </ComponentGroup>
</Fragment> </Fragment>
</Wix> </Wix>

2
src/modules/Workspaces/WorkspacesCsharpLibrary/Models/BaseApplication.cs
View File

@@ -16,7 +16,7 @@ using Windows.Management.Deployment;
namespace WorkspacesCsharpLibrary.Models namespace WorkspacesCsharpLibrary.Models
{ {
public class BaseApplication : INotifyPropertyChanged, IDisposable public partial class BaseApplication : INotifyPropertyChanged, IDisposable
{ {
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;

4
src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Microsoft.CmdPal.Ext.PowerToys.csproj
View File

@@ -7,7 +7,7 @@
<RootNamespace>PowerToysExtension</RootNamespace> <RootNamespace>PowerToysExtension</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
<PublishProfile>win-$(Platform).pubxml</PublishProfile> <PublishProfile>win-$(Platform).pubxml</PublishProfile>
<PackageVersion>$(Version).0</PackageVersion> <PackageVersion>$(Version)</PackageVersion>
<EnableMsixTooling>true</EnableMsixTooling> <EnableMsixTooling>true</EnableMsixTooling>
<OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPalExtensions\$(MSBuildProjectName)\</OutputPath> <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPalExtensions\$(MSBuildProjectName)\</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -16,7 +16,7 @@
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained> <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(CIBuild)' == 'true'"> <PropertyGroup>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild> <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<AppxBundle>Never</AppxBundle> <AppxBundle>Never</AppxBundle>
<AppxPackageTestDir>$(OutputPath)\AppPackages\$(MSBuildProjectName)_$(PackageVersion)_Test\</AppxPackageTestDir> <AppxPackageTestDir>$(OutputPath)\AppPackages\$(MSBuildProjectName)_$(PackageVersion)_Test\</AppxPackageTestDir>