Make the minimum supported .NET Framework v4.6.2

README.md

@@ -12,7 +12,6 @@ This repository contains the WiX Toolset codebase.
 
 ## Prerequisites
 
-- Microsoft .NET Framework 3.5 SP1
 - A command line Git client that is in the system path
 - Visual Studio 2022 (17.8.2 or higher) with the following installed:
 
@@ -27,6 +26,7 @@ This repository contains the WiX Toolset codebase.
 | .NET 6.0 Runtime (Long Term Support) |
 | .NET Framework 4.7.2 SDK |
 | .NET Framework 4.7.2 targeting pack |
+| .NET Framework 4.6.2 targeting pack |
 | MSVC v141 - VS 2017 C++ ARM64 build tools (v14.16) |
 | MSVC v141 - VS 2017 C++ x64/x86 build tools (v14.16) |
 | MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) |

src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj

@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <AssemblyName>WixToolset.Mba.Core</AssemblyName>
     <RootNamespace>WixToolset.Mba.Core</RootNamespace>
     <DebugType>embedded</DebugType>

src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec

@@ -13,15 +13,15 @@
     <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
-      <group targetFramework=".NETFramework2.0" />
+      <group targetFramework=".NETFramework4.6.2" />
       <group targetFramework=".NETStandard2.0" />
     </dependencies>
   </metadata>
 
   <files>
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
-    <file src="net20\$id$.dll" target="lib\net20" />
-    <file src="net20\$id$.xml" target="lib\net20" />
+    <file src="net462\$id$.dll" target="lib\net462" />
+    <file src="net462\$id$.xml" target="lib\net462" />
     <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
     <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" />
 

src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RootNamespace>WixToolset.Dtf.Compression.Cab</RootNamespace>
     <AssemblyName>WixToolset.Dtf.Compression.Cab</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <Description>Managed libraries for cabinet archive packing and unpacking</Description>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>

src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RootNamespace>WixToolset.Dtf.Compression.Zip</RootNamespace>
     <AssemblyName>WixToolset.Dtf.Compression.Zip</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <Description>Managed libraries for zip archive packing and unpacking</Description>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>

src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RootNamespace>WixToolset.Dtf.Compression</RootNamespace>
     <AssemblyName>WixToolset.Dtf.Compression</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <Description>Abstract base libraries for archive packing and unpacking</Description>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>

src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RootNamespace>WixToolset.Dtf.Resources</RootNamespace>
     <AssemblyName>WixToolset.Dtf.Resources</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <Description>Classes for reading and writing resource data in executable files</Description>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>

src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RootNamespace>WixToolset.Dtf.WindowsInstaller.Linq</RootNamespace>
     <AssemblyName>WixToolset.Dtf.WindowsInstaller.Linq</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net35</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <Description>LINQ extensions for Windows Installer classes</Description>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>

src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace>
     <AssemblyName>WixToolset.Dtf.WindowsInstaller.Package</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <Description>Extended managed libraries for Windows Installer</Description>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>

src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs

@@ -201,7 +201,7 @@ internal static bool DebugBreakEnabled(string[] names)
             }
             else
             {
-#if NET20
+#if NETFRAMEWORK
                 IDictionary config;
                 try
                 {

src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace>
     <AssemblyName>WixToolset.Dtf.WindowsInstaller</AssemblyName>
-    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <Description>Managed libraries for Windows Installer</Description>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
@@ -19,7 +19,7 @@
     <None Include="WindowsInstaller.cd" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)'=='net20' ">
+  <ItemGroup Condition=" '$(TargetFramework)'=='net462' ">
     <Reference Include="System.Configuration" />
   </ItemGroup>
 </Project>

src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config

@@ -10,7 +10,6 @@
     </configSections>
     <startup useLegacyV2RuntimeActivationPolicy="true">
         <supportedRuntime version="v4.0" />
-        <supportedRuntime version="v2.0.50727" />
     </startup>
     <wix.bootstrapper>
         <!-- Example only. Use only if the startup/supportedRuntime above cannot discern supported frameworks. -->

src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <AssemblyName>WixToolset.Mba.Host</AssemblyName>
     <RootNamespace>WixToolset.Mba.Host</RootNamespace>
-    <TargetFrameworks>net20</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <Description>Managed Bootstrapper Application entry point</Description>
     <DebugType>embedded</DebugType>
     <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>

src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec

@@ -13,13 +13,13 @@
     <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
-      <group targetFramework=".NETFramework2.0" />
+      <group targetFramework=".NETFramework4.6.2" />
     </dependencies>
   </metadata>
 
   <files>
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
-    <file src="net20\$id$.config" target="samples" />
-    <file src="net20\$id$.dll" target="lib\net20" />
+    <file src="net462\$id$.config" target="samples" />
+    <file src="net462\$id$.dll" target="lib\net462" />
   </files>
 </package>

src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs

@@ -1,10 +1,10 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="FullFramework2MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
         <BootstrapperApplication>
-            <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\Example.FullFramework2MBA.dll" />
-            <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\mbanative.dll" />
-            <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\WixToolset.Mba.Core.dll" />
-            <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\WixToolset.Mba.Host.config" />
+            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.dll" />
+            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\mbanative.dll" />
+            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Host.config" />
             <bal:WixManagedBootstrapperApplicationHost />
         </BootstrapperApplication>
         <Chain>

src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj

@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net20</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
     <AssemblyName>Example.FullFramework2MBA</AssemblyName>
     <RootNamespace>Example.FullFramework2MBA</RootNamespace>
     <DebugType>embedded</DebugType>

src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config

@@ -9,12 +9,12 @@
         </sectionGroup>
     </configSections>
     <startup>
-        <supportedRuntime version="v2.0.50727" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"  />
     </startup>
     <wix.bootstrapper>
 
         <host assemblyName="Example.FullFramework2MBA">
-            <supportedFramework version="v3.5" />
+            <supportedFramework version="v4\Client" />
         </host>
     </wix.bootstrapper>
 </configuration>

src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs

@@ -1,10 +1,10 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
     <Bundle Name="FullFramework4MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="E08068E0-4FBA-439D-A1C8-4CD1FE27093F">
         <BootstrapperApplication>
-            <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\Example.FullFramework4MBA.dll" />
-            <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\mbanative.dll" />
-            <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\WixToolset.Mba.Core.dll" />
-            <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\WixToolset.Mba.Host.config" />
+            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.dll" />
+            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\mbanative.dll" />
+            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Host.config" />
             <bal:WixManagedBootstrapperApplicationHost />
         </BootstrapperApplication>
         <Chain>

src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj

@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <Description>Full Framework v4 MBA</Description>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>

src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config

@@ -9,7 +9,7 @@
         </sectionGroup>
     </configSections>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
     </startup>
     <wix.bootstrapper>
         <host assemblyName="Example.FullFramework4MBA" />

src/ext/Bal/wixlib/bal.wixproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <BindPath Include="..\wixstdba\Resources\" />
-    <BindPath Include="$(OutputPath)net20" />
+    <BindPath Include="$(OutputPath)net462" />
   </ItemGroup>
 
   <ItemGroup>

src/test/burn/TestBA/TestBA.csproj

@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
     <DebugType>embedded</DebugType>
@@ -13,7 +13,7 @@
     <RollForward>Major</RollForward>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)'=='net35' ">
