diff --git a/README.md b/README.md index 6c12b8dbb..7e55a3ccb 100644 --- a/README.md +++ b/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) | diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj index 95108cb5b..9d2e40773 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj @@ -3,7 +3,7 @@ - netstandard2.0;net20 + netstandard2.0;net462 WixToolset.Mba.Core WixToolset.Mba.Core embedded diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec index 6eda95db6..0a9bcb5dd 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec @@ -13,15 +13,15 @@ $projectUrl$ - + - - + + diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj index 08a88b30d..f2e940cdb 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj @@ -5,7 +5,7 @@ WixToolset.Dtf.Compression.Cab WixToolset.Dtf.Compression.Cab - netstandard2.0;net20 + netstandard2.0;net462 Managed libraries for cabinet archive packing and unpacking true diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj index aa97019da..8dcc48e49 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj @@ -5,7 +5,7 @@ WixToolset.Dtf.Compression.Zip WixToolset.Dtf.Compression.Zip - netstandard2.0;net20 + netstandard2.0;net462 Managed libraries for zip archive packing and unpacking true diff --git a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj index 907e7a04f..de3f076a1 100644 --- a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj +++ b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj @@ -5,7 +5,7 @@ WixToolset.Dtf.Compression WixToolset.Dtf.Compression - netstandard2.0;net20 + netstandard2.0;net462 Abstract base libraries for archive packing and unpacking true diff --git a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj index 89bff8415..e0635ae92 100644 --- a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj +++ b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj @@ -5,7 +5,7 @@ WixToolset.Dtf.Resources WixToolset.Dtf.Resources - netstandard2.0;net20 + netstandard2.0;net462 Classes for reading and writing resource data in executable files true diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj index fbc85880a..e4b9d2acb 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj @@ -5,7 +5,7 @@ WixToolset.Dtf.WindowsInstaller.Linq WixToolset.Dtf.WindowsInstaller.Linq - netstandard2.0;net35 + netstandard2.0;net462 LINQ extensions for Windows Installer classes true diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj index b39521774..c9c6ac950 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj @@ -5,7 +5,7 @@ WixToolset.Dtf.WindowsInstaller WixToolset.Dtf.WindowsInstaller.Package - netstandard2.0;net20 + netstandard2.0;net462 Extended managed libraries for Windows Installer true diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs index d3fd7d1b7..f58ff07de 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs @@ -201,7 +201,7 @@ private static bool FindEntryPoint( } else { -#if NET20 +#if NETFRAMEWORK IDictionary config; try { diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj index 117a4114c..648c11f6a 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj @@ -5,7 +5,7 @@ WixToolset.Dtf.WindowsInstaller WixToolset.Dtf.WindowsInstaller - netstandard2.0;net20 + netstandard2.0;net462 Managed libraries for Windows Installer true @@ -19,7 +19,7 @@ - + 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 a19b66f1d..912807392 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 @@ - 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 0bcd523c8..242c4d14e 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 @@ WixToolset.Mba.Host WixToolset.Mba.Host - net20 + net462 Managed Bootstrapper Application entry point embedded $(MSBuildThisFileName).nuspec 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 bcd7b89a8..b1f00ebde 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$ - + - - + + diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs index 6d6133b62..ba4f02b6a 100644 --- a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs +++ b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs @@ -1,10 +1,10 @@  - - - - + + + + diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 2076f0b40..f6280a9e7 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 @@ - net20 + net462 Example.FullFramework2MBA Example.FullFramework2MBA embedded 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 be450a4f9..41cacce55 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 @@ - + - + diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs index a21318aa3..802b8b1ee 100644 --- a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs +++ b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs @@ -1,10 +1,10 @@  - - - - + + + + diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index 90b2763c9..247c8173b 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 @@ - net48 + net472 Full Framework v4 MBA win-x64 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 96678cda8..ac4770df8 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 @@ - + diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj index e703a0a86..9e1b111a0 100644 --- a/src/ext/Bal/wixlib/bal.wixproj +++ b/src/ext/Bal/wixlib/bal.wixproj @@ -8,7 +8,7 @@ - + diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj index ab3c21cb8..77f90ede1 100644 --- a/src/test/burn/TestBA/TestBA.csproj +++ b/src/test/burn/TestBA/TestBA.csproj @@ -3,7 +3,7 @@ - net35;net6.0-windows + net462;net6.0-windows TestBA WixToolset.Test.BA embedded @@ -13,7 +13,7 @@ Major - + diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj index 748d78ab4..0669eee11 100644 --- a/src/test/burn/TestBA/TestBA_x64.csproj +++ b/src/test/burn/TestBA/TestBA_x64.csproj @@ -3,7 +3,7 @@ - net35;net6.0-windows + net462;net6.0-windows TestBA WixToolset.Test.BA embedded @@ -13,7 +13,7 @@ Major - + diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj index 843b382a8..ade73a529 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj @@ -9,7 +9,7 @@ - + diff --git a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj index 314fe2e2a..b3ba49879 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj @@ -9,7 +9,7 @@ - + diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index 6ef417d07..788353d6d 100644 --- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj @@ -6,7 +6,7 @@ en-us - + 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 13f66a86e..154367e39 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 @@ x64 - + @@ -17,7 +17,7 @@ the required target framework. Since we want all target frameworks built, the above line is shorter. - TargetFramework=net35 + TargetFramework=net462 TargetFramework=net5.0-windows diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj index a6339220a..b183b8425 100644 --- a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj +++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj @@ -1,6 +1,6 @@ - net35 + net462 Sample managed embedded external UI true diff --git a/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj index 866b75750..fd3862d9d 100644 --- a/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj +++ b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj @@ -1,6 +1,6 @@ - net20 + net462 Sample managed custom actions diff --git a/src/test/burn/TestExe/NetfxTask.cs b/src/test/burn/TestExe/NetfxTask.cs index 35b1ea953..149df421b 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 0d283c6c0..e6f52b5a5 100644 --- a/src/test/burn/TestExe/Task.cs +++ b/src/test/burn/TestExe/Task.cs @@ -264,7 +264,7 @@ public static List 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); diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj index 446d0ee36..9209dfd75 100644 --- a/src/test/burn/TestExe/TestExe.csproj +++ b/src/test/burn/TestExe/TestExe.csproj @@ -3,7 +3,7 @@ - net35;net6.0 + net462;net6.0 TestExe TestExe Exe @@ -14,7 +14,7 @@ Major - + diff --git a/src/test/burn/TestExe/TestExe_x64.csproj b/src/test/burn/TestExe/TestExe_x64.csproj index ef981d735..2344ad0b0 100644 --- a/src/test/burn/TestExe/TestExe_x64.csproj +++ b/src/test/burn/TestExe/TestExe_x64.csproj @@ -3,7 +3,7 @@ - net35 + net462 TestExe TestExe Exe diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd index 7303f7360..178ac7e25 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 ffc345736..bc30bf4bf 100644 --- a/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj +++ b/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj @@ -1,7 +1,7 @@ - net6.0;net48 + net6.0;net472 embedded diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj index 9920b6165..e2fa94f5d 100644 --- a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj +++ b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj @@ -1,7 +1,7 @@ - net48;net5.0 + net472;net6.0 diff --git a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj index 8b4fac23a..bb8a8b3ea 100644 --- a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj +++ b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net48 + net6.0;net472 win-x86 diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs index 00a2e558a..cf3d2d358 100644 --- a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs +++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs @@ -13,13 +13,13 @@ - + - - + + - + diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj index 6b4dd1296..66812ea22 100644 --- a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj +++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj @@ -7,6 +7,6 @@ + TargetFrameworks="net472;net6.0" Publish="true" />