mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-15 19:27:56 +01:00
a7bd0cfde8
* Update projects to .NET 7 * Updated packages to 7.0-rc1 * [ColorPicker] Wrap WM_KEYUP param in unchecked context * [PTRun][OneNote] Added a NoWarn to CS8981 * [MeasureTool] Wrap buffer in wstring_view in SetClipBoardToText * Target .NET 7 for PowerToys.Interop * Update publish profiles * Removed System.Text.Json.dll from Product.wxs since it's included in .NET 7 * Use .NET 7 in CI * Removed individual CodeAnalysis package from projects * Updated CodeAnalysis package in Directory.Build.props * Updated NuGet packages to latest 7.0 rc2 * Fix merge mistake with Settings.UI.Library project * Updated installer with .NET 7 RC2 install * [GPOWrapper] Updated GPOWrapperProjection to .NET 7 * [FileLockSmith] Updated to .NET 7 * [FileLocksmith] Update Interop to .NET 7 * Upgrade .NET 7 specific libraries to GA version * [PowerToysSetup] Updated .NET 7 urls to GA * [CI] removed .NET 7 SDK preview version from UseDotNet task * [PowerToysSetup] Update HasDotnet variable name * [PowerToysInterop] Downgrade target back to .NET 6 * [FileLockSmith] Downgrade Interop library back to .NET 6 * Revert "[FileLockSmith] Downgrade Interop library back to .NET 6" This reverts commit356ad048e3. * Revert "[PowerToysInterop] Downgrade target back to .NET 6" This reverts commit74dbcfdefe. * [Analyzers][CPP] Disable warning for 4679 caused by .NET 7 in C++/CLI * [CI] Set maximum cpu count to 2 for PowerToys.sln build * [CI] Set maximumCpuCount to false in hopes of arm64 working * Changed .NET 7 runtime display name * [ci] Use .net 7 sdk
119 lines
6.7 KiB
XML
119 lines
6.7 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<?define UpgradeCode="6341382d-c0a9-4238-9188-be9607e3fab2"?>
|
|
<?define RepoDir="$(var.ProjectDir)..\..\" ?>
|
|
<?if $(var.Platform) = x64?>
|
|
<?define BinDir="$(var.RepoDir)$(var.Platform)\$(var.Configuration)\" ?>
|
|
<?define PowerToysPlatform="x64"?>
|
|
|
|
<?define Dotnet7DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/5b2fbe00-507e-450e-8b52-43ab052aadf2/79d54c3a19ce3fce314f2367cf4e3b21/windowsdesktop-runtime-7.0.0-win-x64.exe"?>
|
|
<?define Dotnet7PayloadSize="57756472"?>
|
|
<?define Dotnet7PayloadHash="DB56882D3263C9E533EA7003D018CB7D65F11C10"?>
|
|
|
|
<?define PlatformProgramFiles="[ProgramFiles64Folder]"?>
|
|
<?else?>
|
|
<!-- stable WIX 3 doesn't support ARM64, so we build installers as x86 -->
|
|
<?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?>
|
|
<?define PowerToysPlatform="ARM64"?>
|
|
|
|
<?define Dotnet7DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/bce1b608-3a2a-45e6-ab7b-8c414b9e2c56/74703a44afc5f7550eba824143fc20a7/windowsdesktop-runtime-7.0.0-win-arm64.exe"?>
|
|
<?define Dotnet7PayloadSize="53133216"?>
|
|
<?define Dotnet7PayloadHash="8A7271390C2538268EFC71F3E49C80017F406C16"?>
|
|
|
|
<!--TODO: define to ARM64 Program files once it's available-->
|
|
<?define PlatformProgramFiles="[ProgramFiles6432Folder]"?>
|
|
|
|
<?endif?>
|
|
|
|
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
|
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
|
|
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
|
|
<Bundle Name="PowerToys (Preview) $(var.PowerToysPlatform)"
|
|
Version="$(var.Version)"
|
|
Manufacturer="Microsoft Corporation"
|
|
IconSourceFile="$(var.BinDir)svgs\icon.ico"
|
|
UpgradeCode="$(var.UpgradeCode)">
|
|
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
|
|
<bal:WixStandardBootstrapperApplication
|
|
LicenseFile="$(var.RepoDir)\installer\License.rtf"
|
|
LogoFile="$(var.RepoDir)\installer\PowerToysSetup\Images\logo44.png"
|
|
SuppressOptionsUI="no"
|
|
SuppressRepair="yes" />
|
|
</BootstrapperApplicationRef>
|
|
|
|
<util:FileSearch Variable="HasDotnet700" Path="$(var.PlatformProgramFiles)dotnet\shared\Microsoft.WindowsDesktop.App\7.0.0\System.Xaml.dll" Result="exists" />
|
|
<util:RegistrySearch Variable="HasWebView2PerMachine" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
|
|
<util:RegistrySearch Variable="HasWebView2PerUser" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
|
|
|
|
<Variable Name="InstallFolder" Type="string" Value="$(var.PlatformProgramFiles)PowerToys" bal:Overridable="yes"/>
|
|
|
|
<Variable Name="MsiLogFolder" Type="string" Value="[LocalAppDataFolder]\Microsoft\PowerToys\" />
|
|
<Log Disable="no" Prefix='powertoys-bootstrapper-msi-$(var.Version)' Extension=".log" />
|
|
|
|
<!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) -->
|
|
<!-- If the previous installation is a bundle installation, just let WiX run its logic. -->
|
|
<Variable Name="DetectedPowerToysVersion" Type="version" Value="0.0.0.0"/>
|
|
<Variable Name="TargetPowerToysVersion" Type="version" Value="$(var.Version)"/>
|
|
<util:ProductSearch Id="SearchInstalledPowerToysVersion" Variable="DetectedPowerToysVersion" UpgradeCode="42B84BF7-5FBF-473B-9C8B-049DC16F7708" Result="version" />
|
|
<bal:Condition Message="A later version of PowerToys is already installed." >TargetPowerToysVersion >= DetectedPowerToysVersion OR WixBundleInstalled</bal:Condition>
|
|
|
|
<Variable Name="DetectedWindowsBuildNumber" Type="version" Value="0"/>
|
|
<util:RegistrySearch Id="SearchWindowsBuildNumber" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber" Result="value" Format="raw" Variable="DetectedWindowsBuildNumber" />
|
|
<bal:Condition Message="This application is only supported on Windows 10 version v2004 (build 19041) or higher.">DetectedWindowsBuildNumber >= 19041 OR WixBundleInstalled</bal:Condition>
|
|
|
|
<Chain>
|
|
<ExePackage
|
|
DisplayName="Closing PowerToys application"
|
|
Name="terminate_powertoys.cmd"
|
|
Cache="no"
|
|
Compressed="yes"
|
|
Id="TerminatePowerToys"
|
|
SourceFile="terminate_powertoys.cmd"
|
|
Permanent="yes"
|
|
PerMachine="yes"
|
|
Vital="no">
|
|
</ExePackage>
|
|
<ExePackage
|
|
DisplayName="Downloading and installing .NET 7 Desktop Runtime"
|
|
Name="windowsdesktop-runtime-7.0.0-win-$(var.PowerToysPlatform).exe"
|
|
Compressed="no"
|
|
Id="DotnetRuntime7"
|
|
DetectCondition="HasDotnet700"
|
|
DownloadUrl="$(var.Dotnet7DownloadUrl)"
|
|
InstallCommand="/install /quiet /norestart"
|
|
RepairCommand="/repair /passive /norestart"
|
|
Permanent="yes"
|
|
PerMachine="yes"
|
|
UninstallCommand="/uninstall /quiet /norestart">
|
|
<ExitCode Value="1638" Behavior="success"/>
|
|
<RemotePayload
|
|
Description="Microsoft Windows Desktop Runtime - 7.0.0 ($(var.PowerToysPlatform))"
|
|
ProductName="Microsoft Windows Desktop Runtime - 7.0.0 ($(var.PowerToysPlatform))"
|
|
Size="$(var.Dotnet7PayloadSize)"
|
|
Version="7.0.0.31819"
|
|
Hash="$(var.Dotnet7PayloadHash)" />
|
|
</ExePackage>
|
|
<ExePackage
|
|
DisplayName="Installing Microsoft Edge WebView2"
|
|
Name="MicrosoftEdgeWebview2Setup.exe"
|
|
Compressed="yes"
|
|
Id="WebView2"
|
|
DetectCondition="HasWebView2PerMachine OR HasWebView2PerUser"
|
|
SourceFile="WebView2\MicrosoftEdgeWebview2Setup.exe"
|
|
InstallCommand="/silent /install"
|
|
RepairCommand="/repair /passive"
|
|
Permanent="yes"
|
|
PerMachine="yes"
|
|
UninstallCommand="/silent /uninstall">
|
|
</ExePackage>
|
|
<MsiPackage
|
|
DisplayName="Installing PowerToys"
|
|
SourceFile="$(var.PowerToysPlatform)\Release\PowerToysSetup-$(var.Version)-$(var.PowerToysPlatform).msi"
|
|
Compressed="yes"
|
|
DisplayInternalUI="no">
|
|
<MsiProperty Name="BOOTSTRAPPERINSTALLFOLDER" Value="[InstallFolder]" />
|
|
</MsiPackage>
|
|
</Chain>
|
|
</Bundle>
|
|
</Wix>
|