+  <ItemGroup Condition=" '$(TargetFramework)'=='net462' ">
     <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>

src/test/burn/TestBA/TestBA_x64.csproj

@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
     <DebugType>embedded</DebugType>
@@ -13,7 +13,7 @@
     <RollForward>Major</RollForward>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)'=='net35' ">
+  <ItemGroup Condition=" '$(TargetFramework)'=='net462' ">
     <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>

src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj

@@ -9,7 +9,7 @@
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x86" BindName="net2x86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageB\PackageB.wixproj" />

src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj

@@ -9,7 +9,7 @@
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x86" BindName="net2x86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageB\PackageB.wixproj" />

src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj

@@ -6,7 +6,7 @@
     <Cultures>en-us</Cultures>
   </PropertyGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x86" BindName="net2x86" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x86" BindName="net4x86" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
   </ItemGroup>

src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj

@@ -7,7 +7,7 @@
     <InstallerPlatform>x64</InstallerPlatform>
   </PropertyGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x64" BindName="net2x64" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x64" BindName="net2x64" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x64" BindName="net4x64" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x64" BindName="dncx64" />
   </ItemGroup>
@@ -17,7 +17,7 @@
          the required target framework. Since we want all target frameworks built,
          the above line is shorter.
     <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj">
-      <SetTargetFramework>TargetFramework=net35</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net462</SetTargetFramework>
     </ProjectReference>
     <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj">
       <SetTargetFramework>TargetFramework=net5.0-windows</SetTargetFramework>

src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net35</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
     <Description>Sample managed embedded external UI</Description>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net20</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
     <Description>Sample managed custom actions</Description>
   </PropertyGroup>
 

src/test/burn/TestExe/NetfxTask.cs

@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-#if NET35
+#if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

src/test/burn/TestExe/Task.cs

@@ -264,7 +264,7 @@ public static List<Task> ParseTasks(string[] args)
                                 t = new DeleteManifestsTask(args[i + 1]);
                                 tasks.Add(t);
                                 break;
-#if NET35
+#if NETFRAMEWORK
                             case "/pinfo":
                                 t = new ProcessInfoTask(args[i + 1]);
                                 tasks.Add(t);

src/test/burn/TestExe/TestExe.csproj

@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net6.0</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
     <AssemblyName>TestExe</AssemblyName>
     <RootNamespace>TestExe</RootNamespace>
     <OutputType>Exe</OutputType>
@@ -14,7 +14,7 @@
     <RollForward>Major</RollForward>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net35'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net462'">
     <Reference Include="System.Management" />
   </ItemGroup>
 </Project>

src/test/burn/TestExe/TestExe_x64.csproj

@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <AssemblyName>TestExe</AssemblyName>
     <RootNamespace>TestExe</RootNamespace>
     <OutputType>Exe</OutputType>

src/test/burn/test_burn.cmd

@@ -16,7 +16,7 @@
 msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b
 msbuild -Restore TestData\TestData.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_data_build.binlog || exit /b
 
-"%_B%\net35\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe"
+"%_B%\net462\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe"
 mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe"
 
 @if not "%RuntimeTestsEnabled%"=="true" goto :LExit

src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <DebugType>embedded</DebugType>
   </PropertyGroup>