From f02ef4acf9649badaa3ab78d2499ca5014fa2234 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 18 Dec 2023 19:44:47 -0800
Subject: Make the minimum supported .NET Framework v4.6.2

---
 src/test/burn/TestBA/TestBA.csproj                                | 4 ++--
 src/test/burn/TestBA/TestBA_x64.csproj                            | 4 ++--
 src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj      | 2 +-
 src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj      | 2 +-
 src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj   | 2 +-
 .../TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj     | 4 ++--
 src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj | 2 +-
 src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj   | 2 +-
 src/test/burn/TestExe/NetfxTask.cs                                | 2 +-
 src/test/burn/TestExe/Task.cs                                     | 2 +-
 src/test/burn/TestExe/TestExe.csproj                              | 4 ++--
 src/test/burn/TestExe/TestExe_x64.csproj                          | 2 +-
 src/test/burn/test_burn.cmd                                       | 2 +-
 .../CsprojClassLibraryMultiFramework.csproj                       | 2 +-
 .../CsprojClassLibraryMultiTarget.csproj                          | 2 +-
 .../CsprojConsoleMultiFramework.csproj                            | 2 +-
 src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs    | 8 ++++----
 .../WixprojLibraryMultiFramework.wixproj                          | 2 +-
 18 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'src/test')

diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj
index ab3c21cb..77f90ede 100644
--- a/src/test/burn/TestBA/TestBA.csproj
+++ b/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>
diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj
index 748d78ab..0669eee1 100644
--- a/src/test/burn/TestBA/TestBA_x64.csproj
+++ b/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>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj
index 843b382a..ade73a52 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj
+++ b/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" />
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj
index 314fe2e2..b3ba4987 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj
+++ b/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" />
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index 6ef417d0..788353d6 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/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>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
index 13f66a86..154367e3 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
+++ b/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>
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj
index a6339220..b183b842 100644
--- a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj
+++ b/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>
diff --git a/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj
index 866b7575..fd3862d9 100644
--- a/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj
+++ b/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>
 
diff --git a/src/test/burn/TestExe/NetfxTask.cs b/src/test/burn/TestExe/NetfxTask.cs
index 35b1ea95..149df421 100644
--- a/src/test/burn/TestExe/NetfxTask.cs
+++ b/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;
diff --git a/src/test/burn/TestExe/Task.cs b/src/test/burn/TestExe/Task.cs
index 0d283c6c..e6f52b5a 100644
--- a/src/test/burn/TestExe/Task.cs
+++ b/src/test/burn/TestExe/Task.cs
@@ -264,7 +264,7 @@ namespace TestExe
                                 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);
diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj
index 446d0ee3..9209dfd7 100644
--- a/src/test/burn/TestExe/TestExe.csproj
+++ b/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>
diff --git a/src/test/burn/TestExe/TestExe_x64.csproj b/src/test/burn/TestExe/TestExe_x64.csproj
index ef981d73..2344ad0b 100644
--- a/src/test/burn/TestExe/TestExe_x64.csproj
+++ b/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>
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd
index 7303f736..178ac7e2 100644
--- a/src/test/burn/test_burn.cmd
+++ b/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
diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj
index ffc34573..bc30bf4b 100644
--- a/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj
+++ b/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>
 
diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj
index 9920b616..e2fa94f5 100644
--- a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj
+++ b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net5.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj
index 8b4fac23..bb8a8b3e 100644
--- a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj
+++ b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
   </PropertyGroup>
 
diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs
index 00a2e558..cf3d2d35 100644
--- a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs
+++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs
@@ -13,13 +13,13 @@
   </Fragment>
 
   <Fragment>
-    <ComponentGroup Id='CsprojClassLibraryMultiFrameworkNet48' Directory='ApplicationFolder' Subdirectory="net48">
+    <ComponentGroup Id='CsprojClassLibraryMultiFrameworkNet472' Directory='ApplicationFolder' Subdirectory="net472">
       <Component>
-        <File Id="Net48" Source='!(bindpath.CsprojConsoleMultiFramework.net48)CsprojConsoleMultiFramework.exe' />
-        <File Source='!(bindpath.CsprojConsoleMultiFramework.net48)CsprojConsoleMultiFramework.exe.config' />
+        <File Id="Net472" Source='!(bindpath.CsprojConsoleMultiFramework.net472)CsprojConsoleMultiFramework.exe' />
+        <File Source='!(bindpath.CsprojConsoleMultiFramework.net472)CsprojConsoleMultiFramework.exe.config' />
       </Component>
       <Component>
-        <File Source='!(bindpath.CsprojConsoleMultiFramework.net48)CsprojClassLibraryMultiFramework.dll' />
+        <File Source='!(bindpath.CsprojConsoleMultiFramework.net472)CsprojClassLibraryMultiFramework.dll' />
       </Component>
     </ComponentGroup>
   </Fragment>
diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj
index 6b4dd129..66812ea2 100644
--- a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj
+++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj
@@ -7,6 +7,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CsprojConsoleMultiFramework\CsprojConsoleMultiFramework.csproj"
-                      TargetFrameworks="net48;net6.0" Publish="true" />
+                      TargetFrameworks="net472;net6.0" Publish="true" />
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb