Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-11 05:52:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade .NET Core 3.1 to .NET 5 (#15591)

Browse Source 
* Common.UI

* ColorPicker

* PT Run

* File Explorer Add-ons

* Awake

* FZ Editor

* ImageResizer

* Interop

* Docs

* Installer

* Fix test not being run - Downgrade MSTest.TestAdapter & MSTest.TestFramework

* Update expect.txt

* Test run fix
This commit is contained in:
Stefan Markovic
2022-01-18 15:52:22 +01:00
committed by GitHub
parent f6576e01f3
commit a1643b0a2e
79 changed files with 291 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
installer/PowerToysSetup/PowerToys.wxs
View File

@@ -21,6 +21,7 @@
</BootstrapperApplicationRef>
<util:FileSearch Variable="HasDotnet3122" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.22\System.Xaml.dll" Result="exists" />
<util:FileSearch Variable="HasDotnet5013" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\5.0.13\System.Xaml.dll" Result="exists" />
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]PowerToys" bal:Overridable="yes"/>
@@ -55,6 +56,24 @@
Version="3.1.22.30721"
Hash="08EF2F6CFDB33946061884B1CE13FA867EFBD576" />
</ExePackage>
<ExePackage
Name="windowsdesktop-runtime-5.0.13-win-x64.exe"
Compressed="no"
Id="DotnetRuntime5"
DetectCondition="HasDotnet5013"
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/2bfb80f2-b8f2-44b0-90c1-d3c8c1c8eac8/409dd3d3367feeeda048f4ff34b32e82/windowsdesktop-runtime-5.0.13-win-x64.exe"
InstallCommand="/install /quiet"
RepairCommand="/repair /passive"
Permanent="yes"
PerMachine="yes"
UninstallCommand="/uninstall /quiet">
<RemotePayload
Description="Microsoft Windows Desktop Runtime - 5.0.13 (x64)"
ProductName="Microsoft Windows Desktop Runtime - 5.0.13 (x64)"
Size="54456248"
Version="5.0.13.30717"
Hash="EB5506CEBB3DD1CEC78F7F8131F87A2C5F665B40" />
</ExePackage>
<MsiPackage
SourceFile="x64\Release\PowerToysSetup-$(var.Version)-x64.msi"
Compressed="yes"