diff options
69 files changed, 115 insertions, 104 deletions
@@ -12,7 +12,7 @@ This repository contains the WiX Toolset v4 codebase. | |||
12 | 12 | ||
13 | ## Prerequisites | 13 | ## Prerequisites |
14 | 14 | ||
15 | Visual Studio 2022 (17.0.4 or higher, NOT the preview release) with the following installed: | 15 | Visual Studio 2022 (17.0.4 or higher) with the following installed: |
16 | 16 | ||
17 | | Workloads | | 17 | | Workloads | |
18 | | :-------- | | 18 | | :-------- | |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.Build.NoTargets/3.0.4"> | 4 | <Project Sdk="Microsoft.Build.NoTargets/3.0.4"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <PackageId>WixToolset.BootstrapperCore.Native</PackageId> | 7 | <PackageId>WixToolset.BootstrapperCore.Native</PackageId> |
8 | <Description>WiX Bootstrapper native interfaces</Description> | 8 | <Description>WiX Bootstrapper native interfaces</Description> |
9 | </PropertyGroup> | 9 | </PropertyGroup> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <RuntimeIdentifier>win-x86</RuntimeIdentifier> | 7 | <RuntimeIdentifier>win-x86</RuntimeIdentifier> |
8 | <RollForward>Major</RollForward> | 8 | <RollForward>Major</RollForward> |
9 | <IsWixTestProject>true</IsWixTestProject> | 9 | <IsWixTestProject>true</IsWixTestProject> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <Project Sdk="Microsoft.NET.Sdk"> |
2 | 2 | ||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <TargetFramework>netcoreapp3.1</TargetFramework> | 4 | <TargetFramework>net6.0</TargetFramework> |
5 | <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> | 5 | <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> |
6 | <IsDncBA>true</IsDncBA> | 6 | <IsDncBA>true</IsDncBA> |
7 | <Description>Earliest .NET Core MBA</Description> | 7 | <Description>Earliest .NET Core MBA</Description> |
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 @@ | |||
8 | 8 | ||
9 | <ItemGroup> | 9 | <ItemGroup> |
10 | <BindInputPaths Include="..\wixstdba\Resources\" /> | 10 | <BindInputPaths Include="..\wixstdba\Resources\" /> |
11 | <BindInputPaths Include="$(OutputPath)netcoreapp3.1" /> | 11 | <BindInputPaths Include="$(OutputPath)net6.0" /> |
12 | <BindInputPaths Include="$(OutputPath)net20" /> | 12 | <BindInputPaths Include="$(OutputPath)net20" /> |
13 | <BindInputPaths Include="$(OutputPath)x86" BindName="x86" /> | 13 | <BindInputPaths Include="$(OutputPath)x86" BindName="x86" /> |
14 | <BindInputPaths Include="$(OutputPath)x64" BindName="x64" /> | 14 | <BindInputPaths Include="$(OutputPath)x64" BindName="x64" /> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.Build.NoTargets/3.0.4"> | 4 | <Project Sdk="Microsoft.Build.NoTargets/3.0.4"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <!-- Disable central package version management since this project will write the central package version management file --> | 7 | <!-- Disable central package version management since this project will write the central package version management file --> |
8 | <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally> | 8 | <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally> |
9 | 9 | ||
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 @@ | |||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName> | 4 | <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName> |
5 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath> | 5 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath> |
6 | <OutputPath>$(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\</OutputPath> | 6 | <OutputPath>$(OutputPath)net6.0-windows\TestData\$(TestGroupName)\</OutputPath> |
7 | <DefaultCompressionLevel>None</DefaultCompressionLevel> | 7 | <DefaultCompressionLevel>None</DefaultCompressionLevel> |
8 | <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions> | 8 | <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions> |
9 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> | 9 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</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 | |||
10 | They should be run on a VM instead, where you can easily roll back. | 10 | They should be run on a VM instead, where you can easily roll back. |
11 | 11 | ||
12 | 1. Run build.cmd to build everything (the tests will not automatically run). | 12 | 1. Run build.cmd to build everything (the tests will not automatically run). |
13 | 1. Copy the build\IntegrationBurn\Debug\netcoreapp3.1 folder to your VM. | 13 | 1. Copy the build\IntegrationBurn\Debug\net6.0-windows folder to your VM. |
14 | 1. Open an elevated command prompt and navigate to the netcoreapp3.1 folder. | 14 | 1. Open an elevated command prompt and navigate to the net6.0-windows folder. |
15 | 1. Run the runtests.cmd file to run the tests. | 15 | 1. Run the runtests.cmd file to run the tests. |
16 | 16 | ||
17 | You can modify the runtests.cmd to run specific tests. | 17 | 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 @@ | |||
17 | </ItemGroup> | 17 | </ItemGroup> |
18 | <!-- We do this dynamically to avoid committing such a large file to source control. --> | 18 | <!-- We do this dynamically to avoid committing such a large file to source control. --> |
19 | <Target Name="CreateLargeFile" AfterTargets="BeforeBuild" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\fivegb.file"> | 19 | <Target Name="CreateLargeFile" AfterTargets="BeforeBuild" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\fivegb.file"> |
20 | <Exec Command='"$(BaseOutputPath)$(Configuration)\netcoreapp3.1\win-x86\testexe.exe" /lf "fivegb.file|5368709120' WorkingDirectory="$(MSBuildProjectDirectory)" /> | 20 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /lf "fivegb.file|5368709120' WorkingDirectory="$(MSBuildProjectDirectory)" /> |
21 | </Target> | 21 | </Target> |
22 | <!-- We do this to avoid copying such a large file to the VM to run the tests. --> | 22 | <!-- We do this to avoid copying such a large file to the VM to run the tests. --> |
23 | <Target Name="DeleteLargeFile" AfterTargets="AfterBuild"> | 23 | <Target Name="DeleteLargeFile" AfterTargets="AfterBuild"> |
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 @@ | |||
27 | </ItemGroup> | 27 | </ItemGroup> |
28 | <!-- We do this dynamically to avoid committing so many files to source control. --> | 28 | <!-- We do this dynamically to avoid committing so many files to source control. --> |
29 | <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild"> | 29 | <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild"> |
30 | <Exec Command='"$(BaseOutputPath)$(Configuration)\netcoreapp3.1\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> | 30 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> |
31 | <Exec Command='"$(BaseOutputPath)$(Configuration)\netcoreapp3.1\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> | 31 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> |
32 | </Target> | 32 | </Target> |
33 | </Project> \ No newline at end of file | 33 | </Project> \ 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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>net35;netcoreapp3.1</TargetFrameworks> | 6 | <TargetFrameworks>net35;net6.0</TargetFrameworks> |
7 | <AssemblyName>TestExe</AssemblyName> | 7 | <AssemblyName>TestExe</AssemblyName> |
8 | <RootNamespace>TestExe</RootNamespace> | 8 | <RootNamespace>TestExe</RootNamespace> |
9 | <OutputType>Exe</OutputType> | 9 | <OutputType>Exe</OutputType> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0-windows</TargetFramework> |
7 | <PlatformTarget>x64</PlatformTarget> | 7 | <PlatformTarget>x64</PlatformTarget> |
8 | <IsWixTestSupportProject>true</IsWixTestSupportProject> | 8 | <IsWixTestSupportProject>true</IsWixTestSupportProject> |
9 | </PropertyGroup> | 9 | </PropertyGroup> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0-windows</TargetFramework> |
7 | <PlatformTarget>x64</PlatformTarget> | 7 | <PlatformTarget>x64</PlatformTarget> |
8 | <RollForward>Major</RollForward> | 8 | <RollForward>Major</RollForward> |
9 | <IsWixTestProject>true</IsWixTestProject> | 9 | <IsWixTestProject>true</IsWixTestProject> |
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 @@ | |||
16 | msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b | 16 | msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b |
17 | msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b | 17 | msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b |
18 | 18 | ||
19 | "%_B%\net35\win-x86\testexe.exe" /dm "%_B%\netcoreapp3.1\testhost.exe" | 19 | "%_B%\net35\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe" |
20 | mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\netcoreapp3.1\testhost.exe" | 20 | mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe" |
21 | 21 | ||
22 | @if not "%RuntimeTestsEnabled%"=="true" goto :LExit | 22 | @if not "%RuntimeTestsEnabled%"=="true" goto :LExit |
23 | 23 | ||
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 @@ | |||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName> | 4 | <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName> |
5 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath> | 5 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath> |
6 | <OutputPath>$(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\</OutputPath> | 6 | <OutputPath>$(OutputPath)net6.0-windows\TestData\$(TestGroupName)\</OutputPath> |
7 | <DefaultCompressionLevel>None</DefaultCompressionLevel> | 7 | <DefaultCompressionLevel>None</DefaultCompressionLevel> |
8 | <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions> | 8 | <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions> |
9 | <SuppressValidation>true</SuppressValidation> | 9 | <SuppressValidation>true</SuppressValidation> |
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 | |||
10 | They should be run on a VM instead, where you can easily roll back. | 10 | They should be run on a VM instead, where you can easily roll back. |
11 | 11 | ||
12 | 1. Run build.cmd to build everything (the tests will not automatically run). | 12 | 1. Run build.cmd to build everything (the tests will not automatically run). |
13 | 1. Copy the build\IntegrationMsi\Debug\netcoreapp3.1 folder to your VM. | 13 | 1. Copy the build\IntegrationMsi\Debug\net6.0-windows folder to your VM. |
14 | 1. Open an elevated command prompt and navigate to the netcoreapp3.1 folder. | 14 | 1. Open an elevated command prompt and navigate to the net6.0-windows folder. |
15 | 1. Run the runtests.cmd file to run the tests. | 15 | 1. Run the runtests.cmd file to run the tests. |
16 | 16 | ||
17 | You can modify the runtests.cmd to run specific tests. | 17 | 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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0-windows</TargetFramework> |
7 | <PlatformTarget>x64</PlatformTarget> | 7 | <PlatformTarget>x64</PlatformTarget> |
8 | <RollForward>Major</RollForward> | 8 | <RollForward>Major</RollForward> |
9 | <IsWixTestProject>true</IsWixTestProject> | 9 | <IsWixTestProject>true</IsWixTestProject> |
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 @@ | |||
2 | 2 | ||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <OutputType>Exe</OutputType> | 4 | <OutputType>Exe</OutputType> |
5 | <TargetFramework>netcoreapp3.1</TargetFramework> | 5 | <TargetFramework>net6.0</TargetFramework> |
6 | <RuntimeIdentifiers>win-x86</RuntimeIdentifiers> | 6 | <RuntimeIdentifiers>win-x86</RuntimeIdentifiers> |
7 | </PropertyGroup> | 7 | </PropertyGroup> |
8 | 8 | ||
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 @@ | |||
1 | <Project Sdk="Microsoft.NET.Sdk.Web"> | 1 | <Project Sdk="Microsoft.NET.Sdk.Web"> |
2 | 2 | ||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <TargetFramework>netcoreapp3.1</TargetFramework> | 4 | <TargetFramework>net6.0</TargetFramework> |
5 | </PropertyGroup> | 5 | </PropertyGroup> |
6 | 6 | ||
7 | <ItemGroup> | 7 | <ItemGroup> |
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 @@ | |||
1 | <!-- 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. --> | 1 | <!-- 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. --> |
2 | <Project Sdk='WixToolset.Sdk'> | 2 | <Project Sdk='WixToolset.Sdk'> |
3 | <!-- <Project> --> | 3 | <!-- <Project> --> |
4 | <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\netcoreapp3.1\Sdk\Sdk.props' /> --> | 4 | <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net6.0\Sdk\Sdk.props' /> --> |
5 | 5 | ||
6 | <PropertyGroup> | 6 | <PropertyGroup> |
7 | <!-- <WixBinDir>D:\src\wix4\build\wix\Debug\net472\</WixBinDir> --> | 7 | <!-- <WixBinDir>D:\src\wix4\build\wix\Debug\net472\</WixBinDir> --> |
@@ -13,5 +13,5 @@ | |||
13 | <ProjectReference Include="..\CsprojWebApplicationNetCore\CsprojWebApplicationNetCore.csproj" Publish="true" /> | 13 | <ProjectReference Include="..\CsprojWebApplicationNetCore\CsprojWebApplicationNetCore.csproj" Publish="true" /> |
14 | </ItemGroup> | 14 | </ItemGroup> |
15 | 15 | ||
16 | <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\netcoreapp3.1\Sdk\Sdk.targets' /> --> | 16 | <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net6.0\Sdk\Sdk.targets' /> --> |
17 | </Project> | 17 | </Project> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netcoreapp3.1</TargetFrameworks> | 6 | <TargetFrameworks>net6.0</TargetFrameworks> |
7 | <Description>WiX Toolset Heat MSBuild integration</Description> | 7 | <Description>WiX Toolset Heat MSBuild integration</Description> |
8 | <PublishDir>$(PublishRoot)WixToolset.Heat\</PublishDir> | 8 | <PublishDir>$(PublishRoot)WixToolset.Heat\</PublishDir> |
9 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> | 9 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> |
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 @@ | |||
5 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 5 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
6 | <!-- These properties can be overridden to support non-default installations. --> | 6 | <!-- These properties can be overridden to support non-default installations. --> |
7 | <PropertyGroup> | 7 | <PropertyGroup> |
8 | <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\</WixHeatBinDir> | 8 | <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)..\tools\net6.0\</WixHeatBinDir> |
9 | <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' ">$(MSBuildThisFileDirectory)..\tools\net472\</WixHeatBinDir> | 9 | <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' ">$(MSBuildThisFileDirectory)..\tools\net472\</WixHeatBinDir> |
10 | <WixHeatTasksPath Condition=" '$(WixHeatTasksPath)' == '' ">$(WixHeatBinDir)WixToolset.HeatTasks.dll</WixHeatTasksPath> | 10 | <WixHeatTasksPath Condition=" '$(WixHeatTasksPath)' == '' ">$(WixHeatBinDir)WixToolset.HeatTasks.dll</WixHeatTasksPath> |
11 | 11 | ||
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 | |||
14 | /// </summary> | 14 | /// </summary> |
15 | public abstract partial class HeatTask : ToolTask | 15 | public abstract partial class HeatTask : ToolTask |
16 | { | 16 | { |
17 | #if NETFRAMEWORK | ||
17 | private static readonly string ThisDllPath = new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath; | 18 | private static readonly string ThisDllPath = new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath; |
19 | #else | ||
20 | private static readonly string ThisDllPath = typeof(HeatTask).Assembly.Location; | ||
21 | #endif | ||
22 | |||
18 | 23 | ||
19 | /// <summary> | 24 | /// <summary> |
20 | /// Gets or sets additional options that are appended the the tool command-line. | 25 | /// 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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks> | 6 | <TargetFrameworks>net6.0;net472</TargetFrameworks> |
7 | <Title>WiX Toolset Heat MSBuild Tasks</Title> | 7 | <Title>WiX Toolset Heat MSBuild Tasks</Title> |
8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
9 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 9 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks> | 6 | <TargetFrameworks>net6.0-windows;net472</TargetFrameworks> |
7 | <OutputType>Exe</OutputType> | 7 | <OutputType>Exe</OutputType> |
8 | <Description>Harvester</Description> | 8 | <Description>Harvester</Description> |
9 | <Title>WiX Toolset Harvester</Title> | 9 | <Title>WiX Toolset Harvester</Title> |
10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
12 | <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86;win-x64</RuntimeIdentifiers> | 12 | <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='net6.0' ">win-x86;win-x64</RuntimeIdentifiers> |
13 | <AppConfig>app.config</AppConfig> | 13 | <AppConfig>app.config</AppConfig> |
14 | <ApplicationManifest>heat.exe.manifest</ApplicationManifest> | 14 | <ApplicationManifest>heat.exe.manifest</ApplicationManifest> |
15 | <RollForward>LatestMajor</RollForward> | 15 | <RollForward>LatestMajor</RollForward> |
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 @@ | |||
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <StagePublishX86>$(BaseIntermediateOutputPath)$(Configuration)\net472\x86\</StagePublishX86> | 3 | <StagePublishX86>$(BaseIntermediateOutputPath)$(Configuration)\net472\x86\</StagePublishX86> |
4 | <StagePublishX64>$(BaseIntermediateOutputPath)$(Configuration)\net472\x64\</StagePublishX64> | 4 | <StagePublishX64>$(BaseIntermediateOutputPath)$(Configuration)\net472\x64\</StagePublishX64> |
5 | <StagePublishDnc>$(BaseIntermediateOutputPath)$(Configuration)\netcoreapp3.1\</StagePublishDnc> | 5 | <StagePublishDnc>$(BaseIntermediateOutputPath)$(Configuration)\net6.0\</StagePublishDnc> |
6 | 6 | ||
7 | <PublishBuildFolder>$(PublishRoot)WixToolset.Heat\build\</PublishBuildFolder> | 7 | <PublishBuildFolder>$(PublishRoot)WixToolset.Heat\build\</PublishBuildFolder> |
8 | <PublishHere>$(PublishRoot)WixToolset.Heat\tools\net472\</PublishHere> | 8 | <PublishHere>$(PublishRoot)WixToolset.Heat\tools\net472\</PublishHere> |
9 | <PublishX86>$(PublishRoot)WixToolset.Heat\tools\net472\x86\</PublishX86> | 9 | <PublishX86>$(PublishRoot)WixToolset.Heat\tools\net472\x86\</PublishX86> |
10 | <PublishX64>$(PublishRoot)WixToolset.Heat\tools\net472\x64\</PublishX64> | 10 | <PublishX64>$(PublishRoot)WixToolset.Heat\tools\net472\x64\</PublishX64> |
11 | <PublishDnc>$(PublishRoot)WixToolset.Heat\tools\netcoreapp3.1\</PublishDnc> | 11 | <PublishDnc>$(PublishRoot)WixToolset.Heat\tools\net6.0\</PublishDnc> |
12 | </PropertyGroup> | 12 | </PropertyGroup> |
13 | 13 | ||
14 | <ItemGroup> | 14 | <ItemGroup> |
15 | <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=net472;PublishDir=$(StagePublishX86)WixToolset.HeatTasks" Targets="Publish" /> | 15 | <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=net472;PublishDir=$(StagePublishX86)WixToolset.HeatTasks" Targets="Publish" /> |
16 | <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(StagePublishDnc)WixToolset.HeatTasks" Targets="Publish" /> | 16 | <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=net6.0;UseAppHost=false;PublishDir=$(StagePublishDnc)WixToolset.HeatTasks" Targets="Publish" /> |
17 | 17 | ||
18 | <!-- heat.exe doesn't need to filter any files so publish it straight into its final location --> | 18 | <!-- heat.exe doesn't need to filter any files so publish it straight into its final location --> |
19 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(PublishX86)" Targets="Publish" /> | 19 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(PublishX86)" Targets="Publish" /> |
20 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(PublishX64)" Targets="Publish" /> | 20 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(PublishX64)" Targets="Publish" /> |
21 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" /> | 21 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net6.0-windows;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" /> |
22 | </ItemGroup> | 22 | </ItemGroup> |
23 | 23 | ||
24 | <Target Name="CopyToFinalPublishFolder" AfterTargets="Build"> | 24 | <Target Name="CopyToFinalPublishFolder" AfterTargets="Build"> |
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 | |||
9 | 9 | ||
10 | public abstract partial class ToolsetTask : ToolTask | 10 | public abstract partial class ToolsetTask : ToolTask |
11 | { | 11 | { |
12 | #if NETFRAMEWORK | ||
12 | private static readonly string ThisDllPath = new Uri(typeof(ToolsetTask).Assembly.CodeBase).AbsolutePath; | 13 | private static readonly string ThisDllPath = new Uri(typeof(ToolsetTask).Assembly.CodeBase).AbsolutePath; |
14 | #else | ||
15 | private static readonly string ThisDllPath = typeof(ToolsetTask).Assembly.Location; | ||
16 | #endif | ||
13 | 17 | ||
14 | /// <summary> | 18 | /// <summary> |
15 | /// Gets or sets additional options that are appended the the tool command-line. | 19 | /// 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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks> | 6 | <TargetFrameworks>net6.0;net472</TargetFrameworks> |
7 | <Description></Description> | 7 | <Description></Description> |
8 | <Title>WiX Toolset MSBuild Tasks</Title> | 8 | <Title>WiX Toolset MSBuild Tasks</Title> |
9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
11 | <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86;win-x64</RuntimeIdentifiers> | 11 | <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='net6.0' ">win-x86;win-x64</RuntimeIdentifiers> |
12 | <!-- https://github.com/Microsoft/msbuild/issues/2360 --> | 12 | <!-- https://github.com/Microsoft/msbuild/issues/2360 --> |
13 | <PlatformTarget>AnyCPU</PlatformTarget> | 13 | <PlatformTarget>AnyCPU</PlatformTarget> |
14 | </PropertyGroup> | 14 | </PropertyGroup> |
@@ -24,6 +24,6 @@ | |||
24 | <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" /> | 24 | <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" /> |
25 | </ItemGroup> | 25 | </ItemGroup> |
26 | 26 | ||
27 | <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' "> | 27 | <ItemGroup Condition="'$(TargetFramework)'=='net6.0' "> |
28 | </ItemGroup> | 28 | </ItemGroup> |
29 | </Project> | 29 | </Project> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <Description>WiX Toolset MSBuild integration</Description> | 7 | <Description>WiX Toolset MSBuild integration</Description> |
8 | <PublishDir>$(OutputPath)publish\WixToolset.Sdk\</PublishDir> | 8 | <PublishDir>$(OutputPath)publish\WixToolset.Sdk\</PublishDir> |
9 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> | 9 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> |
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 @@ | |||
26 | 26 | ||
27 | <!-- These properties can be overridden to support non-default installations. --> | 27 | <!-- These properties can be overridden to support non-default installations. --> |
28 | <PropertyGroup> | 28 | <PropertyGroup> |
29 | <WixBinDir Condition=" '$(WixBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netcoreapp3.1\</WixBinDir> | 29 | <WixBinDir Condition=" '$(WixBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)net6.0\</WixBinDir> |
30 | <WixBinDir Condition=" '$(WixBinDir)' == '' ">$(MSBuildThisFileDirectory)net472\x86\</WixBinDir> | 30 | <WixBinDir Condition=" '$(WixBinDir)' == '' ">$(MSBuildThisFileDirectory)net472\x86\</WixBinDir> |
31 | <WixBinDir64 Condition=" '$(WixBinDir64)' == '' and '$(MSBuildRuntimeType)' != 'Core' ">$(MSBuildThisFileDirectory)net472\x64\</WixBinDir64> | 31 | <WixBinDir64 Condition=" '$(WixBinDir64)' == '' and '$(MSBuildRuntimeType)' != 'Core' ">$(MSBuildThisFileDirectory)net472\x64\</WixBinDir64> |
32 | <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath> | 32 | <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IncludeBuildOutput>false</IncludeBuildOutput> | 7 | <IncludeBuildOutput>false</IncludeBuildOutput> |
8 | <Title>The WiX Toolset command-line interface.</Title> | 8 | <Title>The WiX Toolset command-line interface.</Title> |
9 | <Description>The WiX Toolset lets developers create installers for Windows. This package contains the WiX Toolset command-line interface.</Description> | 9 | <Description>The WiX Toolset lets developers create installers for Windows. This package contains the WiX Toolset command-line interface.</Description> |
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 @@ | |||
18 | </metadata> | 18 | </metadata> |
19 | 19 | ||
20 | <files> | 20 | <files> |
21 | <file src="$projectFolder$\DotnetToolSettings.xml" target="tools\netcoreapp3.1\any" /> | 21 | <file src="$projectFolder$\DotnetToolSettings.xml" target="tools\net6.0\any" /> |
22 | <file src="$projectFolder$\..\..\internal\images\wix-white-bg.png" /> | 22 | <file src="$projectFolder$\..\..\internal\images\wix-white-bg.png" /> |
23 | <file src="**" target="tools\netcoreapp3.1\any" /> | 23 | <file src="**" target="tools\net6.0\any" /> |
24 | </files> | 24 | </files> |
25 | </package> | 25 | </package> |
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 @@ | |||
1 | <Project Sdk="Microsoft.Build.Traversal"> | 1 | <Project Sdk="Microsoft.Build.Traversal"> |
2 | <ItemGroup> | 2 | <ItemGroup> |
3 | <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=netcoreapp3.1;PublishDir=$(BaseOutputPath)$(Configuration)\publish\wix\" Targets="Publish" /> | 3 | <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net6.0;PublishDir=$(BaseOutputPath)$(Configuration)\publish\wix\" Targets="Publish" /> |
4 | 4 | ||
5 | <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\buildtasks\" Targets="Publish" /> | 5 | <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\buildtasks\" Targets="Publish" /> |
6 | <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\wix\" Targets="Publish" /> | 6 | <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x86\wix\" Targets="Publish" /> |
@@ -8,7 +8,7 @@ | |||
8 | <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\buildtasks\" Targets="Publish" /> | 8 | <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\buildtasks\" Targets="Publish" /> |
9 | <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\wix\" Targets="Publish" /> | 9 | <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\wix\" Targets="Publish" /> |
10 | 10 | ||
11 | <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\" Targets="Publish" /> | 11 | <ProjectReference Include="WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" Properties="TargetFramework=net6.0;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net6.0\buildtasks\" Targets="Publish" /> |
12 | <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\netcoreapp3.1\wix\" Targets="Publish" /> | 12 | <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net6.0;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net6.0\wix\" Targets="Publish" /> |
13 | </ItemGroup> | 13 | </ItemGroup> |
14 | </Project> | 14 | </Project> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
8 | <OutputType>Exe</OutputType> | 8 | <OutputType>Exe</OutputType> |
9 | <SignOutput>false</SignOutput> | 9 | <SignOutput>false</SignOutput> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
9 | <SignOutput>false</SignOutput> | 9 | <SignOutput>false</SignOutput> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <RuntimeIdentifier>win-x64</RuntimeIdentifier> | 7 | <RuntimeIdentifier>win-x64</RuntimeIdentifier> |
8 | <RequiresNativeWixAssets>true</RequiresNativeWixAssets> | 8 | <RequiresNativeWixAssets>true</RequiresNativeWixAssets> |
9 | <IsWixTestProject>true</IsWixTestProject> | 9 | <IsWixTestProject>true</IsWixTestProject> |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <IsWixTestProject>true</IsWixTestProject> | 7 | <IsWixTestProject>true</IsWixTestProject> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
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 | |||
260 | 260 | ||
261 | WixAssert.CompareLineByLine(new[] | 261 | WixAssert.CompareLineByLine(new[] |
262 | { | 262 | { |
263 | "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.", | ||
263 | "The CommandLine/@Condition attribute's value '=' is not a valid bundle condition.", | 264 | "The CommandLine/@Condition attribute's value '=' is not a valid bundle condition.", |
264 | "The MsiPackage/@InstallCondition attribute's value '=' is not a valid bundle condition.", | 265 | "The MsiPackage/@InstallCondition attribute's value '=' is not a valid bundle condition.", |
265 | "The MsiProperty/@Condition attribute's value '=' is not a valid bundle condition.", | 266 | "The MsiProperty/@Condition attribute's value '=' is not a valid bundle condition.", |
266 | "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.", | ||
267 | }, errorMessages.ToArray()); | 267 | }, errorMessages.ToArray()); |
268 | 268 | ||
269 | Assert.Equal(409, result.ExitCode); | 269 | 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 | |||
274 | [Fact] | 274 | [Fact] |
275 | public void CanBuildSimpleBundleUsingExtensionBA() | 275 | public void CanBuildSimpleBundleUsingExtensionBA() |
276 | { | 276 | { |
277 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
278 | var folder = TestData.Get(@"TestData\SimpleBundle"); | 277 | var folder = TestData.Get(@"TestData\SimpleBundle"); |
279 | 278 | ||
280 | using (var fs = new DisposableFileSystem()) | 279 | using (var fs = new DisposableFileSystem()) |
@@ -287,7 +286,7 @@ namespace WixToolsetTest.CoreIntegration | |||
287 | "build", | 286 | "build", |
288 | Path.Combine(folder, "MultiFileBundle.wxs"), | 287 | Path.Combine(folder, "MultiFileBundle.wxs"), |
289 | "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), | 288 | "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), |
290 | "-ext", extensionPath, | 289 | "-ext", ExtensionPaths.ExampleExtensionPath, |
291 | "-bindpath", Path.Combine(folder, "data"), | 290 | "-bindpath", Path.Combine(folder, "data"), |
292 | "-intermediateFolder", intermediateFolder, | 291 | "-intermediateFolder", intermediateFolder, |
293 | "-o", Path.Combine(baseFolder, @"bin\test.exe") | 292 | "-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 | |||
281 | [Fact] | 281 | [Fact] |
282 | public void PopulatesManifestWithBundleExtensionSearches() | 282 | public void PopulatesManifestWithBundleExtensionSearches() |
283 | { | 283 | { |
284 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
285 | var folder = TestData.Get(@"TestData"); | 284 | var folder = TestData.Get(@"TestData"); |
286 | 285 | ||
287 | using (var fs = new DisposableFileSystem()) | 286 | using (var fs = new DisposableFileSystem()) |
@@ -299,7 +298,7 @@ namespace WixToolsetTest.CoreIntegration | |||
299 | Path.Combine(folder, "BundleExtension", "BundleWithSearches.wxs"), | 298 | Path.Combine(folder, "BundleExtension", "BundleWithSearches.wxs"), |
300 | Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"), | 299 | Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"), |
301 | Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"), | 300 | Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"), |
302 | "-ext", extensionPath, | 301 | "-ext", ExtensionPaths.ExampleExtensionPath, |
303 | "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), | 302 | "-bindpath", Path.Combine(folder, "SimpleBundle", "data"), |
304 | "-intermediateFolder", intermediateFolder, | 303 | "-intermediateFolder", intermediateFolder, |
305 | "-o", bundlePath | 304 | "-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 | |||
59 | public void CanBuildWithExampleExtension() | 59 | public void CanBuildWithExampleExtension() |
60 | { | 60 | { |
61 | var folder = TestData.Get(@"TestData\ExampleExtension"); | 61 | var folder = TestData.Get(@"TestData\ExampleExtension"); |
62 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
63 | 62 | ||
64 | using (var fs = new DisposableFileSystem()) | 63 | using (var fs = new DisposableFileSystem()) |
65 | { | 64 | { |
@@ -71,7 +70,7 @@ namespace WixToolsetTest.CoreIntegration | |||
71 | Path.Combine(folder, "Package.wxs"), | 70 | Path.Combine(folder, "Package.wxs"), |
72 | Path.Combine(folder, "PackageComponents.wxs"), | 71 | Path.Combine(folder, "PackageComponents.wxs"), |
73 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), | 72 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), |
74 | "-ext", extensionPath, | 73 | "-ext", ExtensionPaths.ExampleExtensionPath, |
75 | "-bindpath", Path.Combine(folder, "data"), | 74 | "-bindpath", Path.Combine(folder, "data"), |
76 | "-intermediateFolder", intermediateFolder, | 75 | "-intermediateFolder", intermediateFolder, |
77 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") | 76 | "-o", Path.Combine(intermediateFolder, @"bin\extest.msi") |
@@ -101,7 +100,6 @@ namespace WixToolsetTest.CoreIntegration | |||
101 | public void CanParseCommandLineWithExtension() | 100 | public void CanParseCommandLineWithExtension() |
102 | { | 101 | { |
103 | var folder = TestData.Get(@"TestData\ExampleExtension"); | 102 | var folder = TestData.Get(@"TestData\ExampleExtension"); |
104 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
105 | 103 | ||
106 | using (var fs = new DisposableFileSystem()) | 104 | using (var fs = new DisposableFileSystem()) |
107 | { | 105 | { |
@@ -113,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration | |||
113 | Path.Combine(folder, "Package.wxs"), | 111 | Path.Combine(folder, "Package.wxs"), |
114 | Path.Combine(folder, "PackageComponents.wxs"), | 112 | Path.Combine(folder, "PackageComponents.wxs"), |
115 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), | 113 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), |
116 | "-ext", extensionPath, | 114 | "-ext", ExtensionPaths.ExampleExtensionPath, |
117 | "-bindpath", Path.Combine(folder, "data"), | 115 | "-bindpath", Path.Combine(folder, "data"), |
118 | "-intermediateFolder", intermediateFolder, | 116 | "-intermediateFolder", intermediateFolder, |
119 | "-example", "test", | 117 | "-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 @@ | |||
1 | // 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. | ||
2 | |||
3 | namespace WixToolsetTest.CoreIntegration | ||
4 | { | ||
5 | using Example.Extension; | ||
6 | |||
7 | internal class ExtensionPaths | ||
8 | { | ||
9 | #if NETFRAMEWORK | ||
10 | public static readonly string ExampleExtensionPath = new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath; | ||
11 | #else | ||
12 | public static readonly string ExampleExtensionPath = typeof(ExampleExtensionFactory).Assembly.Location; | ||
13 | #endif | ||
14 | } | ||
15 | } | ||
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 | |||
730 | public void FailsBuildAtBindTimeForMissingEnsureTable() | 730 | public void FailsBuildAtBindTimeForMissingEnsureTable() |
731 | { | 731 | { |
732 | var folder = TestData.Get(@"TestData"); | 732 | var folder = TestData.Get(@"TestData"); |
733 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
734 | 733 | ||
735 | using (var fs = new DisposableFileSystem()) | 734 | using (var fs = new DisposableFileSystem()) |
736 | { | 735 | { |
@@ -744,7 +743,7 @@ namespace WixToolsetTest.CoreIntegration | |||
744 | Path.Combine(folder, "BadEnsureTable", "BadEnsureTable.wxs"), | 743 | Path.Combine(folder, "BadEnsureTable", "BadEnsureTable.wxs"), |
745 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), | 744 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), |
746 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), | 745 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), |
747 | "-ext", extensionPath, | 746 | "-ext", ExtensionPaths.ExampleExtensionPath, |
748 | "-bindpath", Path.Combine(folder, "SingleFile", "data"), | 747 | "-bindpath", Path.Combine(folder, "SingleFile", "data"), |
749 | "-intermediateFolder", intermediateFolder, | 748 | "-intermediateFolder", intermediateFolder, |
750 | "-o", msiPath | 749 | "-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 | |||
338 | public void CanBuildMsiWithEmptyCustomTableBecauseOfCustomTableRef() | 338 | public void CanBuildMsiWithEmptyCustomTableBecauseOfCustomTableRef() |
339 | { | 339 | { |
340 | var folder = TestData.Get(@"TestData"); | 340 | var folder = TestData.Get(@"TestData"); |
341 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
342 | 341 | ||
343 | using (var fs = new DisposableFileSystem()) | 342 | using (var fs = new DisposableFileSystem()) |
344 | { | 343 | { |
@@ -352,7 +351,7 @@ namespace WixToolsetTest.CoreIntegration | |||
352 | Path.Combine(folder, "EnsureTable", "EnsureCustomTable.wxs"), | 351 | Path.Combine(folder, "EnsureTable", "EnsureCustomTable.wxs"), |
353 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), | 352 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), |
354 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), | 353 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), |
355 | "-ext", extensionPath, | 354 | "-ext", ExtensionPaths.ExampleExtensionPath, |
356 | "-bindpath", Path.Combine(folder, "SingleFile", "data"), | 355 | "-bindpath", Path.Combine(folder, "SingleFile", "data"), |
357 | "-intermediateFolder", intermediateFolder, | 356 | "-intermediateFolder", intermediateFolder, |
358 | "-o", msiPath | 357 | "-o", msiPath |
@@ -370,7 +369,6 @@ namespace WixToolsetTest.CoreIntegration | |||
370 | public void CanBuildMsiWithEmptyStandardTableBecauseOfEnsureTable() | 369 | public void CanBuildMsiWithEmptyStandardTableBecauseOfEnsureTable() |
371 | { | 370 | { |
372 | var folder = TestData.Get(@"TestData"); | 371 | var folder = TestData.Get(@"TestData"); |
373 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
374 | 372 | ||
375 | using (var fs = new DisposableFileSystem()) | 373 | using (var fs = new DisposableFileSystem()) |
376 | { | 374 | { |
@@ -384,7 +382,7 @@ namespace WixToolsetTest.CoreIntegration | |||
384 | Path.Combine(folder, "EnsureTable", "EnsureModuleSignature.wxs"), | 382 | Path.Combine(folder, "EnsureTable", "EnsureModuleSignature.wxs"), |
385 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), | 383 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), |
386 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), | 384 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), |
387 | "-ext", extensionPath, | 385 | "-ext", ExtensionPaths.ExampleExtensionPath, |
388 | "-bindpath", Path.Combine(folder, "SingleFile", "data"), | 386 | "-bindpath", Path.Combine(folder, "SingleFile", "data"), |
389 | "-intermediateFolder", intermediateFolder, | 387 | "-intermediateFolder", intermediateFolder, |
390 | "-o", msiPath | 388 | "-o", msiPath |
@@ -402,7 +400,6 @@ namespace WixToolsetTest.CoreIntegration | |||
402 | public void CanBuildMsiWithEmptyTableFromExtensionBecauseOfEnsureTable() | 400 | public void CanBuildMsiWithEmptyTableFromExtensionBecauseOfEnsureTable() |
403 | { | 401 | { |
404 | var folder = TestData.Get(@"TestData"); | 402 | var folder = TestData.Get(@"TestData"); |
405 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
406 | 403 | ||
407 | using (var fs = new DisposableFileSystem()) | 404 | using (var fs = new DisposableFileSystem()) |
408 | { | 405 | { |
@@ -416,7 +413,7 @@ namespace WixToolsetTest.CoreIntegration | |||
416 | Path.Combine(folder, "EnsureTable", "EnsureExtensionTable.wxs"), | 413 | Path.Combine(folder, "EnsureTable", "EnsureExtensionTable.wxs"), |
417 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), | 414 | Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"), |
418 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), | 415 | Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"), |
419 | "-ext", extensionPath, | 416 | "-ext", ExtensionPaths.ExampleExtensionPath, |
420 | "-bindpath", Path.Combine(folder, "SingleFile", "data"), | 417 | "-bindpath", Path.Combine(folder, "SingleFile", "data"), |
421 | "-intermediateFolder", intermediateFolder, | 418 | "-intermediateFolder", intermediateFolder, |
422 | "-o", msiPath | 419 | "-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 | |||
454 | 454 | ||
455 | private static string BuildMsi(string outputName, string sourceFolder, string baseFolder, string defineV, string defineA, string defineB, IEnumerable<string> bindpaths = null) | 455 | private static string BuildMsi(string outputName, string sourceFolder, string baseFolder, string defineV, string defineA, string defineB, IEnumerable<string> bindpaths = null) |
456 | { | 456 | { |
457 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
458 | var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName)); | 457 | var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName)); |
459 | 458 | ||
460 | var args = new List<string> | 459 | var args = new List<string> |
@@ -467,7 +466,7 @@ namespace WixToolsetTest.CoreIntegration | |||
467 | "-bindpath", Path.Combine(sourceFolder, ".data"), | 466 | "-bindpath", Path.Combine(sourceFolder, ".data"), |
468 | "-intermediateFolder", Path.Combine(baseFolder, "obj"), | 467 | "-intermediateFolder", Path.Combine(baseFolder, "obj"), |
469 | "-o", outputPath, | 468 | "-o", outputPath, |
470 | "-ext", extensionPath, | 469 | "-ext", ExtensionPaths.ExampleExtensionPath, |
471 | }; | 470 | }; |
472 | 471 | ||
473 | foreach (var additionaBindPath in bindpaths ?? Enumerable.Empty<string>()) | 472 | foreach (var additionaBindPath in bindpaths ?? Enumerable.Empty<string>()) |
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0</TargetFramework> |
7 | <RequiresNativeWixAssets>true</RequiresNativeWixAssets> | 7 | <RequiresNativeWixAssets>true</RequiresNativeWixAssets> |
8 | <IsWixTestProject>true</IsWixTestProject> | 8 | <IsWixTestProject>true</IsWixTestProject> |
9 | </PropertyGroup> | 9 | </PropertyGroup> |
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 | |||
107 | public void CanBuildMsiUsingExtensionLibrary() | 107 | public void CanBuildMsiUsingExtensionLibrary() |
108 | { | 108 | { |
109 | var folder = TestData.Get(@"TestData\Wixipl"); | 109 | var folder = TestData.Get(@"TestData\Wixipl"); |
110 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
111 | 110 | ||
112 | using (var fs = new DisposableFileSystem()) | 111 | using (var fs = new DisposableFileSystem()) |
113 | { | 112 | { |
@@ -117,7 +116,7 @@ namespace WixToolsetTest.CoreIntegration | |||
117 | var result = WixRunner.Execute(new[] | 116 | var result = WixRunner.Execute(new[] |
118 | { | 117 | { |
119 | "build", | 118 | "build", |
120 | "-ext", extensionPath, | 119 | "-ext", ExtensionPaths.ExampleExtensionPath, |
121 | Path.Combine(folder, "Package.wxs"), | 120 | Path.Combine(folder, "Package.wxs"), |
122 | Path.Combine(folder, "PackageComponents.wxs"), | 121 | Path.Combine(folder, "PackageComponents.wxs"), |
123 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), | 122 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), |
@@ -151,7 +150,6 @@ namespace WixToolsetTest.CoreIntegration | |||
151 | public void CanBuildWixiplUsingExtensionLibrary() | 150 | public void CanBuildWixiplUsingExtensionLibrary() |
152 | { | 151 | { |
153 | var folder = TestData.Get(@"TestData\Wixipl"); | 152 | var folder = TestData.Get(@"TestData\Wixipl"); |
154 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
155 | 153 | ||
156 | using (var fs = new DisposableFileSystem()) | 154 | using (var fs = new DisposableFileSystem()) |
157 | { | 155 | { |
@@ -161,7 +159,7 @@ namespace WixToolsetTest.CoreIntegration | |||
161 | var result = WixRunner.Execute(new[] | 159 | var result = WixRunner.Execute(new[] |
162 | { | 160 | { |
163 | "build", | 161 | "build", |
164 | "-ext", extensionPath, | 162 | "-ext", ExtensionPaths.ExampleExtensionPath, |
165 | Path.Combine(folder, "Package.wxs"), | 163 | Path.Combine(folder, "Package.wxs"), |
166 | Path.Combine(folder, "PackageComponents.wxs"), | 164 | Path.Combine(folder, "PackageComponents.wxs"), |
167 | "-intermediateFolder", intermediateFolder, | 165 | "-intermediateFolder", intermediateFolder, |
@@ -174,7 +172,7 @@ namespace WixToolsetTest.CoreIntegration | |||
174 | { | 172 | { |
175 | "build", | 173 | "build", |
176 | Path.Combine(intermediateFolder, @"test.wixipl"), | 174 | Path.Combine(intermediateFolder, @"test.wixipl"), |
177 | "-ext", extensionPath, | 175 | "-ext", ExtensionPaths.ExampleExtensionPath, |
178 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), | 176 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), |
179 | "-bindpath", Path.Combine(folder, "data"), | 177 | "-bindpath", Path.Combine(folder, "data"), |
180 | "-intermediateFolder", intermediateFolder, | 178 | "-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 | |||
248 | public void CanBuildWithExtensionUsingWixlib() | 248 | public void CanBuildWithExtensionUsingWixlib() |
249 | { | 249 | { |
250 | var folder = TestData.Get(@"TestData\ExampleExtension"); | 250 | var folder = TestData.Get(@"TestData\ExampleExtension"); |
251 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
252 | 251 | ||
253 | using (var fs = new DisposableFileSystem()) | 252 | using (var fs = new DisposableFileSystem()) |
254 | { | 253 | { |
@@ -259,7 +258,7 @@ namespace WixToolsetTest.CoreIntegration | |||
259 | { | 258 | { |
260 | "build", | 259 | "build", |
261 | Path.Combine(folder, "PackageComponents.wxs"), | 260 | Path.Combine(folder, "PackageComponents.wxs"), |
262 | "-ext", extensionPath, | 261 | "-ext", ExtensionPaths.ExampleExtensionPath, |
263 | "-intermediateFolder", intermediateFolder, | 262 | "-intermediateFolder", intermediateFolder, |
264 | "-o", Path.Combine(intermediateFolder, @"test.wixlib") | 263 | "-o", Path.Combine(intermediateFolder, @"test.wixlib") |
265 | }); | 264 | }); |
@@ -272,7 +271,7 @@ namespace WixToolsetTest.CoreIntegration | |||
272 | Path.Combine(folder, "Package.wxs"), | 271 | Path.Combine(folder, "Package.wxs"), |
273 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), | 272 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), |
274 | "-lib", Path.Combine(intermediateFolder, @"test.wixlib"), | 273 | "-lib", Path.Combine(intermediateFolder, @"test.wixlib"), |
275 | "-ext", extensionPath, | 274 | "-ext", ExtensionPaths.ExampleExtensionPath, |
276 | "-bindpath", Path.Combine(folder, "data"), | 275 | "-bindpath", Path.Combine(folder, "data"), |
277 | "-intermediateFolder", intermediateFolder, | 276 | "-intermediateFolder", intermediateFolder, |
278 | "-o", Path.Combine(intermediateFolder, @"bin\test.msi") | 277 | "-o", Path.Combine(intermediateFolder, @"bin\test.msi") |
@@ -297,7 +296,6 @@ namespace WixToolsetTest.CoreIntegration | |||
297 | public void CanBuildWithExtensionUsingMultipleWixlibs() | 296 | public void CanBuildWithExtensionUsingMultipleWixlibs() |
298 | { | 297 | { |
299 | var folder = TestData.Get(@"TestData\ComplexExampleExtension"); | 298 | var folder = TestData.Get(@"TestData\ComplexExampleExtension"); |
300 | var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath); | ||
301 | 299 | ||
302 | using (var fs = new DisposableFileSystem()) | 300 | using (var fs = new DisposableFileSystem()) |
303 | { | 301 | { |
@@ -308,7 +306,7 @@ namespace WixToolsetTest.CoreIntegration | |||
308 | { | 306 | { |
309 | "build", | 307 | "build", |
310 | Path.Combine(folder, "PackageComponents.wxs"), | 308 | Path.Combine(folder, "PackageComponents.wxs"), |
311 | "-ext", extensionPath, | 309 | "-ext", ExtensionPaths.ExampleExtensionPath, |
312 | "-intermediateFolder", intermediateFolder, | 310 | "-intermediateFolder", intermediateFolder, |
313 | "-o", Path.Combine(intermediateFolder, @"components.wixlib") | 311 | "-o", Path.Combine(intermediateFolder, @"components.wixlib") |
314 | }); | 312 | }); |
@@ -319,7 +317,7 @@ namespace WixToolsetTest.CoreIntegration | |||
319 | { | 317 | { |
320 | "build", | 318 | "build", |
321 | Path.Combine(folder, "OtherComponents.wxs"), | 319 | Path.Combine(folder, "OtherComponents.wxs"), |
322 | "-ext", extensionPath, | 320 | "-ext", ExtensionPaths.ExampleExtensionPath, |
323 | "-intermediateFolder", intermediateFolder, | 321 | "-intermediateFolder", intermediateFolder, |
324 | "-o", Path.Combine(intermediateFolder, @"other.wixlib") | 322 | "-o", Path.Combine(intermediateFolder, @"other.wixlib") |
325 | }); | 323 | }); |
@@ -333,7 +331,7 @@ namespace WixToolsetTest.CoreIntegration | |||
333 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), | 331 | "-loc", Path.Combine(folder, "Package.en-us.wxl"), |
334 | "-lib", Path.Combine(intermediateFolder, @"components.wixlib"), | 332 | "-lib", Path.Combine(intermediateFolder, @"components.wixlib"), |
335 | "-lib", Path.Combine(intermediateFolder, @"other.wixlib"), | 333 | "-lib", Path.Combine(intermediateFolder, @"other.wixlib"), |
336 | "-ext", extensionPath, | 334 | "-ext", ExtensionPaths.ExampleExtensionPath, |
337 | "-bindpath", Path.Combine(folder, "data"), | 335 | "-bindpath", Path.Combine(folder, "data"), |
338 | "-intermediateFolder", intermediateFolder, | 336 | "-intermediateFolder", intermediateFolder, |
339 | "-o", Path.Combine(intermediateFolder, @"bin\test.msi") | 337 | "-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 | |||
40 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll | 40 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll |
41 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% | 41 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% |
42 | 42 | ||
43 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll | 43 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net6.0\buildtasks %_P%\WixToolset.Sdk\tools\net6.0 %_RCO% /XF Microsoft.Build.*.dll |
44 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% | 44 | robocopy %_P_OBJ%\WixToolset.Sdk\separate\net6.0\wix %_P%\WixToolset.Sdk\tools\net6.0 %_RCO% |
45 | 45 | ||
46 | msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b | 46 | msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b |
47 | 47 | ||
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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks> | 6 | <TargetFrameworks>net6.0;net472</TargetFrameworks> |
7 | <OutputType>Exe</OutputType> | 7 | <OutputType>Exe</OutputType> |
8 | <Description>WiX Toolset creates installation packages.</Description> | 8 | <Description>WiX Toolset creates installation packages.</Description> |
9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
11 | <PackAsTool>true</PackAsTool> | 11 | <PackAsTool>true</PackAsTool> |
12 | <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86;win-x64</RuntimeIdentifiers> | 12 | <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='net6.0' ">win-x86;win-x64</RuntimeIdentifiers> |
13 | <AppConfig>app.config</AppConfig> | 13 | <AppConfig>app.config</AppConfig> |
14 | <ApplicationManifest>wix.exe.manifest</ApplicationManifest> | 14 | <ApplicationManifest>wix.exe.manifest</ApplicationManifest> |
15 | <RollForward>Major</RollForward> | 15 | <RollForward>Major</RollForward> |