Remove .Net3 from installer & CI (microsoft#17825)

OFDBTI · Apr 20, 2022 · 310c010 · 310c010
1 parent f803fed
commit 310c010
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 27 deletions.
diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml
@@ -7,12 +7,6 @@ steps:
   submodules: true
   clean: true
 
-- task: UseDotNet@2
-  displayName: 'Use .NET 3.1 for unit test SDK'
-  inputs:
-    packageType: sdk
-    version: '3.1.x'
-
 - task: UseDotNet@2
   displayName: 'Use .NET 6 SDK'
   inputs:

diff --git a/README.md b/README.md
@@ -28,7 +28,6 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 
 - Windows 11 or Windows 10 v1903 (18362) or newer.
 - Our installer will install the following items:
-   - [.NET Core 3.1.23 Desktop Runtime](https://dotnet.microsoft.com/download/dotnet/thank-you/runtime-desktop-3.1.23-windows-x64-installer) or a newer 3.1.x runtime. This is needed currently for the Settings application.
    - [.NET 6.0.3 Desktop Runtime](https://dotnet.microsoft.com/download/dotnet/thank-you/runtime-desktop-6.0.3-windows-x64-installer) or a newer 6.0.x runtime. 
    - [Microsoft Edge WebView2 Runtime](https://go.microsoft.com/fwlink/p/?LinkId=2124703) bootstrapper. This will install the latest version. 
    - [Windows App SDK Runtime 1.0.3](https://docs.microsoft.com/en-us/windows/apps/windows-app-sdk/downloads). This will install version 1.0.3 if this or newer version is not installed already.

diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs
@@ -20,7 +20,6 @@
               SuppressRepair="yes" />
         </BootstrapperApplicationRef>
 
-        <util:FileSearch Variable="HasDotnet3123" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.23\System.Xaml.dll" Result="exists" />
         <util:FileSearch Variable="HasDotnet603" Path="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\6.0.3\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" />
@@ -42,25 +41,6 @@
       <bal:Condition Message="This application is only supported on Windows 10 version 1903 (build 18362) or higher.">DetectedWindowsBuildNumber &gt;= 18362 OR WixBundleInstalled</bal:Condition>
 
         <Chain>
-            <ExePackage
-                Name="windowsdesktop-runtime-3.1.23-win-x64.exe"
-                Compressed="no"
-                Id="DotnetRuntime"
-                DetectCondition="HasDotnet3123"
-                DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/0bc6a80a-3f07-411d-8ce3-17aaeb7388ac/ed1000a04fc9c8dca5af35b53263d9ae/windowsdesktop-runtime-3.1.23-win-x64.exe"
-                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 - 3.1.23 (x64)"
-                    ProductName="Microsoft Windows Desktop Runtime - 3.1.23 (x64)"
-                    Size="54413248"
-                    Version="3.1.23.31022"
-                    Hash="460D8CD07672A7B686867B0E6CF85A745005AA43" />
-            </ExePackage>
             <ExePackage
                 Name="windowsdesktop-runtime-6.0.3-win-x64.exe"
                 Compressed="no"