From 464575def4341d65bc3fa72298798755cdee527e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 1 Oct 2022 02:38:00 -0700 Subject: Standardize on .NET 6 as the minimum for .NET Core platform. Closes 6942 --- README.md | 2 +- .../WixToolset.BootstrapperCore.Native.proj | 2 +- .../WixToolsetTest.Mba.Core.csproj | 2 +- .../test/WixToolsetTest.Data/WixToolsetTest.Data.csproj | 2 +- .../Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 2 +- .../WixToolsetTest.Dnc.HostGenerator.csproj | 2 +- .../WixToolsetTest.ManagedHost.csproj | 2 +- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- src/ext/Bal/wixlib/bal.wixproj | 2 +- .../WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj | 2 +- .../WixToolsetTest.Dependency.csproj | 2 +- .../WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj | 2 +- .../WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj | 2 +- .../WixToolsetTest.Firewall.csproj | 2 +- .../test/WixToolsetTest.Http/WixToolsetTest.Http.csproj | 2 +- .../Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj | 2 +- .../test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj | 2 +- .../test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj | 2 +- .../WixToolsetTest.Powershell.csproj | 2 +- .../Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj | 2 +- .../UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj | 2 +- .../test/WixToolsetTest.Util/WixToolsetTest.Util.csproj | 2 +- .../WixToolsetTest.VisualStudio.csproj | 2 +- src/internal/SetBuildNumber/SetBuildNumber.proj | 2 +- src/test/burn/Directory.wixproj.props | 2 +- src/test/burn/README.md | 4 ++-- src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj | 2 +- src/test/burn/TestData/Manual/BundleB/BundleB.wixproj | 4 ++-- src/test/burn/TestExe/TestExe.csproj | 2 +- src/test/burn/WixTestTools/WixTestTools.csproj | 2 +- .../WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj | 2 +- src/test/burn/test_burn.cmd | 4 ++-- src/test/msi/Directory.wixproj.props | 2 +- src/test/msi/README.md | 4 ++-- .../WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj | 2 +- .../CsprojConsoleNetCore/CsprojConsoleNetCore.csproj | 2 +- .../CsprojWebApplicationNetCore.csproj | 2 +- .../WixprojPackageCsprojWebApplicationNetCore.wixproj | 4 ++-- src/tools/WixToolset.Heat/WixToolset.Heat.csproj | 2 +- src/tools/WixToolset.Heat/WixToolset.Heat.targets | 2 +- src/tools/WixToolset.HeatTasks/HeatTask.cs | 5 +++++ .../WixToolset.HeatTasks/WixToolset.HeatTasks.csproj | 2 +- src/tools/heat/heat.csproj | 4 ++-- src/tools/publish_t.proj | 8 ++++---- src/wix/WixToolset.BuildTasks/ToolsetTask.cs | 4 ++++ .../WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | 6 +++--- src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj | 2 +- src/wix/WixToolset.Sdk/tools/wix.targets | 2 +- src/wix/pack-wix/pack-wix.csproj | 2 +- src/wix/pack-wix/pack-wix.nuspec | 4 ++-- src/wix/publish_t.proj | 6 +++--- .../CompileCoreTestExtensionWixlib.csproj | 2 +- src/wix/test/Example.Extension/Example.Extension.csproj | 2 +- .../WixToolsetTest.Converters.csproj | 2 +- .../WixToolsetTest.Core.Native.csproj | 2 +- .../test/WixToolsetTest.Core/WixToolsetTest.Core.csproj | 2 +- .../WixToolsetTest.CoreIntegration/BadInputFixture.cs | 2 +- .../test/WixToolsetTest.CoreIntegration/BundleFixture.cs | 3 +-- .../BundleManifestFixture.cs | 3 +-- .../WixToolsetTest.CoreIntegration/ExtensionFixture.cs | 6 ++---- .../test/WixToolsetTest.CoreIntegration/ExtensionPaths.cs | 15 +++++++++++++++ src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | 3 +-- .../WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 9 +++------ .../test/WixToolsetTest.CoreIntegration/PatchFixture.cs | 3 +-- .../WixToolsetTest.CoreIntegration.csproj | 2 +- .../test/WixToolsetTest.CoreIntegration/WixiplFixture.cs | 8 +++----- .../test/WixToolsetTest.CoreIntegration/WixlibFixture.cs | 12 +++++------- src/wix/wix.cmd | 4 ++-- src/wix/wix/wix.csproj | 4 ++-- 69 files changed, 115 insertions(+), 104 deletions(-) create mode 100644 src/wix/test/WixToolsetTest.CoreIntegration/ExtensionPaths.cs diff --git a/README.md b/README.md index 4cf3ca13..b150e5d7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This repository contains the WiX Toolset v4 codebase. ## Prerequisites -Visual Studio 2022 (17.0.4 or higher, NOT the preview release) with the following installed: +Visual Studio 2022 (17.0.4 or higher) with the following installed: | Workloads | | :-------- | diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj index 0bd374c7..fd26a027 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 WixToolset.BootstrapperCore.Native WiX Bootstrapper native interfaces diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj index 02cd24b1..5d5c25fb 100644 --- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj +++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 win-x86 Major true diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj index 18054f67..8198ac8f 100644 --- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj +++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 65ac84dc..0022fc7e 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj index 3da896a9..45c76232 100644 --- a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj +++ b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index bcadc112..e06c0440 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 9b9f2bf6..7b9d1670 100644 --- a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 win-x86;win-x64 true Earliest .NET Core MBA diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj index a7ae9a96..b350dbce 100644 --- a/src/ext/Bal/wixlib/bal.wixproj +++ b/src/ext/Bal/wixlib/bal.wixproj @@ -8,7 +8,7 @@ - + diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj index d423ffeb..08008025 100644 --- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj +++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj index 101eee58..ac4624b1 100644 --- a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj +++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj index bc348261..47329768 100644 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj +++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj index d524cb7d..dd8b9695 100644 --- a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj index be8e7f2a..03270860 100644 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj +++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj index 62c477ed..df955ca3 100644 --- a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj +++ b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj index 3f59e352..d6a60a38 100644 --- a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj +++ b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj index 5acf0cf7..5e4a5ca9 100644 --- a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj +++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index 71cf532f..e2f97a16 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj index 595629ed..84241a14 100644 --- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj +++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj index 39949409..de502438 100644 --- a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj +++ b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj index 5f2da23f..22366c79 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj +++ b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index e607f9cf..2cf3c02a 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj index d39e1528..dffbb462 100644 --- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj +++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj index 9f98ffe4..d9a918e2 100644 --- a/src/internal/SetBuildNumber/SetBuildNumber.proj +++ b/src/internal/SetBuildNumber/SetBuildNumber.proj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 false diff --git a/src/test/burn/Directory.wixproj.props b/src/test/burn/Directory.wixproj.props index 21ab5107..49a6ba62 100644 --- a/src/test/burn/Directory.wixproj.props +++ b/src/test/burn/Directory.wixproj.props @@ -3,7 +3,7 @@ $([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))))) $(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\ - $(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\ + $(OutputPath)net6.0-windows\TestData\$(TestGroupName)\ None -wx 1154;$(SuppressSpecificWarnings) diff --git a/src/test/burn/README.md b/src/test/burn/README.md index 6c9edb3c..30623b7e 100644 --- a/src/test/burn/README.md +++ b/src/test/burn/README.md @@ -10,8 +10,8 @@ They modify machine state so it's strongly recommended *not* to run these tests They should be run on a VM instead, where you can easily roll back. 1. Run build.cmd to build everything (the tests will not automatically run). -1. Copy the build\IntegrationBurn\Debug\netcoreapp3.1 folder to your VM. -1. Open an elevated command prompt and navigate to the netcoreapp3.1 folder. +1. Copy the build\IntegrationBurn\Debug\net6.0-windows folder to your VM. +1. Open an elevated command prompt and navigate to the net6.0-windows folder. 1. Run the runtests.cmd file to run the tests. You can modify the runtests.cmd to run specific tests. diff --git a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj index 69f53a86..cea07ded 100644 --- a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj @@ -17,7 +17,7 @@ - + diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj index bd6e222a..069affaf 100644 --- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj @@ -27,7 +27,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj index 016ae4e5..446d0ee3 100644 --- a/src/test/burn/TestExe/TestExe.csproj +++ b/src/test/burn/TestExe/TestExe.csproj @@ -3,7 +3,7 @@ - net35;netcoreapp3.1 + net35;net6.0 TestExe TestExe Exe diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj index 535e6f44..47456868 100644 --- a/src/test/burn/WixTestTools/WixTestTools.csproj +++ b/src/test/burn/WixTestTools/WixTestTools.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0-windows x64 true diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj index 1bedb34b..811f3ed2 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj +++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0-windows x64 Major true diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd index 80467f39..72ffd448 100644 --- a/src/test/burn/test_burn.cmd +++ b/src/test/burn/test_burn.cmd @@ -16,8 +16,8 @@ msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b -"%_B%\net35\win-x86\testexe.exe" /dm "%_B%\netcoreapp3.1\testhost.exe" -mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\netcoreapp3.1\testhost.exe" +"%_B%\net35\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/msi/Directory.wixproj.props b/src/test/msi/Directory.wixproj.props index f824ff2a..de825e30 100644 --- a/src/test/msi/Directory.wixproj.props +++ b/src/test/msi/Directory.wixproj.props @@ -3,7 +3,7 @@ $([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))))) $(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\ - $(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\ + $(OutputPath)net6.0-windows\TestData\$(TestGroupName)\ None -wx true diff --git a/src/test/msi/README.md b/src/test/msi/README.md index 2b4ff9a4..f4c42029 100644 --- a/src/test/msi/README.md +++ b/src/test/msi/README.md @@ -10,8 +10,8 @@ They modify machine state so it's strongly recommended *not* to run these tests They should be run on a VM instead, where you can easily roll back. 1. Run build.cmd to build everything (the tests will not automatically run). -1. Copy the build\IntegrationMsi\Debug\netcoreapp3.1 folder to your VM. -1. Open an elevated command prompt and navigate to the netcoreapp3.1 folder. +1. Copy the build\IntegrationMsi\Debug\net6.0-windows folder to your VM. +1. Open an elevated command prompt and navigate to the net6.0-windows folder. 1. Run the runtests.cmd file to run the tests. You can modify the runtests.cmd to run specific tests. diff --git a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj index 348d97ad..b2e384b1 100644 --- a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj +++ b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0-windows x64 Major true diff --git a/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj b/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj index 8fceff91..b58706ec 100644 --- a/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj +++ b/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 win-x86 diff --git a/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj b/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj index 65d0e08b..2cd83a64 100644 --- a/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj +++ b/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 diff --git a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj index c9f56d1d..048f81ec 100644 --- a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj +++ b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj @@ -1,7 +1,7 @@ - + @@ -13,5 +13,5 @@ - + diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.csproj b/src/tools/WixToolset.Heat/WixToolset.Heat.csproj index a3e0eb41..2166028a 100644 --- a/src/tools/WixToolset.Heat/WixToolset.Heat.csproj +++ b/src/tools/WixToolset.Heat/WixToolset.Heat.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 WiX Toolset Heat MSBuild integration $(PublishRoot)WixToolset.Heat\ $(MSBuildThisFileName).nuspec diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.targets b/src/tools/WixToolset.Heat/WixToolset.Heat.targets index ba854459..25493295 100644 --- a/src/tools/WixToolset.Heat/WixToolset.Heat.targets +++ b/src/tools/WixToolset.Heat/WixToolset.Heat.targets @@ -5,7 +5,7 @@ - $(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\ + $(MSBuildThisFileDirectory)..\tools\net6.0\ $(MSBuildThisFileDirectory)..\tools\net472\ $(WixHeatBinDir)WixToolset.HeatTasks.dll diff --git a/src/tools/WixToolset.HeatTasks/HeatTask.cs b/src/tools/WixToolset.HeatTasks/HeatTask.cs index 8942a7e1..6b7b9399 100644 --- a/src/tools/WixToolset.HeatTasks/HeatTask.cs +++ b/src/tools/WixToolset.HeatTasks/HeatTask.cs @@ -14,7 +14,12 @@ namespace WixToolset.HeatTasks /// public abstract partial class HeatTask : ToolTask { +#if NETFRAMEWORK private static readonly string ThisDllPath = new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath; +#else + private static readonly string ThisDllPath = typeof(HeatTask).Assembly.Location; +#endif + /// /// Gets or sets additional options that are appended the the tool command-line. diff --git a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj index ea52bdfa..ddc75c69 100644 --- a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj +++ b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1;net472 + net6.0;net472 WiX Toolset Heat MSBuild Tasks embedded true diff --git a/src/tools/heat/heat.csproj b/src/tools/heat/heat.csproj index db4a710b..dfcc9126 100644 --- a/src/tools/heat/heat.csproj +++ b/src/tools/heat/heat.csproj @@ -3,13 +3,13 @@ - netcoreapp3.1;net472 + net6.0-windows;net472 Exe Harvester WiX Toolset Harvester embedded true - win-x86;win-x64 + win-x86;win-x64 app.config heat.exe.manifest LatestMajor diff --git a/src/tools/publish_t.proj b/src/tools/publish_t.proj index b23c3d84..cbe67768 100644 --- a/src/tools/publish_t.proj +++ b/src/tools/publish_t.proj @@ -2,23 +2,23 @@ $(BaseIntermediateOutputPath)$(Configuration)\net472\x86\ $(BaseIntermediateOutputPath)$(Configuration)\net472\x64\ - $(BaseIntermediateOutputPath)$(Configuration)\netcoreapp3.1\ + $(BaseIntermediateOutputPath)$(Configuration)\net6.0\ $(PublishRoot)WixToolset.Heat\build\ $(PublishRoot)WixToolset.Heat\tools\net472\ $(PublishRoot)WixToolset.Heat\tools\net472\x86\ $(PublishRoot)WixToolset.Heat\tools\net472\x64\ - $(PublishRoot)WixToolset.Heat\tools\netcoreapp3.1\ + $(PublishRoot)WixToolset.Heat\tools\net6.0\ - + - + diff --git a/src/wix/WixToolset.BuildTasks/ToolsetTask.cs b/src/wix/WixToolset.BuildTasks/ToolsetTask.cs index d48f2a20..05095fb8 100644 --- a/src/wix/WixToolset.BuildTasks/ToolsetTask.cs +++ b/src/wix/WixToolset.BuildTasks/ToolsetTask.cs @@ -9,7 +9,11 @@ namespace WixToolset.BuildTasks public abstract partial class ToolsetTask : ToolTask { +#if NETFRAMEWORK private static readonly string ThisDllPath = new Uri(typeof(ToolsetTask).Assembly.CodeBase).AbsolutePath; +#else + private static readonly string ThisDllPath = typeof(ToolsetTask).Assembly.Location; +#endif /// /// Gets or sets additional options that are appended the the tool command-line. diff --git a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index 56c7b016..1fce528e 100644 --- a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj @@ -3,12 +3,12 @@ - netcoreapp3.1;net472 + net6.0;net472 WiX Toolset MSBuild Tasks embedded true - win-x86;win-x64 + win-x86;win-x64 AnyCPU @@ -24,6 +24,6 @@ - + diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj index 4af6c522..550ba9da 100644 --- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj +++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 WiX Toolset MSBuild integration $(OutputPath)publish\WixToolset.Sdk\ $(MSBuildThisFileName).nuspec diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets index dd4df3fc..f3e04d9a 100644 --- a/src/wix/WixToolset.Sdk/tools/wix.targets +++ b/src/wix/WixToolset.Sdk/tools/wix.targets @@ -26,7 +26,7 @@ - $(MSBuildThisFileDirectory)netcoreapp3.1\ + $(MSBuildThisFileDirectory)net6.0\ $(MSBuildThisFileDirectory)net472\x86\ $(MSBuildThisFileDirectory)net472\x64\ $(WixBinDir)WixToolset.BuildTasks.dll diff --git a/src/wix/pack-wix/pack-wix.csproj b/src/wix/pack-wix/pack-wix.csproj index f47306d2..092145f6 100644 --- a/src/wix/pack-wix/pack-wix.csproj +++ b/src/wix/pack-wix/pack-wix.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 false The WiX Toolset command-line interface. The WiX Toolset lets developers create installers for Windows. This package contains the WiX Toolset command-line interface. diff --git a/src/wix/pack-wix/pack-wix.nuspec b/src/wix/pack-wix/pack-wix.nuspec index 7e349ee8..2b1d2ae9 100644 --- a/src/wix/pack-wix/pack-wix.nuspec +++ b/src/wix/pack-wix/pack-wix.nuspec @@ -18,8 +18,8 @@ - + - + diff --git a/src/wix/publish_t.proj b/src/wix/publish_t.proj index 160cba83..0f034f2a 100644 --- a/src/wix/publish_t.proj +++ b/src/wix/publish_t.proj @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - - + + diff --git a/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj b/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj index 310f632c..172706cf 100644 --- a/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj +++ b/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 false Exe false diff --git a/src/wix/test/Example.Extension/Example.Extension.csproj b/src/wix/test/Example.Extension/Example.Extension.csproj index f2eb2195..353bbefd 100644 --- a/src/wix/test/Example.Extension/Example.Extension.csproj +++ b/src/wix/test/Example.Extension/Example.Extension.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 false embedded false diff --git a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj index cf374060..9577b512 100644 --- a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj +++ b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj index f702efe1..67047592 100644 --- a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj +++ b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 win-x64 true true diff --git a/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj b/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj index 65af0da5..6e1b6556 100644 --- a/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj +++ b/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs index 9c636a8f..93f160f1 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs @@ -260,10 +260,10 @@ namespace WixToolsetTest.CoreIntegration WixAssert.CompareLineByLine(new[] { + "The 'REINSTALLMODE' MsiProperty is controlled by the bootstrapper and cannot be authored. (Illegal properties are: 'ACTION', 'ADDLOCAL', 'ADDSOURCE', 'ADDDEFAULT', 'ADVERTISE', 'ALLUSERS', 'REBOOT', 'REINSTALL', 'REINSTALLMODE', or 'REMOVE'.) Remove the MsiProperty element.", "The CommandLine/@Condition attribute's value '=' is not a valid bundle condition.", "The MsiPackage/@InstallCondition attribute's value '=' is not a valid bundle condition.", "The MsiProperty/@Condition attribute's value '=' is not a valid bundle condition.", - "The 'REINSTALLMODE' MsiProperty is controlled by the bootstrapper and cannot be authored. (Illegal properties are: 'ACTION', 'ADDLOCAL', 'ADDSOURCE', 'ADDDEFAULT', 'ADVERTISE', 'ALLUSERS', 'REBOOT', 'REINSTALL', 'REINSTALLMODE', or 'REMOVE'.) Remove the MsiProperty element.", }, errorMessages.ToArray()); Assert.Equal(409, result.ExitCode); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index db831d0a..ad31fc6d 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -274,7 +274,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void CanBuildSimpleBundleUsingExtensionBA() { - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); var folder = TestData.Get(@"TestData\SimpleBundle"); using (var fs = new DisposableFileSystem()) @@ -287,7 +286,7 @@ namespace WixToolsetTest.CoreIntegration "build", Path.Combine(folder, "MultiFileBundle.wxs"), "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, "-o", Path.Combine(baseFolder, @"bin\test.exe") diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs index 6040e2c4..21157aac 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs @@ -281,7 +281,6 @@ namespace WixToolsetTest.CoreIntegration [Fact] public void PopulatesManifestWithBundleExtensionSearches() { - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); var folder = TestData.Get(@"TestData"); using (var fs = new DisposableFileSystem()) @@ -299,7 +298,7 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "BundleExtension", "BundleWithSearches.wxs"), Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"), Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), "-intermediateFolder", intermediateFolder, "-o", bundlePath diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index e7ff0230..0d5418a5 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs @@ -59,7 +59,6 @@ namespace WixToolsetTest.CoreIntegration public void CanBuildWithExampleExtension() { var folder = TestData.Get(@"TestData\ExampleExtension"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -71,7 +70,7 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "Package.wxs"), Path.Combine(folder, "PackageComponents.wxs"), "-loc", Path.Combine(folder, "Package.en-us.wxl"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") @@ -101,7 +100,6 @@ namespace WixToolsetTest.CoreIntegration public void CanParseCommandLineWithExtension() { var folder = TestData.Get(@"TestData\ExampleExtension"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -113,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "Package.wxs"), Path.Combine(folder, "PackageComponents.wxs"), "-loc", Path.Combine(folder, "Package.en-us.wxl"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, "-example", "test", diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionPaths.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionPaths.cs new file mode 100644 index 00000000..d7b54839 --- /dev/null +++ b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionPaths.cs @@ -0,0 +1,15 @@ +// 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. + +namespace WixToolsetTest.CoreIntegration +{ + using Example.Extension; + + internal class ExtensionPaths + { +#if NETFRAMEWORK + public static readonly string ExampleExtensionPath = new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath; +#else + public static readonly string ExampleExtensionPath = typeof(ExampleExtensionFactory).Assembly.Location; +#endif + } +} diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index 6c670158..18b19460 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs @@ -730,7 +730,6 @@ namespace WixToolsetTest.CoreIntegration public void FailsBuildAtBindTimeForMissingEnsureTable() { var folder = TestData.Get(@"TestData"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -744,7 +743,7 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "BadEnsureTable", "BadEnsureTable.wxs"), Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "SingleFile", "data"), "-intermediateFolder", intermediateFolder, "-o", msiPath diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index 11dc9240..e7a527c4 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs @@ -338,7 +338,6 @@ namespace WixToolsetTest.CoreIntegration public void CanBuildMsiWithEmptyCustomTableBecauseOfCustomTableRef() { var folder = TestData.Get(@"TestData"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -352,7 +351,7 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "EnsureTable", "EnsureCustomTable.wxs"), Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "SingleFile", "data"), "-intermediateFolder", intermediateFolder, "-o", msiPath @@ -370,7 +369,6 @@ namespace WixToolsetTest.CoreIntegration public void CanBuildMsiWithEmptyStandardTableBecauseOfEnsureTable() { var folder = TestData.Get(@"TestData"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -384,7 +382,7 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "EnsureTable", "EnsureModuleSignature.wxs"), Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "SingleFile", "data"), "-intermediateFolder", intermediateFolder, "-o", msiPath @@ -402,7 +400,6 @@ namespace WixToolsetTest.CoreIntegration public void CanBuildMsiWithEmptyTableFromExtensionBecauseOfEnsureTable() { var folder = TestData.Get(@"TestData"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -416,7 +413,7 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "EnsureTable", "EnsureExtensionTable.wxs"), Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "SingleFile", "data"), "-intermediateFolder", intermediateFolder, "-o", msiPath diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs index 123e5742..ca197d9f 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs @@ -454,7 +454,6 @@ namespace WixToolsetTest.CoreIntegration private static string BuildMsi(string outputName, string sourceFolder, string baseFolder, string defineV, string defineA, string defineB, IEnumerable bindpaths = null) { - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName)); var args = new List @@ -467,7 +466,7 @@ namespace WixToolsetTest.CoreIntegration "-bindpath", Path.Combine(sourceFolder, ".data"), "-intermediateFolder", Path.Combine(baseFolder, "obj"), "-o", outputPath, - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, }; foreach (var additionaBindPath in bindpaths ?? Enumerable.Empty()) diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj index 4ff61280..8b35a85a 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net6.0 true true diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs index 2d72dcbd..27ab06fd 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs @@ -107,7 +107,6 @@ namespace WixToolsetTest.CoreIntegration public void CanBuildMsiUsingExtensionLibrary() { var folder = TestData.Get(@"TestData\Wixipl"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -117,7 +116,7 @@ namespace WixToolsetTest.CoreIntegration var result = WixRunner.Execute(new[] { "build", - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, Path.Combine(folder, "Package.wxs"), Path.Combine(folder, "PackageComponents.wxs"), "-loc", Path.Combine(folder, "Package.en-us.wxl"), @@ -151,7 +150,6 @@ namespace WixToolsetTest.CoreIntegration public void CanBuildWixiplUsingExtensionLibrary() { var folder = TestData.Get(@"TestData\Wixipl"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -161,7 +159,7 @@ namespace WixToolsetTest.CoreIntegration var result = WixRunner.Execute(new[] { "build", - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, Path.Combine(folder, "Package.wxs"), Path.Combine(folder, "PackageComponents.wxs"), "-intermediateFolder", intermediateFolder, @@ -174,7 +172,7 @@ namespace WixToolsetTest.CoreIntegration { "build", Path.Combine(intermediateFolder, @"test.wixipl"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-loc", Path.Combine(folder, "Package.en-us.wxl"), "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index 484e5dc1..428cfc3e 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs @@ -248,7 +248,6 @@ namespace WixToolsetTest.CoreIntegration public void CanBuildWithExtensionUsingWixlib() { var folder = TestData.Get(@"TestData\ExampleExtension"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -259,7 +258,7 @@ namespace WixToolsetTest.CoreIntegration { "build", Path.Combine(folder, "PackageComponents.wxs"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-intermediateFolder", intermediateFolder, "-o", Path.Combine(intermediateFolder, @"test.wixlib") }); @@ -272,7 +271,7 @@ namespace WixToolsetTest.CoreIntegration Path.Combine(folder, "Package.wxs"), "-loc", Path.Combine(folder, "Package.en-us.wxl"), "-lib", Path.Combine(intermediateFolder, @"test.wixlib"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, "-o", Path.Combine(intermediateFolder, @"bin\test.msi") @@ -297,7 +296,6 @@ namespace WixToolsetTest.CoreIntegration public void CanBuildWithExtensionUsingMultipleWixlibs() { var folder = TestData.Get(@"TestData\ComplexExampleExtension"); - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); using (var fs = new DisposableFileSystem()) { @@ -308,7 +306,7 @@ namespace WixToolsetTest.CoreIntegration { "build", Path.Combine(folder, "PackageComponents.wxs"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-intermediateFolder", intermediateFolder, "-o", Path.Combine(intermediateFolder, @"components.wixlib") }); @@ -319,7 +317,7 @@ namespace WixToolsetTest.CoreIntegration { "build", Path.Combine(folder, "OtherComponents.wxs"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-intermediateFolder", intermediateFolder, "-o", Path.Combine(intermediateFolder, @"other.wixlib") }); @@ -333,7 +331,7 @@ namespace WixToolsetTest.CoreIntegration "-loc", Path.Combine(folder, "Package.en-us.wxl"), "-lib", Path.Combine(intermediateFolder, @"components.wixlib"), "-lib", Path.Combine(intermediateFolder, @"other.wixlib"), - "-ext", extensionPath, + "-ext", ExtensionPaths.ExampleExtensionPath, "-bindpath", Path.Combine(folder, "data"), "-intermediateFolder", intermediateFolder, "-o", Path.Combine(intermediateFolder, @"bin\test.msi") diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd index f2e64e50..ff2043eb 100644 --- a/src/wix/wix.cmd +++ b/src/wix/wix.cmd @@ -40,8 +40,8 @@ robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\wix %_P%\WixToolset.Sdk\too robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% -robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll -robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% +robocopy %_P_OBJ%\WixToolset.Sdk\separate\net6.0\buildtasks %_P%\WixToolset.Sdk\tools\net6.0 %_RCO% /XF Microsoft.Build.*.dll +robocopy %_P_OBJ%\WixToolset.Sdk\separate\net6.0\wix %_P%\WixToolset.Sdk\tools\net6.0 %_RCO% msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj index ec583475..d6776821 100644 --- a/src/wix/wix/wix.csproj +++ b/src/wix/wix/wix.csproj @@ -3,13 +3,13 @@ - netcoreapp3.1;net472 + net6.0;net472 Exe WiX Toolset creates installation packages. embedded true true - win-x86;win-x64 + win-x86;win-x64 app.config wix.exe.manifest Major -- cgit v1.2.3-55-g6feb