@joebigelow / wix-1 / commits / 96ce0510

Upgrade test BAs to net6.0 and use x64 bundles for ManagedHost tests.

Fixes 6651

Sean Hall committed Apr 19, 2022 at 16:08 UTC 96ce05107d0e01014a3264e91ecb5731a9f28cc5
24 files changed +56 -52
src/ext/Bal/Bal.wixext.sln
+4 -4
@@ -175,16 +175,16 @@ Global
175 {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.Build.0 = Release|Any CPU
176 {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.ActiveCfg = Release|Any CPU
177 {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.Build.0 = Release|Any CPU
178 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.ActiveCfg = Debug|Win32
179 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.Build.0 = Debug|Win32
178 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.ActiveCfg = Debug|x64
179 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.Build.0 = Debug|x64
180 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.ActiveCfg = Debug|ARM64
181 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.Build.0 = Debug|ARM64
182 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.ActiveCfg = Debug|x64
183 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.Build.0 = Debug|x64
184 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.ActiveCfg = Debug|Win32
185 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.Build.0 = Debug|Win32
186 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.ActiveCfg = Release|Win32
187 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.Build.0 = Release|Win32
186 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.ActiveCfg = Release|x64
187 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.Build.0 = Release|x64
188 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.ActiveCfg = Release|ARM64
189 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.Build.0 = Release|ARM64
190 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.ActiveCfg = Release|x64
src/ext/Bal/bal.cmd
+2 -3
@@ -29,9 +29,8 @@ dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l
29 msbuild -p:Configuration=%_C% test\examples\examples.proj || exit /b
30
31 :: Test
32 -dotnet test -c %_C% --no-build test\WixToolsetTest.Bal || exit /b
33 -:: https://github.com/wixtoolset/issues/issues/6651
34 -::dotnet test -c %_C% --no-build test\WixToolsetTest.ManagedHost || exit /b
32 +dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" || exit /b
33 +dotnet test test\WixToolsetTest.ManagedHost -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.ManagedHost.trx" || exit /b
34
35 :: Pack
36 msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b
src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
+1 -1
@@ -11,7 +11,7 @@ namespace WixToolsetTest.ManagedHost
11
12 public class TestEngine
13 {
14 - private static readonly string TestEngineFile = TestData.Get(@"..\x86\examples\Example.TestEngine\Example.TestEngine.exe");
14 + private static readonly string TestEngineFile = TestData.Get(@"..\x64\examples\Example.TestEngine\Example.TestEngine.exe");
15
16 public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath)
17 {
src/ext/Bal/test/examples/Directory.wixproj.props
+1
@@ -7,5 +7,6 @@
7 <HarvestDirectoryAdditionalOptions>-generate payloadgroup</HarvestDirectoryAdditionalOptions>
8 <OutputPath>$(OutputPath)examples\</OutputPath>
9 <DefaultCompressionLevel>None</DefaultCompressionLevel>
10 + <InstallerPlatform>x64</InstallerPlatform>
11 </PropertyGroup>
12 </Project>
src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
+4 -4
@@ -1,10 +1,10 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2 <Bundle Name="FullFramework2MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
3 <BootstrapperApplication>
4 - <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\Example.FullFramework2MBA.dll" />
5 - <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\mbanative.dll" />
6 - <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\WixToolset.Mba.Core.dll" />
7 - <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\WixToolset.Mba.Host.config" />
4 + <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\Example.FullFramework2MBA.dll" />
5 + <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\mbanative.dll" />
6 + <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\WixToolset.Mba.Core.dll" />
7 + <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\WixToolset.Mba.Host.config" />
8 <bal:WixManagedBootstrapperApplicationHost />
9 </BootstrapperApplication>
10 <Chain>
src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+1 -1
@@ -7,7 +7,7 @@
7 <AssemblyName>Example.FullFramework2MBA</AssemblyName>
8 <RootNamespace>Example.FullFramework2MBA</RootNamespace>
9 <DebugType>embedded</DebugType>
10 - <RuntimeIdentifier>win-x86</RuntimeIdentifier>
10 + <RuntimeIdentifier>win-x64</RuntimeIdentifier>
11 </PropertyGroup>
12
13 <ItemGroup>
src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
+4 -4
@@ -1,10 +1,10 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2 <Bundle Name="FullFramework4MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="E08068E0-4FBA-439D-A1C8-4CD1FE27093F">
3 <BootstrapperApplication>
4 - <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\Example.FullFramework4MBA.dll" />
5 - <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\mbanative.dll" />
6 - <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\WixToolset.Mba.Core.dll" />
7 - <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\WixToolset.Mba.Host.config" />
4 + <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\Example.FullFramework4MBA.dll" />
5 + <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\mbanative.dll" />
6 + <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\WixToolset.Mba.Core.dll" />
7 + <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\WixToolset.Mba.Host.config" />
8 <bal:WixManagedBootstrapperApplicationHost />
9 </BootstrapperApplication>
10 <Chain>
src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+1 -1
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <TargetFramework>net48</TargetFramework>
7 <Description>Full Framework v4 MBA</Description>
8 - <RuntimeIdentifier>win-x86</RuntimeIdentifier>
8 + <RuntimeIdentifier>win-x64</RuntimeIdentifier>
9 </PropertyGroup>
10
11 <ItemGroup>
src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+1 -1
@@ -1,7 +1,7 @@
1 <Project Sdk="Microsoft.NET.Sdk">
2
3 <PropertyGroup>
4 - <TargetFramework>net5.0</TargetFramework>
4 + <TargetFramework>net6.0</TargetFramework>
5 <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
6 <IsDncBA>true</IsDncBA>
7 <Description>Latest .NET Core MBA</Description>
src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+1 -1
@@ -1,7 +1,7 @@
1 <Project Sdk="Microsoft.NET.Sdk">
2
3 <PropertyGroup>
4 - <TargetFramework>net5.0-windows</TargetFramework>
4 + <TargetFramework>net6.0-windows</TargetFramework>
5 <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
6 <IsDncBA>true</IsDncBA>
7 <Description>WPF .NET Core MBA</Description>
src/ext/Bal/test/examples/examples.proj
+3 -3
@@ -35,11 +35,11 @@
35 </ItemGroup>
36
37 <Target Name="PublishCoreExamples">
38 - <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
38 + <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
39 Condition="'%(CoreMBAProject.SkipFDD)'==''" />
40 - <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x86 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"'
40 + <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x64 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"'
41 Condition="'%(CoreMBAProject.SkipSCD)'==''" />
42 - <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x86 -c $(Configuration) --self-contained true -p:PublishTrimmed=true -p:TrimMode=%(CoreMBAProject.TrimMode) "%(CoreMBAProject.Identity)"'
42 + <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x64 -c $(Configuration) --self-contained true -p:PublishTrimmed=true -p:TrimMode=%(CoreMBAProject.TrimMode) "%(CoreMBAProject.Identity)"'
43 Condition="'%(CoreMBAProject.TrimMode)'!=''" />
44 </Target>
45
src/test/burn/TestBA/TestBA.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>net35;net5.0-windows</TargetFrameworks>
6 + <TargetFrameworks>net35;net6.0-windows</TargetFrameworks>
7 <AssemblyName>TestBA</AssemblyName>
8 <RootNamespace>WixToolset.Test.BA</RootNamespace>
9 <DebugType>embedded</DebugType>
src/test/burn/TestBA/TestBA_x64.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>net35;net5.0-windows</TargetFrameworks>
6 + <TargetFrameworks>net35;net6.0-windows</TargetFrameworks>
7 <AssemblyName>TestBA</AssemblyName>
8 <RootNamespace>WixToolset.Test.BA</RootNamespace>
9 <DebugType>embedded</DebugType>
src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
+1 -1
@@ -9,7 +9,7 @@
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 - <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
12 + <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
13 </ItemGroup>
14 <ItemGroup>
15 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
+4 -4
@@ -4,11 +4,11 @@
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5 <Fragment>
6 <BootstrapperApplication Id="BrokenDnc">
7 - <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
8 - <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
7 + <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
8 + <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
9 <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
10 - <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" />
11 - <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
10 + <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
11 + <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
12 <bal:WixDotNetCoreBootstrapperApplicationHost />
13 </BootstrapperApplication>
14 </Fragment>
src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
+6 -6
@@ -2,16 +2,16 @@
2 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3 <Fragment>
4 <BootstrapperApplication>
5 - <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
6 - <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
7 - <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.runtimeconfig.json" />
8 - <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" />
9 - <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
5 + <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
6 + <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
7 + <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
8 + <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
9 + <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
10 <bal:WixDotNetCoreBootstrapperApplicationHost />
11 </BootstrapperApplication>
12
13 <PackageGroup Id="TestBAdnc">
14 - <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet -->
14 + <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 6 packages yet -->
15 </PackageGroup>
16 </Fragment>
17 <Fragment>
src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+1 -1
@@ -8,7 +8,7 @@
8 <ItemGroup>
9 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
10 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x86" BindName="net4x86" />
11 - <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
11 + <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
12 </ItemGroup>
13 <ItemGroup>
14 <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
+6 -6
@@ -2,16 +2,16 @@
2 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3 <Fragment>
4 <BootstrapperApplication>
5 - <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.deps.json" />
6 - <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.dll" bal:BAFactoryAssembly="yes" />
7 - <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.runtimeconfig.json" />
8 - <Payload SourceFile="!(bindpath.dnc5x64)\mbanative.dll" />
9 - <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.Mba.Core.dll" />
5 + <Payload SourceFile="!(bindpath.dncx64)\TestBA.deps.json" />
6 + <Payload SourceFile="!(bindpath.dncx64)\TestBA.dll" bal:BAFactoryAssembly="yes" />
7 + <Payload SourceFile="!(bindpath.dncx64)\TestBA.runtimeconfig.json" />
8 + <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
9 + <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
10 <bal:WixDotNetCoreBootstrapperApplicationHost />
11 </BootstrapperApplication>
12
13 <PackageGroup Id="TestBAdnc_x64">
14 - <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet -->
14 + <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 6 packages yet -->
15 </PackageGroup>
16 </Fragment>
17 <Fragment>
src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
+6 -6
@@ -2,17 +2,17 @@
2 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3 <Fragment>
4 <BootstrapperApplication>
5 - <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.deps.json" />
6 - <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.dll" bal:BAFactoryAssembly="yes" />
7 - <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.runtimeconfig.json" />
8 - <Payload SourceFile="!(bindpath.dnc5x64)\mbanative.dll" />
9 - <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.Mba.Core.dll" />
5 + <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.deps.json" />
6 + <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.dll" bal:BAFactoryAssembly="yes" />
7 + <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.runtimeconfig.json" />
8 + <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
9 + <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
10 <Payload SourceFile='..\..\..\..\..\..\License.txt' />
11 <bal:WixDotNetCoreBootstrapperApplicationHost />
12 </BootstrapperApplication>
13
14 <PackageGroup Id="WixBAdnc_x64">
15 - <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet -->
15 + <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 6 packages yet -->
16 </PackageGroup>
17 </Fragment>
18 </Wix>
src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
+1 -1
@@ -9,7 +9,7 @@
9 <ItemGroup>
10 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x64" BindName="net2x64" />
11 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x64" BindName="net4x64" />
12 - <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x64" BindName="dnc5x64" />
12 + <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x64" BindName="dncx64" />
13 </ItemGroup>
14 <ItemGroup>
15 <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />
src/test/burn/WixToolset.WixBA/Model.cs
+2
@@ -113,7 +113,9 @@ namespace WixToolset.WixBA
113 /// <returns>Correctly configured HTTP web request.</returns>
114 public HttpWebRequest CreateWebRequest(string uri)
115 {
116 +#pragma warning disable SYSLIB0014 // Type or member is obsolete
117 HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
118 +#pragma warning restore SYSLIB0014 // Type or member is obsolete
119 request.UserAgent = String.Concat("WixInstall", this.Version.ToString());
120
121 return request;
src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
+1 -1
@@ -2,7 +2,7 @@
2 <!-- 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. -->
3 <Project Sdk="Microsoft.NET.Sdk">
4 <PropertyGroup>
5 - <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
5 + <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
6 <AssemblyName>WixToolset.WixBA</AssemblyName>
7 <RootNamespace>WixToolset.WixBA</RootNamespace>
8 <DebugType>embedded</DebugType>
src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
+1 -1
@@ -2,7 +2,7 @@
2 <!-- 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. -->
3 <Project Sdk="Microsoft.NET.Sdk">
4 <PropertyGroup>
5 - <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
5 + <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
6 <AssemblyName>WixToolset.WixBA</AssemblyName>
7 <RootNamespace>WixToolset.WixBA</RootNamespace>
8 <DebugType>embedded</DebugType>
src/testresultfilelist.txt
+2
@@ -4,6 +4,7 @@ build/logs/TestResults/BextUtilUnitTest.xunit2.xml
4 build/logs/TestResults/BurnUnitTest32.xunit2.xml
5 build/logs/TestResults/BurnUnitTest64.xunit2.xml
6 build/logs/TestResults/DutilUnitTest.xunit2.xml
7 +build/logs/TestResults/WixToolsetTest.Bal.trx
8 build/logs/TestResults/WixToolsetTest.BuildTasks.trx
9 build/logs/TestResults/WixToolsetTest.BurnE2E.trx
10 build/logs/TestResults/WixToolsetTest.Converters.trx
@@ -14,6 +15,7 @@ build/logs/TestResults/WixToolsetTest.Core.Native.trx
15 build/logs/TestResults/WixToolsetTest.CoreIntegration.trx
16 build/logs/TestResults/WixToolsetTest.Dnc.HostGenerator.trx
17 build/logs/TestResults/WixToolsetTest.Heat.trx
18 +build/logs/TestResults/WixToolsetTest.ManagedHost.trx
19 build/logs/TestResults/WixToolsetTest.Mba.Core.trx
20 build/logs/TestResults/WixToolsetTest.Sdk.trx
21 build/logs/TestResults/WixToolsetTest.WixE2ETests.trx
\ No newline at end of file