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/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config        | 1 -
 src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj        | 2 +-
 src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec        | 6 +++---
 src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs         | 8 ++++----
 .../examples/FullFramework2MBA/Example.FullFramework2MBA.csproj   | 2 +-
 .../test/examples/FullFramework2MBA/WixToolset.Mba.Host.config    | 4 ++--
 src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs         | 8 ++++----
 .../examples/FullFramework4MBA/Example.FullFramework4MBA.csproj   | 2 +-
 .../test/examples/FullFramework4MBA/WixToolset.Mba.Host.config    | 2 +-
 src/ext/Bal/wixlib/bal.wixproj                                    | 2 +-
 10 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'src/ext')

diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config
index a19b66f1..91280739 100644
--- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config
+++ b/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. -->
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
index 0bcd523c..242c4d14 100644
--- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+++ b/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>
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
index bcd7b89a..b1f00ebd 100644
--- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
+++ b/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>
diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
index 6d6133b6..ba4f02b6 100644
--- a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
+++ b/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>
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index 2076f0b4..f6280a9e 100644
--- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/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>
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config b/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config
index be450a4f..41cacce5 100644
--- a/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config
+++ b/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>
diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
index a21318aa..802b8b1e 100644
--- a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
+++ b/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>
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
index 90b2763c..247c8173 100644
--- a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+++ b/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>
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config b/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config
index 96678cda..ac4770df 100644
--- a/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config
+++ b/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" />
diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj
index e703a0a8..9e1b111a 100644
--- a/src/ext/Bal/wixlib/bal.wixproj
+++ b/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>
-- 
cgit v1.2.3-55-g6feb