@joebigelow / wix-1 / commits / 464575de

Standardize on .NET 6 as the minimum for .NET Core platform.

Closes 6942

Rob Mensching committed Oct 1, 2022 at 02:38 UTC 464575def4341d65bc3fa72298798755cdee527e
69 files changed +115 -104
README.md
+1 -1
@@ -12,7 +12,7 @@ This repository contains the WiX Toolset v4 codebase.
12
13 ## Prerequisites
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
17 | Workloads |
18 | :-------- |
src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.Build.NoTargets/3.0.4">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <PackageId>WixToolset.BootstrapperCore.Native</PackageId>
8 <Description>WiX Bootstrapper native interfaces</Description>
9 </PropertyGroup>
src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <RuntimeIdentifier>win-x86</RuntimeIdentifier>
8 <RollForward>Major</RollForward>
9 <IsWixTestProject>true</IsWixTestProject>
src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+1 -1
@@ -1,7 +1,7 @@
1 <Project Sdk="Microsoft.NET.Sdk">
2
3 <PropertyGroup>
4 - <TargetFramework>netcoreapp3.1</TargetFramework>
4 + <TargetFramework>net6.0</TargetFramework>
5 <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
6 <IsDncBA>true</IsDncBA>
7 <Description>Earliest .NET Core MBA</Description>
src/ext/Bal/wixlib/bal.wixproj
+1 -1
@@ -8,7 +8,7 @@
8
9 <ItemGroup>
10 <BindInputPaths Include="..\wixstdba\Resources\" />
11 - <BindInputPaths Include="$(OutputPath)netcoreapp3.1" />
11 + <BindInputPaths Include="$(OutputPath)net6.0" />
12 <BindInputPaths Include="$(OutputPath)net20" />
13 <BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
14 <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/internal/SetBuildNumber/SetBuildNumber.proj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.Build.NoTargets/3.0.4">
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 -->
8 <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
9
src/test/burn/Directory.wixproj.props
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName>
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>
8 <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions>
9 <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
src/test/burn/README.md
+2 -2
@@ -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.
11
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.
14 -1. Open an elevated command prompt and navigate to the netcoreapp3.1 folder.
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 net6.0-windows folder.
15 1. Run the runtests.cmd file to run the tests.
16
17 You can modify the runtests.cmd to run specific tests.
src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj
+1 -1
@@ -17,7 +17,7 @@
17 </ItemGroup>
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">
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>
22 <!-- We do this to avoid copying such a large file to the VM to run the tests. -->
23 <Target Name="DeleteLargeFile" AfterTargets="AfterBuild">
src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
+2 -2
@@ -27,7 +27,7 @@
27 </ItemGroup>
28 <!-- We do this dynamically to avoid committing so many files to source control. -->
29 <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild">
30 - <Exec Command='"$(BaseOutputPath)$(Configuration)\netcoreapp3.1\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)" />
30 + <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
31 + <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
32 </Target>
33 </Project>
\ No newline at end of file
src/test/burn/TestExe/TestExe.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>net35;netcoreapp3.1</TargetFrameworks>
6 + <TargetFrameworks>net35;net6.0</TargetFrameworks>
7 <AssemblyName>TestExe</AssemblyName>
8 <RootNamespace>TestExe</RootNamespace>
9 <OutputType>Exe</OutputType>
src/test/burn/WixTestTools/WixTestTools.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0-windows</TargetFramework>
7 <PlatformTarget>x64</PlatformTarget>
8 <IsWixTestSupportProject>true</IsWixTestSupportProject>
9 </PropertyGroup>
src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0-windows</TargetFramework>
7 <PlatformTarget>x64</PlatformTarget>
8 <RollForward>Major</RollForward>
9 <IsWixTestProject>true</IsWixTestProject>
src/test/burn/test_burn.cmd
+2 -2
@@ -16,8 +16,8 @@
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
18
19 -"%_B%\net35\win-x86\testexe.exe" /dm "%_B%\netcoreapp3.1\testhost.exe"
20 -mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_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%\net6.0-windows\testhost.exe"
21
22 @if not "%RuntimeTestsEnabled%"=="true" goto :LExit
23
src/test/msi/Directory.wixproj.props
+1 -1
@@ -3,7 +3,7 @@
3 <PropertyGroup>
4 <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName>
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>
8 <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions>
9 <SuppressValidation>true</SuppressValidation>
src/test/msi/README.md
+2 -2
@@ -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.
11
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.
14 -1. Open an elevated command prompt and navigate to the netcoreapp3.1 folder.
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 net6.0-windows folder.
15 1. Run the runtests.cmd file to run the tests.
16
17 You can modify the runtests.cmd to run specific tests.
src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0-windows</TargetFramework>
7 <PlatformTarget>x64</PlatformTarget>
8 <RollForward>Major</RollForward>
9 <IsWixTestProject>true</IsWixTestProject>
src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj
+1 -1
@@ -2,7 +2,7 @@
2
3 <PropertyGroup>
4 <OutputType>Exe</OutputType>
5 - <TargetFramework>netcoreapp3.1</TargetFramework>
5 + <TargetFramework>net6.0</TargetFramework>
6 <RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
7 </PropertyGroup>
8
src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj
+1 -1
@@ -1,7 +1,7 @@
1 <Project Sdk="Microsoft.NET.Sdk.Web">
2
3 <PropertyGroup>
4 - <TargetFramework>netcoreapp3.1</TargetFramework>
4 + <TargetFramework>net6.0</TargetFramework>
5 </PropertyGroup>
6
7 <ItemGroup>
src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj
+2 -2
@@ -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. -->
2 <Project Sdk='WixToolset.Sdk'>
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
6 <PropertyGroup>
7 <!-- <WixBinDir>D:\src\wix4\build\wix\Debug\net472\</WixBinDir> -->
@@ -13,5 +13,5 @@
13 <ProjectReference Include="..\CsprojWebApplicationNetCore\CsprojWebApplicationNetCore.csproj" Publish="true" />
14 </ItemGroup>
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>
src/tools/WixToolset.Heat/WixToolset.Heat.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
6 + <TargetFrameworks>net6.0</TargetFrameworks>
7 <Description>WiX Toolset Heat MSBuild integration</Description>
8 <PublishDir>$(PublishRoot)WixToolset.Heat\</PublishDir>
9 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
src/tools/WixToolset.Heat/WixToolset.Heat.targets
+1 -1
@@ -5,7 +5,7 @@
5 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <!-- These properties can be overridden to support non-default installations. -->
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>
10 <WixHeatTasksPath Condition=" '$(WixHeatTasksPath)' == '' ">$(WixHeatBinDir)WixToolset.HeatTasks.dll</WixHeatTasksPath>
11
src/tools/WixToolset.HeatTasks/HeatTask.cs
+5
@@ -14,7 +14,12 @@ namespace WixToolset.HeatTasks
14 /// </summary>
15 public abstract partial class HeatTask : ToolTask
16 {
17 +#if NETFRAMEWORK
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 +
23
24 /// <summary>
25 /// Gets or sets additional options that are appended the the tool command-line.
src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
6 + <TargetFrameworks>net6.0;net472</TargetFrameworks>
7 <Title>WiX Toolset Heat MSBuild Tasks</Title>
8 <DebugType>embedded</DebugType>
9 <PublishRepositoryUrl>true</PublishRepositoryUrl>
src/tools/heat/heat.csproj
+2 -2
@@ -3,13 +3,13 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
6 + <TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
7 <OutputType>Exe</OutputType>
8 <Description>Harvester</Description>
9 <Title>WiX Toolset Harvester</Title>
10 <DebugType>embedded</DebugType>
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>
14 <ApplicationManifest>heat.exe.manifest</ApplicationManifest>
15 <RollForward>LatestMajor</RollForward>
src/tools/publish_t.proj
+4 -4
@@ -2,23 +2,23 @@
2 <PropertyGroup>
3 <StagePublishX86>$(BaseIntermediateOutputPath)$(Configuration)\net472\x86\</StagePublishX86>
4 <StagePublishX64>$(BaseIntermediateOutputPath)$(Configuration)\net472\x64\</StagePublishX64>
5 - <StagePublishDnc>$(BaseIntermediateOutputPath)$(Configuration)\netcoreapp3.1\</StagePublishDnc>
5 + <StagePublishDnc>$(BaseIntermediateOutputPath)$(Configuration)\net6.0\</StagePublishDnc>
6
7 <PublishBuildFolder>$(PublishRoot)WixToolset.Heat\build\</PublishBuildFolder>
8 <PublishHere>$(PublishRoot)WixToolset.Heat\tools\net472\</PublishHere>
9 <PublishX86>$(PublishRoot)WixToolset.Heat\tools\net472\x86\</PublishX86>
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>
13
14 <ItemGroup>
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
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" />
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>
23
24 <Target Name="CopyToFinalPublishFolder" AfterTargets="Build">
src/wix/WixToolset.BuildTasks/ToolsetTask.cs
+4
@@ -9,7 +9,11 @@ namespace WixToolset.BuildTasks
9
10 public abstract partial class ToolsetTask : ToolTask
11 {
12 +#if NETFRAMEWORK
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
17
18 /// <summary>
19 /// Gets or sets additional options that are appended the the tool command-line.
src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+3 -3
@@ -3,12 +3,12 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
6 + <TargetFrameworks>net6.0;net472</TargetFrameworks>
7 <Description></Description>
8 <Title>WiX Toolset MSBuild Tasks</Title>
9 <DebugType>embedded</DebugType>
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 -->
13 <PlatformTarget>AnyCPU</PlatformTarget>
14 </PropertyGroup>
@@ -24,6 +24,6 @@
24 <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
25 </ItemGroup>
26
27 - <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' ">
27 + <ItemGroup Condition="'$(TargetFramework)'=='net6.0' ">
28 </ItemGroup>
29 </Project>
src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <Description>WiX Toolset MSBuild integration</Description>
8 <PublishDir>$(OutputPath)publish\WixToolset.Sdk\</PublishDir>
9 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
src/wix/WixToolset.Sdk/tools/wix.targets
+1 -1
@@ -26,7 +26,7 @@
26
27 <!-- These properties can be overridden to support non-default installations. -->
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>
31 <WixBinDir64 Condition=" '$(WixBinDir64)' == '' and '$(MSBuildRuntimeType)' != 'Core' ">$(MSBuildThisFileDirectory)net472\x64\</WixBinDir64>
32 <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath>
src/wix/pack-wix/pack-wix.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IncludeBuildOutput>false</IncludeBuildOutput>
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>
src/wix/pack-wix/pack-wix.nuspec
+2 -2
@@ -18,8 +18,8 @@
18 </metadata>
19
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" />
23 - <file src="**" target="tools\netcoreapp3.1\any" />
23 + <file src="**" target="tools\net6.0\any" />
24 </files>
25 </package>
src/wix/publish_t.proj
+3 -3
@@ -1,6 +1,6 @@
1 <Project Sdk="Microsoft.Build.Traversal">
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
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" />
@@ -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" />
9 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net472\x64\wix\" Targets="Publish" />
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" />
12 - <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\netcoreapp3.1\wix\" 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=net6.0;UseAppHost=false;PublishDir=$(BaseIntermediateOutputPath)$(Configuration)\WixToolset.Sdk\separate\net6.0\wix\" Targets="Publish" />
13 </ItemGroup>
14 </Project>
src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <OutputType>Exe</OutputType>
9 <SignOutput>false</SignOutput>
src/wix/test/Example.Extension/Example.Extension.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType>
9 <SignOutput>false</SignOutput>
src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <RuntimeIdentifier>win-x64</RuntimeIdentifier>
8 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
9 <IsWixTestProject>true</IsWixTestProject>
src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup>
9
src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
+1 -1
@@ -260,10 +260,10 @@ namespace WixToolsetTest.CoreIntegration
260
261 WixAssert.CompareLineByLine(new[]
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.",
264 "The CommandLine/@Condition attribute's value '=' is not a valid bundle condition.",
265 "The MsiPackage/@InstallCondition 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());
268
269 Assert.Equal(409, result.ExitCode);
src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+1 -2
@@ -274,7 +274,6 @@ namespace WixToolsetTest.CoreIntegration
274 [Fact]
275 public void CanBuildSimpleBundleUsingExtensionBA()
276 {
277 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
277 var folder = TestData.Get(@"TestData\SimpleBundle");
278
279 using (var fs = new DisposableFileSystem())
@@ -287,7 +286,7 @@ namespace WixToolsetTest.CoreIntegration
286 "build",
287 Path.Combine(folder, "MultiFileBundle.wxs"),
288 "-loc", Path.Combine(folder, "Bundle.en-us.wxl"),
290 - "-ext", extensionPath,
289 + "-ext", ExtensionPaths.ExampleExtensionPath,
290 "-bindpath", Path.Combine(folder, "data"),
291 "-intermediateFolder", intermediateFolder,
292 "-o", Path.Combine(baseFolder, @"bin\test.exe")
src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
+1 -2
@@ -281,7 +281,6 @@ namespace WixToolsetTest.CoreIntegration
281 [Fact]
282 public void PopulatesManifestWithBundleExtensionSearches()
283 {
284 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
284 var folder = TestData.Get(@"TestData");
285
286 using (var fs = new DisposableFileSystem())
@@ -299,7 +298,7 @@ namespace WixToolsetTest.CoreIntegration
298 Path.Combine(folder, "BundleExtension", "BundleWithSearches.wxs"),
299 Path.Combine(folder, "BundleWithPackageGroupRef", "MinimalPackageGroup.wxs"),
300 Path.Combine(folder, "BundleWithPackageGroupRef", "Bundle.wxs"),
302 - "-ext", extensionPath,
301 + "-ext", ExtensionPaths.ExampleExtensionPath,
302 "-bindpath", Path.Combine(folder, "SimpleBundle", "data"),
303 "-intermediateFolder", intermediateFolder,
304 "-o", bundlePath
src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+2 -4
@@ -59,7 +59,6 @@ namespace WixToolsetTest.CoreIntegration
59 public void CanBuildWithExampleExtension()
60 {
61 var folder = TestData.Get(@"TestData\ExampleExtension");
62 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
62
63 using (var fs = new DisposableFileSystem())
64 {
@@ -71,7 +70,7 @@ namespace WixToolsetTest.CoreIntegration
70 Path.Combine(folder, "Package.wxs"),
71 Path.Combine(folder, "PackageComponents.wxs"),
72 "-loc", Path.Combine(folder, "Package.en-us.wxl"),
74 - "-ext", extensionPath,
73 + "-ext", ExtensionPaths.ExampleExtensionPath,
74 "-bindpath", Path.Combine(folder, "data"),
75 "-intermediateFolder", intermediateFolder,
76 "-o", Path.Combine(intermediateFolder, @"bin\extest.msi")
@@ -101,7 +100,6 @@ namespace WixToolsetTest.CoreIntegration
100 public void CanParseCommandLineWithExtension()
101 {
102 var folder = TestData.Get(@"TestData\ExampleExtension");
104 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
103
104 using (var fs = new DisposableFileSystem())
105 {
@@ -113,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration
111 Path.Combine(folder, "Package.wxs"),
112 Path.Combine(folder, "PackageComponents.wxs"),
113 "-loc", Path.Combine(folder, "Package.en-us.wxl"),
116 - "-ext", extensionPath,
114 + "-ext", ExtensionPaths.ExampleExtensionPath,
115 "-bindpath", Path.Combine(folder, "data"),
116 "-intermediateFolder", intermediateFolder,
117 "-example", "test",
src/wix/test/WixToolsetTest.CoreIntegration/ExtensionPaths.cs new
+15
@@ -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 +}
src/wix/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+1 -2
@@ -730,7 +730,6 @@ namespace WixToolsetTest.CoreIntegration
730 public void FailsBuildAtBindTimeForMissingEnsureTable()
731 {
732 var folder = TestData.Get(@"TestData");
733 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
733
734 using (var fs = new DisposableFileSystem())
735 {
@@ -744,7 +743,7 @@ namespace WixToolsetTest.CoreIntegration
743 Path.Combine(folder, "BadEnsureTable", "BadEnsureTable.wxs"),
744 Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
745 Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
747 - "-ext", extensionPath,
746 + "-ext", ExtensionPaths.ExampleExtensionPath,
747 "-bindpath", Path.Combine(folder, "SingleFile", "data"),
748 "-intermediateFolder", intermediateFolder,
749 "-o", msiPath
src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+3 -6
@@ -338,7 +338,6 @@ namespace WixToolsetTest.CoreIntegration
338 public void CanBuildMsiWithEmptyCustomTableBecauseOfCustomTableRef()
339 {
340 var folder = TestData.Get(@"TestData");
341 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
341
342 using (var fs = new DisposableFileSystem())
343 {
@@ -352,7 +351,7 @@ namespace WixToolsetTest.CoreIntegration
351 Path.Combine(folder, "EnsureTable", "EnsureCustomTable.wxs"),
352 Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
353 Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
355 - "-ext", extensionPath,
354 + "-ext", ExtensionPaths.ExampleExtensionPath,
355 "-bindpath", Path.Combine(folder, "SingleFile", "data"),
356 "-intermediateFolder", intermediateFolder,
357 "-o", msiPath
@@ -370,7 +369,6 @@ namespace WixToolsetTest.CoreIntegration
369 public void CanBuildMsiWithEmptyStandardTableBecauseOfEnsureTable()
370 {
371 var folder = TestData.Get(@"TestData");
373 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
372
373 using (var fs = new DisposableFileSystem())
374 {
@@ -384,7 +382,7 @@ namespace WixToolsetTest.CoreIntegration
382 Path.Combine(folder, "EnsureTable", "EnsureModuleSignature.wxs"),
383 Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
384 Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
387 - "-ext", extensionPath,
385 + "-ext", ExtensionPaths.ExampleExtensionPath,
386 "-bindpath", Path.Combine(folder, "SingleFile", "data"),
387 "-intermediateFolder", intermediateFolder,
388 "-o", msiPath
@@ -402,7 +400,6 @@ namespace WixToolsetTest.CoreIntegration
400 public void CanBuildMsiWithEmptyTableFromExtensionBecauseOfEnsureTable()
401 {
402 var folder = TestData.Get(@"TestData");
405 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
403
404 using (var fs = new DisposableFileSystem())
405 {
@@ -416,7 +413,7 @@ namespace WixToolsetTest.CoreIntegration
413 Path.Combine(folder, "EnsureTable", "EnsureExtensionTable.wxs"),
414 Path.Combine(folder, "ProductWithComponentGroupRef", "MinimalComponentGroup.wxs"),
415 Path.Combine(folder, "ProductWithComponentGroupRef", "Product.wxs"),
419 - "-ext", extensionPath,
416 + "-ext", ExtensionPaths.ExampleExtensionPath,
417 "-bindpath", Path.Combine(folder, "SingleFile", "data"),
418 "-intermediateFolder", intermediateFolder,
419 "-o", msiPath
src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
+1 -2
@@ -454,7 +454,6 @@ namespace WixToolsetTest.CoreIntegration
454
455 private static string BuildMsi(string outputName, string sourceFolder, string baseFolder, string defineV, string defineA, string defineB, IEnumerable<string> bindpaths = null)
456 {
457 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
457 var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName));
458
459 var args = new List<string>
@@ -467,7 +466,7 @@ namespace WixToolsetTest.CoreIntegration
466 "-bindpath", Path.Combine(sourceFolder, ".data"),
467 "-intermediateFolder", Path.Combine(baseFolder, "obj"),
468 "-o", outputPath,
470 - "-ext", extensionPath,
469 + "-ext", ExtensionPaths.ExampleExtensionPath,
470 };
471
472 foreach (var additionaBindPath in bindpaths ?? Enumerable.Empty<string>())
src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>netcoreapp3.1</TargetFramework>
6 + <TargetFramework>net6.0</TargetFramework>
7 <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
8 <IsWixTestProject>true</IsWixTestProject>
9 </PropertyGroup>
src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
+3 -5
@@ -107,7 +107,6 @@ namespace WixToolsetTest.CoreIntegration
107 public void CanBuildMsiUsingExtensionLibrary()
108 {
109 var folder = TestData.Get(@"TestData\Wixipl");
110 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
110
111 using (var fs = new DisposableFileSystem())
112 {
@@ -117,7 +116,7 @@ namespace WixToolsetTest.CoreIntegration
116 var result = WixRunner.Execute(new[]
117 {
118 "build",
120 - "-ext", extensionPath,
119 + "-ext", ExtensionPaths.ExampleExtensionPath,
120 Path.Combine(folder, "Package.wxs"),
121 Path.Combine(folder, "PackageComponents.wxs"),
122 "-loc", Path.Combine(folder, "Package.en-us.wxl"),
@@ -151,7 +150,6 @@ namespace WixToolsetTest.CoreIntegration
150 public void CanBuildWixiplUsingExtensionLibrary()
151 {
152 var folder = TestData.Get(@"TestData\Wixipl");
154 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
153
154 using (var fs = new DisposableFileSystem())
155 {
@@ -161,7 +159,7 @@ namespace WixToolsetTest.CoreIntegration
159 var result = WixRunner.Execute(new[]
160 {
161 "build",
164 - "-ext", extensionPath,
162 + "-ext", ExtensionPaths.ExampleExtensionPath,
163 Path.Combine(folder, "Package.wxs"),
164 Path.Combine(folder, "PackageComponents.wxs"),
165 "-intermediateFolder", intermediateFolder,
@@ -174,7 +172,7 @@ namespace WixToolsetTest.CoreIntegration
172 {
173 "build",
174 Path.Combine(intermediateFolder, @"test.wixipl"),
177 - "-ext", extensionPath,
175 + "-ext", ExtensionPaths.ExampleExtensionPath,
176 "-loc", Path.Combine(folder, "Package.en-us.wxl"),
177 "-bindpath", Path.Combine(folder, "data"),
178 "-intermediateFolder", intermediateFolder,
src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+5 -7
@@ -248,7 +248,6 @@ namespace WixToolsetTest.CoreIntegration
248 public void CanBuildWithExtensionUsingWixlib()
249 {
250 var folder = TestData.Get(@"TestData\ExampleExtension");
251 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
251
252 using (var fs = new DisposableFileSystem())
253 {
@@ -259,7 +258,7 @@ namespace WixToolsetTest.CoreIntegration
258 {
259 "build",
260 Path.Combine(folder, "PackageComponents.wxs"),
262 - "-ext", extensionPath,
261 + "-ext", ExtensionPaths.ExampleExtensionPath,
262 "-intermediateFolder", intermediateFolder,
263 "-o", Path.Combine(intermediateFolder, @"test.wixlib")
264 });
@@ -272,7 +271,7 @@ namespace WixToolsetTest.CoreIntegration
271 Path.Combine(folder, "Package.wxs"),
272 "-loc", Path.Combine(folder, "Package.en-us.wxl"),
273 "-lib", Path.Combine(intermediateFolder, @"test.wixlib"),
275 - "-ext", extensionPath,
274 + "-ext", ExtensionPaths.ExampleExtensionPath,
275 "-bindpath", Path.Combine(folder, "data"),
276 "-intermediateFolder", intermediateFolder,
277 "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
@@ -297,7 +296,6 @@ namespace WixToolsetTest.CoreIntegration
296 public void CanBuildWithExtensionUsingMultipleWixlibs()
297 {
298 var folder = TestData.Get(@"TestData\ComplexExampleExtension");
300 - var extensionPath = Path.GetFullPath(new Uri(typeof(ExampleExtensionFactory).Assembly.CodeBase).LocalPath);
299
300 using (var fs = new DisposableFileSystem())
301 {
@@ -308,7 +306,7 @@ namespace WixToolsetTest.CoreIntegration
306 {
307 "build",
308 Path.Combine(folder, "PackageComponents.wxs"),
311 - "-ext", extensionPath,
309 + "-ext", ExtensionPaths.ExampleExtensionPath,
310 "-intermediateFolder", intermediateFolder,
311 "-o", Path.Combine(intermediateFolder, @"components.wixlib")
312 });
@@ -319,7 +317,7 @@ namespace WixToolsetTest.CoreIntegration
317 {
318 "build",
319 Path.Combine(folder, "OtherComponents.wxs"),
322 - "-ext", extensionPath,
320 + "-ext", ExtensionPaths.ExampleExtensionPath,
321 "-intermediateFolder", intermediateFolder,
322 "-o", Path.Combine(intermediateFolder, @"other.wixlib")
323 });
@@ -333,7 +331,7 @@ namespace WixToolsetTest.CoreIntegration
331 "-loc", Path.Combine(folder, "Package.en-us.wxl"),
332 "-lib", Path.Combine(intermediateFolder, @"components.wixlib"),
333 "-lib", Path.Combine(intermediateFolder, @"other.wixlib"),
336 - "-ext", extensionPath,
334 + "-ext", ExtensionPaths.ExampleExtensionPath,
335 "-bindpath", Path.Combine(folder, "data"),
336 "-intermediateFolder", intermediateFolder,
337 "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
src/wix/wix.cmd
+2 -2
@@ -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
41 robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
42
43 -robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO% /XF Microsoft.Build.*.dll
44 -robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
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\net6.0\wix %_P%\WixToolset.Sdk\tools\net6.0 %_RCO%
45
46 msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b
47
src/wix/wix/wix.csproj
+2 -2
@@ -3,13 +3,13 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
6 + <TargetFrameworks>net6.0;net472</TargetFrameworks>
7 <OutputType>Exe</OutputType>
8 <Description>WiX Toolset creates installation packages.</Description>
9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
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>
14 <ApplicationManifest>wix.exe.manifest</ApplicationManifest>
15 <RollForward>Major</RollForward>