Better .nupkg names

src/api/api.cmd

+3 -7

@@ -28,7 +28,7 @@ msbuild api_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\api_b

28 :: Test

29 dotnet test ^

30 %_B%\net6.0\WixToolsetTest.Data.dll ^

31 - %_B%\net6.0\win-x86\WixToolsetTest.Mba.Core.dll ^

31 + %_B%\net6.0\win-x86\WixToolsetTest.BootstrapperApplicationApi.dll ^

32 %_B%\x86\BalUtilUnitTest.dll ^

33 %_B%\x86\BextUtilUnitTest.dll ^

34 --nologo -l "trx;LogFileName=%_L%\TestResults\api.trx" || exit /b

@@ -37,19 +37,15 @@ dotnet test ^

37

38 :clean

39 @rd /s/q "..\..\build\api" 2> nul

40 -@del "..\..\build\artifacts\WixToolset.BalUtil.*.nupkg" 2> nul

40 @del "..\..\build\artifacts\WixToolset.BextUtil.*.nupkg" 2> nul

42 -@del "..\..\build\artifacts\WixToolset.BootstrapperCore.Native.*.nupkg" 2> nul

41 @del "..\..\build\artifacts\WixToolset.Data.*.nupkg" 2> nul

42 @del "..\..\build\artifacts\WixToolset.Extensibility.*.nupkg" 2> nul

45 -@del "..\..\build\artifacts\WixToolset.Mba.Core.*.nupkg" 2> nul

43 +@del "..\..\build\artifacts\WixToolset.BootstrapperApplicationApi.*.nupkg" 2> nul

44 @del "%_L%\TestResults\api.trx" 2> nul

47 -@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.balutil" 2> nul

45 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bextutil" 2> nul

49 -@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrappercore.native" 2> nul

46 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.data" 2> nul

47 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.extensibility" 2> nul

52 -@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.mba.core" 2> nul

48 +@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrapperapplicationapi" 2> nul

49 @exit /b

50

51 :end

src/api/api.sln

+2 -2

@@ -23,9 +23,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "burn\tes

23 EndProject

24 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "burn\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}"

25 EndProject

26 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{17DA3E92-40C5-4328-9BA5-1FE459A13719}"

26 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BootstrapperApplicationApi", "burn\test\WixToolsetTest.BootstrapperApplicationApi\WixToolsetTest.BootstrapperApplicationApi.csproj", "{17DA3E92-40C5-4328-9BA5-1FE459A13719}"

27 EndProject

28 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{47029283-43EC-4F22-9417-A02B28594912}"

28 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BootstrapperApplicationApi", "burn\WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj", "{47029283-43EC-4F22-9417-A02B28594912}"

29 EndProject

30 Global

31 GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

src/api/burn/WixToolset.BootstrapperApplicationApi/BaseBootstrapperApplicationFactory.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplicationData.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.IO;

src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplicationFactoryAttribute.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6

src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperCommand.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.CodeDom.Compiler;

src/api/burn/WixToolset.BootstrapperApplicationApi/BundleInfo.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Collections.Generic;

src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.ComponentModel;

src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Collections.Generic;

src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplicationData.cs renamed

+2 -2

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System.IO;

6

@@ -19,4 +19,4 @@ namespace WixToolset.Mba.Core

19 /// </summary>

20 IBundleInfo Bundle { get; }

21 }

22 -}

\ No newline at end of file

22 +}

src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplicationFactory.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.CodeDom.Compiler;

src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperCommand.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6

src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.CodeDom.Compiler;

src/api/burn/WixToolset.BootstrapperApplicationApi/IBundleInfo.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System.Collections.Generic;

6

src/api/burn/WixToolset.BootstrapperApplicationApi/IDefaultBootstrapperApplication.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6

src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.ComponentModel;

src/api/burn/WixToolset.BootstrapperApplicationApi/IMbaCommand.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System.Collections.Generic;

6

src/api/burn/WixToolset.BootstrapperApplicationApi/IOverridableVariableInfo.cs renamed

+2 -2

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 /// <summary>

6 /// Overridable variable from the BA manifest.

@@ -12,4 +12,4 @@ namespace WixToolset.Mba.Core

12 /// </summary>

13 string Name { get; }

14 }

15 -}

\ No newline at end of file

15 +}

src/api/burn/WixToolset.BootstrapperApplicationApi/IOverridableVariables.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System.Collections.Generic;

6

src/api/burn/WixToolset.BootstrapperApplicationApi/IPackageInfo.cs renamed

+2 -2

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 /// <summary>

6 /// Package information from the BA manifest.

@@ -68,7 +68,7 @@ namespace WixToolset.Mba.Core

68 string PrereqLicenseUrl { get; }

69

70 /// <summary>

71 - /// See <see cref="WixToolset.Mba.Core.PrimaryPackageType"/>

71 + /// See <see cref="WixToolset.BootstrapperApplicationApi.PrimaryPackageType"/>

72 /// </summary>

73 PrimaryPackageType PrimaryPackageType { get; }

74

src/api/burn/WixToolset.BootstrapperApplicationApi/ManagedBootstrapperApplication.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 /// <summary>

6 /// Managed bootstrapper application entry point.

src/api/burn/WixToolset.BootstrapperApplicationApi/MbaCommand.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Collections.Generic;

src/api/burn/WixToolset.BootstrapperApplicationApi/MbaNative.cs renamed

+2 -2

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

@@ -8,7 +8,7 @@ namespace WixToolset.Mba.Core

8 internal static class MbaNative

9 {

10 [DllImport("mbanative.dll", ExactSpelling = true, PreserveSig = false)]

11 - internal static extern void BootstrapperApplicationDebuggerCheck();

11 + internal static extern void BalDebuggerCheck();

12

13 [DllImport("mbanative.dll", ExactSpelling = true, PreserveSig = false)]

14 internal static extern void BootstrapperApplicationRun(

src/api/burn/WixToolset.BootstrapperApplicationApi/NativeMethods.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

src/api/burn/WixToolset.BootstrapperApplicationApi/OverridableVariableInfo.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 /// <summary>

6 /// Default implementation of <see cref="IOverridableVariableInfo"/>.

src/api/burn/WixToolset.BootstrapperApplicationApi/OverridableVariables.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Collections.Generic;

src/api/burn/WixToolset.BootstrapperApplicationApi/PackageInfo.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Collections.Generic;

src/api/burn/WixToolset.BootstrapperApplicationApi/StrUtil.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

src/api/burn/WixToolset.BootstrapperApplicationApi/VerUtil.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

src/api/burn/WixToolset.BootstrapperApplicationApi/VerUtilVersion.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

src/api/burn/WixToolset.BootstrapperApplicationApi/VerUtilVersionReleaseLabel.cs renamed

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Mba.Core

3 +namespace WixToolset.BootstrapperApplicationApi

4 {

5 using System;

6 using System.Runtime.InteropServices;

src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.csproj renamed

+3 -3

@@ -4,10 +4,10 @@

4 <Project Sdk="Microsoft.NET.Sdk">

5 <PropertyGroup>

6 <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>

7 - <AssemblyName>WixToolset.Mba.Core</AssemblyName>

8 - <RootNamespace>WixToolset.Mba.Core</RootNamespace>

7 + <AssemblyName>WixToolset.BootstrapperApplicationApi</AssemblyName>

8 + <RootNamespace>WixToolset.BootstrapperApplicationApi</RootNamespace>

9 <DebugType>embedded</DebugType>

10 - <Description>Managed Bootstrapper Application Core</Description>

10 + <Description>Managed Bootstrapper Application API</Description>

11 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>

12 <CreateDocumentationFile>true</CreateDocumentationFile>

13 </PropertyGroup>

src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec renamed

+14

@@ -15,11 +15,18 @@

15 <dependencies>

16 <group targetFramework=".NETFramework4.6.2" />

17 <group targetFramework=".NETStandard2.0" />

18 + <group targetFramework="Native">

19 + <dependency id="WixToolset.DUtil" version="[$version$,5)" />

20 + </group>

21 </dependencies>

22 </metadata>

23

24 <files>

25 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />

26 +

27 + <file src="$projectFolder$\build\WixToolset.BootstrapperApplicationApi.props" target="build\" />

28 +

29 + <file src="$projectFolder$\build\_._" target="lib\native" />

30 <file src="net462\$id$.dll" target="lib\net462" />

31 <file src="net462\$id$.xml" target="lib\net462" />

32 <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />

@@ -28,5 +35,12 @@

35 <file src="v143\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />

36 <file src="v143\x64\mbanative.dll" target="runtimes\win-x64\native" />

37 <file src="v143\x86\mbanative.dll" target="runtimes\win-x86\native" />

38 +

39 + <file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />

40 + <file src="$projectFolder$\..\inc\BootstrapperApplication.h" target="build\native\include" />

41 + <file src="$projectFolder$\..\inc\BootstrapperEngine.h" target="build\native\include" />

42 + <file src="v141\x86\balutil.lib" target="build\native\v14\x86" />

43 + <file src="v141\x64\balutil.lib" target="build\native\v14\x64" />

44 + <file src="v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />

45 </files>

46 </package>

src/api/burn/WixToolset.BootstrapperApplicationApi/build/WixToolset.BootstrapperApplicationApi.props renamed

src/api/burn/WixToolset.BootstrapperApplicationApi/build/_._

src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj deleted

-18

@@ -1,18 +0,0 @@

1 -<?xml version="1.0" encoding="utf-8"?>

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 -

4 -<Project Sdk="Microsoft.Build.NoTargets">

5 - <PropertyGroup>

6 - <TargetFramework>net6.0</TargetFramework>

7 - <PackageId>WixToolset.BootstrapperCore.Native</PackageId>

8 - <Description>WiX Bootstrapper native interfaces</Description>

9 - </PropertyGroup>

10 -

11 - <ItemGroup>

12 - <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />

13 - </ItemGroup>

14 -

15 - <Target Name="Pack"

16 - DependsOnTargets="GitVersion;PackNative"

17 - BeforeTargets="AfterBuild" />

18 -</Project>

src/api/burn/WixToolset.BootstrapperCore.Native/build/WixToolset.BootstrapperCore.Native.props deleted

-13

@@ -1,13 +0,0 @@

1 -<?xml version="1.0" encoding="utf-8"?>

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 -

4 -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <ItemDefinitionGroup>

6 - <ClCompile>

7 - <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

8 - </ClCompile>

9 - <ResourceCompile>

10 - <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

11 - </ResourceCompile>

12 - </ItemDefinitionGroup>

13 -</Project>

src/api/burn/api_burn.sln

+2 -2

@@ -7,11 +7,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "balutil\balutil.

7 EndProject

8 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}"

9 EndProject

10 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"

10 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BootstrapperApplicationApi", "WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"

11 EndProject

12 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}"

13 EndProject

14 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}"

14 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BootstrapperApplicationApi", "test\WixToolsetTest.BootstrapperApplicationApi\WixToolsetTest.BootstrapperApplicationApi.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}"

15 EndProject

16 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}"

17 EndProject

src/api/burn/api_burn_t.proj

+4 -6

@@ -10,10 +10,10 @@

10 <!-- C++/CLI projects will try to build their dependent projects in parallel with others, so they must be built first. -->

11 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />

12 <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />

13 -

13 +

14 <!-- Make sure that if these rebuild balutil due to the inability for incremental build, then all shipped code uses the same binaries. -->

15 - <ProjectReference Include="test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />

16 - <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />

15 + <ProjectReference Include="test\WixToolsetTest.BootstrapperApplicationApi\WixToolsetTest.BootstrapperApplicationApi.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />

16 + <ProjectReference Include="WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />

17

18 <!-- Build -->

19

@@ -28,9 +28,7 @@

28 <!-- balutil is built by multiple projects above. -->

29

30 <!-- Pack -->

31 - <ProjectReference Include="balutil\balutil.vcxproj" Targets="PackNative" />

31 <ProjectReference Include="bextutil\bextutil.vcxproj" Targets="PackNative" />

33 - <ProjectReference Include="WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj" Targets="Restore;PackNative" />

34 - <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="NoBuild=true" Targets="Pack" />

32 + <ProjectReference Include="WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj" Properties="NoBuild=true" Targets="Pack" />

33 </ItemGroup>

34 </Project>

src/api/burn/balutil/balutil.nuspec deleted

-29

@@ -1,29 +0,0 @@

1 -<?xml version="1.0" encoding="utf-8"?>

2 -<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">

3 - <metadata minClientVersion="4.0">

4 - <id>$id$</id>

5 - <version>$version$</version>

6 - <title>$title$</title>

7 - <description>$description$</description>

8 - <authors>$authors$</authors>

9 - <icon>wix.png</icon>

10 - <license type="expression">MS-RL</license>

11 - <requireLicenseAcceptance>false</requireLicenseAcceptance>

12 - <copyright>$copyright$</copyright>

13 - <projectUrl>$projectUrl$</projectUrl>

14 - <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />

15 - <dependencies>

16 - <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" />

17 - <dependency id="WixToolset.DUtil" version="[$version$,5)" />

18 - </dependencies>

19 - </metadata>

20 -

21 - <files>

22 - <file src="$projectFolder$\build\$id$.props" target="build\" />

23 - <file src="$projectFolder$\..\..\..\internal\images\wix.png" />

24 - <file src="$projectFolder$\inc\*" target="build\native\include" />

25 - <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" />

26 - <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" />

27 - <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />

28 - </files>

29 -</package>

src/api/burn/balutil/balutil.vcxproj

+1 -2

@@ -35,7 +35,6 @@

35 <TargetName>balutil</TargetName>

36 <CharacterSet>MultiByte</CharacterSet>

37 <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description>

38 - <PackageId>WixToolset.BalUtil</PackageId>

38 </PropertyGroup>

39

40 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

@@ -49,7 +48,7 @@

48 </ImportGroup>

49

50 <PropertyGroup>

52 - <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>

51 + <ProjectAdditionalIncludeDirectories>inc;..\inc</ProjectAdditionalIncludeDirectories>

52 </PropertyGroup>

53

54 <ItemGroup>

src/api/burn/bextutil/bextutil.nuspec

+2 -1

@@ -13,7 +13,6 @@

13 <projectUrl>$projectUrl$</projectUrl>

14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />

15 <dependencies>

16 - <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" />

16 <dependency id="WixToolset.DUtil" version="[$version$,5)" />

17 </dependencies>

18 </metadata>

@@ -22,6 +21,8 @@

21 <file src="$projectFolder$\build\$id$.props" target="build\" />

22 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />

23 <file src="$projectFolder$\inc\*" target="build\native\include" />

24 + <file src="$projectFolder$\..\inc\BundleExtension.h" target="build\native\include" />

25 + <file src="$projectFolder$\..\inc\BundleExtensionEngine.h" target="build\native\include" />

26 <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />

27 <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />

28 <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />

src/api/burn/bextutil/bextutil.vcxproj

+1 -1

@@ -49,7 +49,7 @@

49 </ImportGroup>

50

51 <PropertyGroup>

52 - <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>

52 + <ProjectAdditionalIncludeDirectories>inc;..\inc</ProjectAdditionalIncludeDirectories>

53 </PropertyGroup>

54

55 <ItemGroup>

src/api/burn/bextutil/inc/BextBaseBundleExtension.h

-5

@@ -2,11 +2,6 @@

2

3 #include <windows.h>

4

5 -#include "BundleExtensionEngine.h"

6 -#include "BundleExtension.h"

7 -#include "IBundleExtensionEngine.h"

8 -#include "IBundleExtension.h"

9 -

5 #include "bextutil.h"

6

7 class CBextBaseBundleExtension : public IBundleExtension

src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h

+3 -5

@@ -4,10 +4,8 @@

4

5 #include <windows.h>

6

7 -#include "BundleExtensionEngine.h"

8 -#include "BundleExtension.h"

9 -#include "IBundleExtensionEngine.h"

10 -#include "IBundleExtension.h"

7 +#include <IBundleExtensionEngine.h>

8 +#include <IBundleExtension.h>

9

10 static HRESULT BextBaseBEProcSearch(

11 __in IBundleExtension* pBE,

@@ -33,7 +31,7 @@ static HRESULT WINAPI BextBaseBundleExtensionProc(

31 {

32 IBundleExtension* pBE = reinterpret_cast<IBundleExtension*>(pvContext);

33 HRESULT hr = pBE->BundleExtensionProc(message, pvArgs, pvResults, pvContext);

36 -

34 +

35 if (E_NOTIMPL == hr)

36 {

37 switch (message)

src/api/burn/bextutil/inc/BextBundleExtensionEngine.h

+3

@@ -1,5 +1,8 @@

1 +#pragma once

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

4 +#include <IBundleExtensionEngine.h>

5 +

6 #ifdef __cplusplus

7 extern "C" {

8 #endif

src/api/burn/bextutil/inc/IBundleExtension.h

+1

@@ -1,6 +1,7 @@

1 #pragma once

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

4 +#include <BundleExtension.h>

5

6 DECLARE_INTERFACE_IID_(IBundleExtension, IUnknown, "93123C9D-796B-4FCD-A507-6EDEF9A925FD")

7 {

src/api/burn/bextutil/inc/IBundleExtensionEngine.h

+1

@@ -1,6 +1,7 @@

1 #pragma once

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

4 +#include <BundleExtensionEngine.h>

5

6 DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-9737-C185089EB263")

7 {

src/api/burn/bextutil/inc/bextutil.h

+2

@@ -4,6 +4,8 @@

4

5 #include "dutil.h"

6

7 +#include "IBundleExtensionEngine.h"

8 +#include "IBundleExtension.h"

9

10 #ifdef __cplusplus

11 extern "C" {

src/api/burn/bextutil/precomp.h

-6

@@ -12,11 +12,5 @@

12 #include <strutil.h>

13 #include <xmlutil.h>

14

15 -#include <BundleExtensionEngine.h>

16 -#include <BundleExtension.h>

17 -

18 -#include "IBundleExtensionEngine.h"

19 -#include "IBundleExtension.h"

20 -

15 #include "bextutil.h"

16 #include "BextBundleExtensionEngine.h"

src/api/burn/inc/BootstrapperApplication.h renamed

src/api/burn/inc/BootstrapperEngine.h renamed

src/api/burn/inc/BundleExtension.h renamed

+1

@@ -1,6 +1,7 @@

1 #pragma once

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

4 +#include <BundleExtensionEngine.h>

5

6 #if defined(__cplusplus)

7 extern "C" {

src/api/burn/inc/BundleExtensionEngine.h renamed

src/api/burn/mbanative/mbanative.vcxproj

+1 -1

@@ -42,7 +42,7 @@

42 <Import Project="..\..\..\NativeMultiTargeting.Build.props" />

43

44 <PropertyGroup>

45 - <ProjectAdditionalIncludeDirectories>..\balutil\inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>

45 + <ProjectAdditionalIncludeDirectories>..\balutil\inc;..\inc</ProjectAdditionalIncludeDirectories>

46 </PropertyGroup>

47

48 <ItemGroup>

src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj

+1 -1

@@ -32,7 +32,7 @@

32 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

33

34 <PropertyGroup>

35 - <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>

35 + <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>

36 <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>

37 </PropertyGroup>

38

src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj

+1 -1

@@ -31,7 +31,7 @@

31 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

32

33 <PropertyGroup>

34 - <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>

34 + <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>

35 <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>

36 </PropertyGroup>

37

src/api/burn/test/BextUtilUnitTest/precomp.h

-6

@@ -7,12 +7,6 @@

7

8 #include <dutil.h>

9 #include <strutil.h>

10 -

11 -#include <BundleExtensionEngine.h>

12 -#include <BundleExtension.h>

13 -

14 -#include <IBundleExtensionEngine.h>

15 -#include <IBundleExtension.h>

10 #include <bextutil.h>

11

12 #include "TestBundleExtension.h"

src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/VerUtilFixture.cs renamed

+2 -2

@@ -1,9 +1,9 @@

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.Mba.Core

3 +namespace WixToolsetTest.BootstrapperApplicationApi

4 {

5 using System;

6 - using WixToolset.Mba.Core;

6 + using WixToolset.BootstrapperApplicationApi;

7 using Xunit;

8

9 public class VerUtilFixture

src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj renamed

+1 -1

@@ -10,7 +10,7 @@

10 </PropertyGroup>

11

12 <ItemGroup>

13 - <ProjectReference Include="..\..\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" />

13 + <ProjectReference Include="..\..\WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj" />

14 </ItemGroup>

15

16 <ItemGroup>

src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.v3.ncrunchproject renamed

src/burn/engine/engine.vcxproj

+5 -5

@@ -42,7 +42,7 @@

42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

43

44 <PropertyGroup>

45 - <ProjectAdditionalIncludeDirectories>..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;$(BurnGeneratedHeaderDirectory);$(ProjectAdditionalIncludeDirectories)</ProjectAdditionalIncludeDirectories>

45 + <ProjectAdditionalIncludeDirectories>..\..\api\burn\inc;$(BurnGeneratedHeaderDirectory);$(ProjectAdditionalIncludeDirectories)</ProjectAdditionalIncludeDirectories>

46 </PropertyGroup>

47

48 <ImportGroup Label="ExtensionSettings">

@@ -102,10 +102,10 @@

102 <ItemGroup>

103 <ClInclude Include="apply.h" />

104 <ClInclude Include="approvedexe.h" />

105 - <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BootstrapperApplication.h" />

106 - <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BootstrapperEngine.h" />

107 - <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BundleExtension.h" />

108 - <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BundleExtensionEngine.h" />

105 + <ClInclude Include="..\..\api\burn\inc\BootstrapperApplication.h" />

106 + <ClInclude Include="..\..\api\burn\inc\BootstrapperEngine.h" />

107 + <ClInclude Include="..\..\api\burn\inc\BundleExtension.h" />

108 + <ClInclude Include="..\..\api\burn\inc\BundleExtensionEngine.h" />

109 <ClInclude Include="ba.h" />

110 <ClInclude Include="bacallback.h" />

111 <ClInclude Include="bundlepackageengine.h" />

src/burn/engine/precomp.h

-2

@@ -62,8 +62,6 @@

62 #include <butil.h>

63

64 #include "BootstrapperApplication.h"

65 -

66 -#include "BundleExtensionEngine.h"

65 #include "BundleExtension.h"

66

67 #include "platform.h"

src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj

+1 -1

@@ -39,7 +39,7 @@

39 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

40

41 <PropertyGroup>

42 - <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);$(BurnGeneratedHeaderDirectory);..\..\engine;..\..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>

42 + <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);$(BurnGeneratedHeaderDirectory);..\..\engine;..\..\..\api\burn\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>

43 <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;userenv.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib;engine.res</ProjectAdditionalLinkLibraries>

44 </PropertyGroup>

45

src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml

+1 -1

@@ -9,7 +9,7 @@

9 <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" SourcePath="u0" />

10 <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" SourcePath="u1" />

11 <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" SourcePath="u2" />

12 - <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" SourcePath="u3" />

12 + <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" SourcePath="u3" />

13 <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" SourcePath="u4" />

14 <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" SourcePath="u5" />

15 <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" SourcePath="u6" />

src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml

+1 -1

@@ -9,7 +9,7 @@

9 <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" SourcePath="u0" />

10 <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" SourcePath="u1" />

11 <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" SourcePath="u2" />

12 - <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" SourcePath="u3" />

12 + <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" SourcePath="u3" />

13 <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" SourcePath="u4" />

14 <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" SourcePath="u5" />

15 <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" SourcePath="u6" />

src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml

+1 -1

@@ -10,7 +10,7 @@

10 <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" SourcePath="u0" />

11 <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" SourcePath="u1" />

12 <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" SourcePath="u2" />

13 - <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" SourcePath="u3" />

13 + <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" SourcePath="u3" />

14 <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" SourcePath="u4" />

15 <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" SourcePath="u5" />

16 <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" SourcePath="u6" />

src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml

+1 -1

@@ -9,7 +9,7 @@

9 <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" FileSize="783" Hash="B5BDD5E7179A94C2C817069913CA8C099DF811B9" Packaging="embedded" SourcePath="u0" />

10 <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" FileSize="25088" Hash="DB12DB6565CDBC4E9705204830E421ACEB710129" Packaging="embedded" SourcePath="u1" />

11 <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" FileSize="118272" Hash="3A7A20D97B0546A23A025EE5774BE237C14D2957" Packaging="embedded" SourcePath="u2" />

12 - <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" FileSize="114688" Hash="56BA3EA94BEBF8EB562C914495E1594E74F05DBE" Packaging="embedded" SourcePath="u3" />

12 + <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" FileSize="114688" Hash="56BA3EA94BEBF8EB562C914495E1594E74F05DBE" Packaging="embedded" SourcePath="u3" />

13 <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" FileSize="3599" Hash="8D9797C1E1A50AECB8B85FFCEA6A2A2EF611BD7F" Packaging="embedded" SourcePath="u4" />

14 <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" FileSize="797" Hash="75AE41181581FD6376CA9CA88147011E48BF9A30" Packaging="embedded" SourcePath="u5" />

15 <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" FileSize="2237" Hash="068B3C5E27AECE7987EABAA2802C9EB07B39EAF8" Packaging="embedded" SourcePath="u6" />

src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml

+1 -1

@@ -9,7 +9,7 @@

9 <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" FileSize="783" Hash="B5BDD5E7179A94C2C817069913CA8C099DF811B9" Packaging="embedded" SourcePath="u0" />

10 <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" FileSize="25088" Hash="DB12DB6565CDBC4E9705204830E421ACEB710129" Packaging="embedded" SourcePath="u1" />

11 <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" FileSize="118272" Hash="3A7A20D97B0546A23A025EE5774BE237C14D2957" Packaging="embedded" SourcePath="u2" />

12 - <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" FileSize="114688" Hash="56BA3EA94BEBF8EB562C914495E1594E74F05DBE" Packaging="embedded" SourcePath="u3" />

12 + <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" FileSize="114688" Hash="56BA3EA94BEBF8EB562C914495E1594E74F05DBE" Packaging="embedded" SourcePath="u3" />

13 <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" FileSize="3599" Hash="8D9797C1E1A50AECB8B85FFCEA6A2A2EF611BD7F" Packaging="embedded" SourcePath="u4" />

14 <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" FileSize="797" Hash="75AE41181581FD6376CA9CA88147011E48BF9A30" Packaging="embedded" SourcePath="u5" />

15 <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" FileSize="2237" Hash="068B3C5E27AECE7987EABAA2802C9EB07B39EAF8" Packaging="embedded" SourcePath="u6" />

src/burn/test/BurnUnitTest/precomp.h

-1

@@ -38,7 +38,6 @@

38 #include <butil.h>

39

40 #include "BootstrapperApplication.h"

41 -#include "BundleExtensionEngine.h"

41 #include "BundleExtension.h"

42

43 #include "platform.h"

src/clean.cmd

+2 -3

@@ -21,9 +21,8 @@ if exist "%_NUGET_CACHE%\wixinternal.basebuildtasks.sources" rd /s/q "%_NUGET_CA

21 if exist "%_NUGET_CACHE%\wixinternal.testsupport" rd /s/q "%_NUGET_CACHE%\wixinternal.testsupport"

22 if exist "%_NUGET_CACHE%\wixinternal.core.testpackage" rd /s/q "%_NUGET_CACHE%\wixinternal.core.testpackage"

23 if exist "%_NUGET_CACHE%\wixtoolset.bal.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.bal.wixext"

24 -if exist "%_NUGET_CACHE%\wixtoolset.balutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.balutil"

24 +if exist "%_NUGET_CACHE%\wixtoolset.bootstrapperapplications.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.bootstrapperapplications.wixext"

25 if exist "%_NUGET_CACHE%\wixtoolset.bextutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.bextutil"

26 -if exist "%_NUGET_CACHE%\wixtoolset.bootstrappercore.native" rd /s/q "%_NUGET_CACHE%\wixtoolset.bootstrappercore.native"

26 if exist "%_NUGET_CACHE%\wixtoolset.burn" rd /s/q "%_NUGET_CACHE%\wixtoolset.burn"

27 if exist "%_NUGET_CACHE%\wixtoolset.complus.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.complus.wixext"

28 if exist "%_NUGET_CACHE%\wixtoolset.converters" rd /s/q "%_NUGET_CACHE%\wixtoolset.converters"

@@ -49,7 +48,7 @@ if exist "%_NUGET_CACHE%\wixtoolset.firewall.wixext" rd /s/q "%_NUGET_CACHE%\wix

48 if exist "%_NUGET_CACHE%\wixtoolset.heat" rd /s/q "%_NUGET_CACHE%\wixtoolset.heat"

49 if exist "%_NUGET_CACHE%\wixtoolset.http.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.http.wixext"

50 if exist "%_NUGET_CACHE%\wixtoolset.iis.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.iis.wixext"

52 -if exist "%_NUGET_CACHE%\wixtoolset.mba.core" rd /s/q "%_NUGET_CACHE%\wixtoolset.mba.core"

51 +if exist "%_NUGET_CACHE%\wixtoolset.bootstrapperapplicationapi" rd /s/q "%_NUGET_CACHE%\wixtoolset.bootstrapperapplicationapi"

52 if exist "%_NUGET_CACHE%\wixtoolset.msmq.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.msmq.wixext"

53 if exist "%_NUGET_CACHE%\wixtoolset.netfx.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.netfx.wixext"

54 if exist "%_NUGET_CACHE%\wixtoolset.powershell.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.powershell.wixext"

src/ext/Bal/Bal.wixext.sln

+3 -3

@@ -7,11 +7,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "Samples\bafu

7 EndProject

8 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}"

9 EndProject

10 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}"

10 +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bas", "wixlib\bas.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}"

11 EndProject

12 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}"

12 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BootstrapperApplications.wixext", "wixext\WixToolset.BootstrapperApplications.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}"

13 EndProject

14 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}"

14 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BootstrapperApplications", "test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}"

15 EndProject

16 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixiuiba", "wixiuiba\wixiuiba.vcxproj", "{0F73E566-925C-448D-99CB-3A7F5DF399C8}"

17 EndProject

src/ext/Bal/README.md

+2 -2

@@ -1,2 +1,2 @@

1 -# Bal.wixext

2 -WixToolset.Bal.wixext - Bootstrapper Application Layer WiX Toolset Extension

1 +# WixToolset.BootstrapperApplications.wixext

2 +WixToolset.BootstrapperApplications.wixext - Bootstrapper Applications WiX Toolset Extension

src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj

+1 -1

@@ -60,7 +60,7 @@

60 </ItemGroup>

61

62 <ItemGroup>

63 - <PackageReference Include="WixToolset.BalUtil" />

63 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

64

65 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />

66 </ItemGroup>

src/ext/Bal/bal.cmd

+7 -4

@@ -17,31 +17,34 @@

17 @if "%_INC%"=="" call :clean

18 @if NOT "%_CLEAN%"=="" goto :end

19

20 -@echo Building ext\Bal %_C% using %_N%

20 +@echo Building ext\BootstrapperApplications %_C% using %_N%

21

22 :: Restore

23

24 :: Build

25 -msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj -bl:%_L%\ext_bal_build.binlog || exit /b

25 +msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj -bl:%_L%\ext_bal_build.binlog || exit /b

26

27 msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\examples\examples.proj -bl:%_L%\bal_examples_build.binlog || exit /b

28

29 :: Test

30 dotnet test ^

31 - %_B%\net6.0\WixToolsetTest.Bal.dll ^

31 + %_B%\net6.0\WixToolsetTest.BootstrapperApplications.dll ^

32 --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b

33

34 :: Pack

35 -msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b

35 +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.BootstrapperApplications.wixext.csproj || exit /b

36 +msbuild -t:Pack -Restore -p:Configuration=%_C% -tl -nologo -warnaserror wixext-backward-compatible\WixToolset.Bal.wixext.csproj || exit /b

37

38 @goto :end

39

40 :clean

41 @rd /s/q "..\..\..\build\Bal.wixext" 2> nul

42 @del "..\..\..\build\artifacts\WixToolset.Bal.wixext.*.nupkg" 2> nul

43 +@del "..\..\..\build\artifacts\WixToolset.BootstrapperApplications.wixext.*.nupkg" 2> nul

44 @del "%_L%\ext_bal_build.binlog" 2> nul

45 @del "%_L%\TestResults\bal.wixext.trx" 2> nul

46 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bal.wixext" 2> nul

47 +@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrapperapplications.wixext" 2> nul

48 @exit /b

49

50 :end

src/ext/Bal/stdbas/stdbas.vcxproj

+1 -1

@@ -71,7 +71,7 @@ rc.exe -fo "$(OutDir)stdbas.res" "$(IntDir)stdbas.messages.rc"</Command>

71 </ItemDefinitionGroup>

72

73 <ItemGroup>

74 - <PackageReference Include="WixToolset.BalUtil" />

74 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

75 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />

76 </ItemGroup>

77

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs renamed

+9 -9

@@ -1,12 +1,12 @@

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.Bal

3 +namespace WixToolsetTest.BootstrapperApplications

4 {

5 using System;

6 using System.IO;

7 using System.Linq;

8 using System.Xml;

9 - using WixToolset.Bal;

9 + using WixToolset.BootstrapperApplications;

10 using WixInternal.Core.TestPackage;

11 using WixInternal.TestSupport;

12 using Xunit;

@@ -29,7 +29,7 @@ namespace WixToolsetTest.Bal

29 {

30 "build",

31 Path.Combine(bundleSourceFolder, "DisplayInternalUIConditionBundle.wxs"),

32 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

32 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

33 "-intermediateFolder", intermediateFolder,

34 "-bindpath", Path.Combine(bundleSourceFolder, "data"),

35 "-o", bundleFile,

@@ -67,7 +67,7 @@ namespace WixToolsetTest.Bal

67 {

68 "build",

69 Path.Combine(bundleSourceFolder, "Bundle.wxs"),

70 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

70 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

71 "-intermediateFolder", intermediateFolder,

72 "-o", bundleFile,

73 });

@@ -106,7 +106,7 @@ namespace WixToolsetTest.Bal

106 {

107 "build",

108 Path.Combine(bundleSourceFolder, "Bundle.wxs"),

109 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

109 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

110 "-intermediateFolder", intermediateFolder,

111 "-o", bundleFile,

112 });

@@ -132,7 +132,7 @@ namespace WixToolsetTest.Bal

132 // {

133 // "build",

134 // Path.Combine(bundleSourceFolder, "AlwaysInstallPrereqsBundle.wxs"),

135 - // "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

135 + // "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

136 // "-intermediateFolder", intermediateFolder,

137 // "-o", bundleFile,

138 // });

@@ -173,7 +173,7 @@ namespace WixToolsetTest.Bal

173 {

174 "build",

175 Path.Combine(bundleSourceFolder, "Bundle.wxs"),

176 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

176 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

177 "-intermediateFolder", intermediateFolder,

178 "-bindpath", dataFolder,

179 "-o", bundleFile,

@@ -204,7 +204,7 @@ namespace WixToolsetTest.Bal

204 {

205 "build",

206 Path.Combine(bundleSourceFolder, "Bundle.wxs"),

207 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

207 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

208 "-intermediateFolder", intermediateFolder,

209 "-o", bundleFile,

210 });

@@ -239,7 +239,7 @@ namespace WixToolsetTest.Bal

239 Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxs"),

240 "-loc", Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxl"),

241 "-bindpath", Path.Combine(bundleSourceFolder, "WixStdBa", "Data"),

242 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

242 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

243 "-intermediateFolder", intermediateFolder,

244 "-o", bundleFile,

245 });

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/InternalUIBAFixture.cs renamed

+16 -16

@@ -1,6 +1,6 @@

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.Bal

3 +namespace WixToolsetTest.BootstrapperApplications

4 {

5 using System;

6 using System.IO;

@@ -27,7 +27,7 @@ namespace WixToolsetTest.Bal

27 {

28 "build",

29 Path.Combine(bundleSourceFolder, "SinglePrimaryPackage.wxs"),

30 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

30 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

31 "-intermediateFolder", intermediateFolder,

32 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

33 "-o", bundleFile,

@@ -66,7 +66,7 @@ namespace WixToolsetTest.Bal

66 {

67 "build",

68 Path.Combine(bundleSourceFolder, "UrlPrereqPackage.wxs"),

69 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

69 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

70 "-intermediateFolder", intermediateFolder,

71 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

72 "-o", bundleFile,

@@ -111,7 +111,7 @@ namespace WixToolsetTest.Bal

111 {

112 "build",

113 Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackage.wxs"),

114 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

114 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

115 "-intermediateFolder", intermediateFolder,

116 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

117 "-o", bundleFile,

@@ -156,7 +156,7 @@ namespace WixToolsetTest.Bal

156 {

157 "build",

158 Path.Combine(bundleSourceFolder, "IuiBaWarnings.wxs"),

159 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

159 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

160 "-intermediateFolder", intermediateFolder,

161 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

162 "-o", bundleFile,

@@ -208,7 +208,7 @@ namespace WixToolsetTest.Bal

208 {

209 "build",

210 Path.Combine(bundleSourceFolder, "AllPrereqPackages.wxs"),

211 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

211 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

212 "-intermediateFolder", intermediateFolder,

213 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

214 "-o", bundleFile,

@@ -237,7 +237,7 @@ namespace WixToolsetTest.Bal

237 {

238 "build",

239 Path.Combine(bundleSourceFolder, "ImplicitNonMsiPrimaryPackage.wxs"),

240 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

240 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

241 "-intermediateFolder", intermediateFolder,

242 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

243 "-o", bundleFile,

@@ -266,7 +266,7 @@ namespace WixToolsetTest.Bal

266 {

267 "build",

268 Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackageEnableFeatureSelection.wxs"),

269 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

269 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

270 "-intermediateFolder", intermediateFolder,

271 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

272 "-o", bundleFile,

@@ -295,7 +295,7 @@ namespace WixToolsetTest.Bal

295 {

296 "build",

297 Path.Combine(bundleSourceFolder, "MultipleNonPermanentNonPrimaryPackages.wxs"),

298 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

298 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

299 "-intermediateFolder", intermediateFolder,

300 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

301 "-o", bundleFile,

@@ -325,7 +325,7 @@ namespace WixToolsetTest.Bal

325 {

326 "build",

327 Path.Combine(bundleSourceFolder, "MultipleDefaultPrimaryPackages.wxs"),

328 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

328 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

329 "-intermediateFolder", intermediateFolder,

330 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

331 "-o", bundleFile,

@@ -355,7 +355,7 @@ namespace WixToolsetTest.Bal

355 {

356 "build",

357 Path.Combine(bundleSourceFolder, "NoDefaultPrimaryPackage.wxs"),

358 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

358 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

359 "-intermediateFolder", intermediateFolder,

360 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

361 "-o", bundleFile,

@@ -384,7 +384,7 @@ namespace WixToolsetTest.Bal

384 {

385 "build",

386 Path.Combine(bundleSourceFolder, "NonMsiPrimaryPackage.wxs"),

387 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

387 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

388 "-intermediateFolder", intermediateFolder,

389 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

390 "-o", bundleFile,

@@ -413,7 +413,7 @@ namespace WixToolsetTest.Bal

413 {

414 "build",

415 Path.Combine(bundleSourceFolder, "NonPermanentPrereqPackage.wxs"),

416 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

416 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

417 "-intermediateFolder", intermediateFolder,

418 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

419 "-o", bundleFile,

@@ -442,7 +442,7 @@ namespace WixToolsetTest.Bal

442 {

443 "build",

444 Path.Combine(bundleSourceFolder, "PermanentPrimaryPackage.wxs"),

445 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

445 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

446 "-intermediateFolder", intermediateFolder,

447 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

448 "-o", bundleFile,

@@ -472,7 +472,7 @@ namespace WixToolsetTest.Bal

472 {

473 "build",

474 Path.Combine(bundleSourceFolder, "PrimaryPackageEnableFeatureSelection.wxs"),

475 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

475 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

476 "-intermediateFolder", intermediateFolder,

477 "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),

478 "-o", bundleFile,

@@ -502,7 +502,7 @@ namespace WixToolsetTest.Bal

502 {

503 "build",

504 Path.Combine(bundleSourceFolder, "PrimaryPrereqPackage.wxs"),

505 - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),

505 + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),

506 "-intermediateFolder", intermediateFolder,

507 "-o", wixlibFile,

508 });

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/fake.exe renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Dncba/Bundle.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/AlwaysInstallPrereqsBundle.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/Bundle.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/Bundle.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxl renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/AllPrereqPackages.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/IuibaWarnings.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PermanentPrimaryPackage.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPrereqPackage.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/SinglePrimaryPackage.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/UrlPrereqPackage.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Data/test.msi renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs renamed

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj renamed

+1 -1

@@ -16,7 +16,7 @@

16 </Target>

17

18 <ItemGroup>

19 - <ProjectReference Include="..\..\wixext\WixToolset.Bal.wixext.csproj" />

19 + <ProjectReference Include="..\..\wixext\WixToolset.BootstrapperApplications.wixext.csproj" />

20 </ItemGroup>

21

22 <ItemGroup>

src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.v3.ncrunchproject renamed

src/ext/Bal/test/examples/Directory.wixproj.targets

+1 -1

@@ -3,6 +3,6 @@

3 <Project>

4 <ItemGroup>

5 <BindPath Include="$(OutputPath)" />

6 - <WixExtension Include="$(OutputPath)..\netstandard2.0\WixToolset.Bal.wixext.dll" />

6 + <WixExtension Include="$(OutputPath)..\netstandard2.0\WixToolset.BootstrapperApplications.wixext.dll" />

7 </ItemGroup>

8 </Project>

src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs

+1 -1

@@ -5,7 +5,7 @@

5 <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->

6 <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" />

7 <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />

8 - <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />

8 + <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />

9 <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->

10 </BootstrapperApplication>

11 <Chain>

src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs

+1 -1

@@ -5,7 +5,7 @@

5 <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->

6 <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" />

7 <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />

8 - <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />

8 + <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />

9 <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->

10 </BootstrapperApplication>

11 <Chain>

src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace Example.EarliestCoreMBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 public class EarliestCoreBA : BootstrapperApplication

8 {

src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj

+1 -1

@@ -9,6 +9,6 @@

9 </PropertyGroup>

10

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Mba.Core" />

12 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

13 </ItemGroup>

14 </Project>

src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace Example.EarliestCoreMBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 internal class Program

8 {

src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs

+1 -1

@@ -3,7 +3,7 @@

3 <BootstrapperApplication SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe">

4 <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe.config" />

5 <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\mbanative.dll" />

6 - <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Core.dll" />

6 + <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.BootstrapperApplicationApi.dll" />

7 <!-- <bal:WixManagedBootstrapperApplicationHost /> -->

8 </BootstrapperApplication>

9 <Chain>

src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj

+1 -5

@@ -12,10 +12,6 @@

12 </PropertyGroup>

13

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Mba.Core" />

16 - </ItemGroup>

17 -

18 - <ItemGroup>

19 - <ProjectReference Include="..\..\..\..\..\api\burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" />

15 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

16 </ItemGroup>

17 </Project>

src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace Example.FullFramework2MBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 public class FullFramework2BA : BootstrapperApplication

8 {

src/ext/Bal/test/examples/FullFramework2MBA/Program.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace Example.FullFramework2MBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 internal class Program

8 {

src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs

+1 -1

@@ -4,7 +4,7 @@

4 <!-- <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.dll" /> -->

5 <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.exe.config" />

6 <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\mbanative.dll" />

7 - <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Core.dll" />

7 + <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.BootstrapperApplicationApi.dll" />

8 <!-- <bal:WixManagedBootstrapperApplicationHost /> -->

9 </BootstrapperApplication>

10 <Chain>

src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj

+1 -1

@@ -11,6 +11,6 @@

11 </PropertyGroup>

12

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Mba.Core" />

14 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

15 </ItemGroup>

16 </Project>

src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace Example.FullFramework4MBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 public class FullFramework4BA : BootstrapperApplication

8 {

src/ext/Bal/test/examples/FullFramework4MBA/Program.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace Example.FullFramework4MBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 internal class Program

8 {

src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs

+1 -1

@@ -5,7 +5,7 @@

5 <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->

6 <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" />

7 <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />

8 - <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />

8 + <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />

9 <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->

10 </BootstrapperApplication>

11 <Chain>

src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs

+1 -1

@@ -5,7 +5,7 @@

5 <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->

6 <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" />

7 <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />

8 - <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />

8 + <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />

9 <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->

10 </BootstrapperApplication>

11 <Chain>

src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj

+1 -1

@@ -9,6 +9,6 @@

9 </PropertyGroup>

10

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Mba.Core" />

12 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

13 </ItemGroup>

14 </Project>

src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace Example.LatestCoreMBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 public class LatestCoreBA : BootstrapperApplication

8 {

src/ext/Bal/test/examples/LatestCoreMBA/Program.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace Example.LatestCoreMBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 internal class Program

8 {

src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj

+1 -1

@@ -61,7 +61,7 @@

61 </ItemGroup>

62

63 <ItemGroup>

64 - <PackageReference Include="WixToolset.BalUtil" />

64 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

65

66 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />

67 </ItemGroup>

src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs

+1 -1

@@ -5,7 +5,7 @@

5 <!-- <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->

6 <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json" Name="Example.WPFCoreMBA.runtimeconfig.json" />

7 <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />

8 - <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />

8 + <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />

9 <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->

10 </BootstrapperApplication>

11 <Chain>

src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj

+1 -1

@@ -9,6 +9,6 @@

9 </PropertyGroup>

10

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Mba.Core" />

12 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

13 </ItemGroup>

14 </Project>

src/ext/Bal/test/examples/WPFCoreMBA/Program.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace Example.WPFCoreMBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6 // using WixToolset.BootstrapperApplications.Managed;

7

8 public class Program

src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs

+1 -1

@@ -3,7 +3,7 @@

3 namespace Example.WPFCoreMBA

4 {

5 using System.Windows.Threading;

6 - using WixToolset.Mba.Core;

6 + using WixToolset.BootstrapperApplicationApi;

7

8 public class WPFCoreBA : BootstrapperApplication

9 {

src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj new

+16

@@ -0,0 +1,16 @@

1 +<?xml version="1.0" encoding="utf-8"?>

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 +

4 +<Project Sdk="Microsoft.NET.Sdk">

5 + <Import Project="..\..\WixExt.props" />

6 +

7 + <PropertyGroup>

8 + <TargetFramework>net6.0</TargetFramework>

9 + <IncludeBuildOutput>false</IncludeBuildOutput>

10 + <Title>WiX Toolset BootstrapperApplications extension</Title>

11 + <Description>WiX Toolset BootstrapperApplications extension</Description>

12 + <PackageId>WixToolset.Bal.wixext</PackageId>

13 + <NuspecBasePath>$(OutputPath)netstandard2.0</NuspecBasePath>

14 + <NuspecProperties>$(NuspecProperties);WixExtensionPackageFolder=$(WixExtensionPackageFolder)</NuspecProperties>

15 + </PropertyGroup>

16 +</Project>

src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec renamed

+4 -4

@@ -1,6 +1,6 @@

1 -<?xml version="1.0"?>

1 +<?xml version="1.0" encoding="utf-8"?>

2 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">

3 - <metadata minClientVersion="4.0">

3 + <metadata>

4 <id>$id$</id>

5 <version>$version$</version>

6 <title>$title$</title>

@@ -15,8 +15,8 @@

15 </metadata>

16

17 <files>

18 - <file src="$projectFolder$\build\$id$.props" target="build\" />

18 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />

20 - <file src="$projectFolder$\inc\*" target="build\native\include" />

19 + <file src="$projectFolder$\WixToolset.Bal.wixext.targets" target="build" />

20 + <file src="WixToolset.BootstrapperApplications.wixext.dll" target="$wixExtensionPackageFolder$" />

21 </files>

22 </package>

src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets new

+11

@@ -0,0 +1,11 @@

1 +<?xml version="1.0" encoding="utf-8"?>

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 +

4 +<Project>

5 + <ItemGroup>

6 + <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\WixToolset.BootstrapperApplications.wixext.dll"

7 + Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\WixToolset.BootstrapperApplications.wixext.dll') " />

8 + <UnsupportedWixExtension Include="WixToolset.BootstrapperApplications.wixext"

9 + Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\WixToolset.BootstrapperApplications.wixext.dll') " />

10 + </ItemGroup>

11 +</Project>

src/ext/Bal/wixext/BalBurnBackendExtension.cs

+2 -2

@@ -1,13 +1,13 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using System;

6 using System.Collections.Generic;

7 using System.Linq;

8 using System.Text;

9 using System.Xml;

10 - using WixToolset.Bal.Symbols;

10 + using WixToolset.BootstrapperApplications.Symbols;

11 using WixToolset.Data;

12 using WixToolset.Data.Burn;

13 using WixToolset.Data.Symbols;

src/ext/Bal/wixext/BalCompiler.cs

+2 -2

@@ -1,11 +1,11 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using System;

6 using System.Collections.Generic;

7 using System.Xml.Linq;

8 - using WixToolset.Bal.Symbols;

8 + using WixToolset.BootstrapperApplications.Symbols;

9 using WixToolset.Data;

10 using WixToolset.Data.Burn;

11 using WixToolset.Data.Symbols;

src/ext/Bal/wixext/BalErrors.cs

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using System;

6 using System.Resources;

src/ext/Bal/wixext/BalExtensionData.cs

+2 -2

@@ -1,6 +1,6 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 using WixToolset.Extensibility;

@@ -18,7 +18,7 @@ namespace WixToolset.Bal

18

19 public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)

20 {

21 - return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", symbolDefinitions);

21 + return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.BootstrapperApplications.bas.wixlib", symbolDefinitions);

22 }

23 }

24 }

src/ext/Bal/wixext/BalExtensionFactory.cs

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using System;

6 using System.Collections.Generic;

src/ext/Bal/wixext/BalWarnings.cs

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using System;

6 using System.Resources;

src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs

+1 -1

@@ -1,6 +1,6 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using System;

6 using WixToolset.Data;

src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs

+3 -3

@@ -1,10 +1,10 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using System;

6 using WixToolset.Data;

7 - using WixToolset.Bal.Symbols;

7 + using WixToolset.BootstrapperApplications.Symbols;

8

9 public static partial class BalSymbolDefinitions

10 {

@@ -20,7 +20,7 @@ namespace WixToolset.Bal

20 }

21 }

22

23 -namespace WixToolset.Bal.Symbols

23 +namespace WixToolset.BootstrapperApplications.Symbols

24 {

25 using System;

26 using WixToolset.Data;

src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs

+4 -4

@@ -1,9 +1,9 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 - using WixToolset.Bal.Symbols;

6 + using WixToolset.BootstrapperApplications.Symbols;

7

8 public static partial class BalSymbolDefinitions

9 {

@@ -18,7 +18,7 @@ namespace WixToolset.Bal

18 }

19 }

20

21 -namespace WixToolset.Bal.Symbols

21 +namespace WixToolset.BootstrapperApplications.Symbols

22 {

23 using WixToolset.Data;

24

@@ -52,4 +52,4 @@ namespace WixToolset.Bal.Symbols

52 set => this.Set((int)WixBalBAFunctionsSymbolFields.FilePath, value);

53 }

54 }

55 -}

\ No newline at end of file

55 +}

src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs

+3 -3

@@ -1,9 +1,9 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 - using WixToolset.Bal.Symbols;

6 + using WixToolset.BootstrapperApplications.Symbols;

7

8 public static partial class BalSymbolDefinitions

9 {

@@ -17,7 +17,7 @@ namespace WixToolset.Bal

17 }

18 }

19

20 -namespace WixToolset.Bal.Symbols

20 +namespace WixToolset.BootstrapperApplications.Symbols

21 {

22 using System;

23 using WixToolset.Data;

src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs

+4 -4

@@ -1,9 +1,9 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 - using WixToolset.Bal.Symbols;

6 + using WixToolset.BootstrapperApplications.Symbols;

7

8 public static partial class BalSymbolDefinitions

9 {

@@ -18,7 +18,7 @@ namespace WixToolset.Bal

18 }

19 }

20

21 -namespace WixToolset.Bal.Symbols

21 +namespace WixToolset.BootstrapperApplications.Symbols

22 {

23 using WixToolset.Data;

24

@@ -52,4 +52,4 @@ namespace WixToolset.Bal.Symbols

52 set => this.Set((int)WixBalConditionSymbolFields.Message, value);

53 }

54 }

55 -}

\ No newline at end of file

55 +}

src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs

+3 -3

@@ -1,9 +1,9 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 - using WixToolset.Bal.Symbols;

6 + using WixToolset.BootstrapperApplications.Symbols;

7

8 public static partial class BalSymbolDefinitions

9 {

@@ -19,7 +19,7 @@ namespace WixToolset.Bal

19 }

20 }

21

22 -namespace WixToolset.Bal.Symbols

22 +namespace WixToolset.BootstrapperApplications.Symbols

23 {

24 using WixToolset.Data;

25

src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs

+3 -3

@@ -1,9 +1,9 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 - using WixToolset.Bal.Symbols;

6 + using WixToolset.BootstrapperApplications.Symbols;

7

8 public static partial class BalSymbolDefinitions

9 {

@@ -19,7 +19,7 @@ namespace WixToolset.Bal

19 }

20 }

21

22 -namespace WixToolset.Bal.Symbols

22 +namespace WixToolset.BootstrapperApplications.Symbols

23 {

24 using WixToolset.Data;

25

src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs

+3 -3

@@ -1,9 +1,9 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 - using WixToolset.Bal.Symbols;

6 + using WixToolset.BootstrapperApplications.Symbols;

7

8 public static partial class BalSymbolDefinitions

9 {

@@ -19,7 +19,7 @@ namespace WixToolset.Bal

19 }

20 }

21

22 -namespace WixToolset.Bal.Symbols

22 +namespace WixToolset.BootstrapperApplications.Symbols

23 {

24 using WixToolset.Data;

25

src/ext/Bal/wixext/Symbols/WixStdbaCommandLineSymbol.cs

+3 -3

@@ -1,9 +1,9 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 - using WixToolset.Bal.Symbols;

6 + using WixToolset.BootstrapperApplications.Symbols;

7

8 public static partial class BalSymbolDefinitions

9 {

@@ -17,7 +17,7 @@ namespace WixToolset.Bal

17 }

18 }

19

20 -namespace WixToolset.Bal.Symbols

20 +namespace WixToolset.BootstrapperApplications.Symbols

21 {

22 using System;

23 using WixToolset.Data;

src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs

+4 -4

@@ -1,9 +1,9 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 - using WixToolset.Bal.Symbols;

6 + using WixToolset.BootstrapperApplications.Symbols;

7

8 public static partial class BalSymbolDefinitions

9 {

@@ -21,7 +21,7 @@ namespace WixToolset.Bal

21 }

22 }

23

24 -namespace WixToolset.Bal.Symbols

24 +namespace WixToolset.BootstrapperApplications.Symbols

25 {

26 using WixToolset.Data;

27

@@ -76,4 +76,4 @@ namespace WixToolset.Bal.Symbols

76 set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value);

77 }

78 }

79 -}

\ No newline at end of file

79 +}

src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs

+4 -4

@@ -1,9 +1,9 @@

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 WixToolset.Bal

3 +namespace WixToolset.BootstrapperApplications

4 {

5 using WixToolset.Data;

6 - using WixToolset.Bal.Symbols;

6 + using WixToolset.BootstrapperApplications.Symbols;

7

8 public static partial class BalSymbolDefinitions

9 {

@@ -17,7 +17,7 @@ namespace WixToolset.Bal

17 }

18 }

19

20 -namespace WixToolset.Bal.Symbols

20 +namespace WixToolset.BootstrapperApplications.Symbols

21 {

22 using WixToolset.Data;

23

@@ -44,4 +44,4 @@ namespace WixToolset.Bal.Symbols

44 set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value);

45 }

46 }

47 -}

\ No newline at end of file

47 +}

src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj renamed

+5 -5

@@ -4,19 +4,19 @@

4 <Project Sdk="Microsoft.NET.Sdk">

5 <PropertyGroup>

6 <TargetFramework>netstandard2.0</TargetFramework>

7 - <RootNamespace>WixToolset.Bal</RootNamespace>

8 - <Description>WiX Toolset Bundle extension</Description>

9 - <Title>WiX Toolset Bundle extension</Title>

7 + <RootNamespace>WixToolset.BootstrapperApplications</RootNamespace>

8 + <Description>WiX Toolset BootstrapperApplications extension</Description>

9 + <Title>WiX Toolset BootstrapperApplications extension</Title>

10 <DebugType>embedded</DebugType>

11 </PropertyGroup>

12

13 <Import Project="..\..\WixExt.props" />

14

15 <ItemGroup>

16 - <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" />

16 + <EmbeddedResource Include="$(OutputPath)..\bas.wixlib" />

17 </ItemGroup>

18

19 <ItemGroup Condition=" '$(NCrunch)'=='' ">

20 - <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />

20 + <ProjectReference Include="..\wixlib\bas.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />

21 </ItemGroup>

22 </Project>

src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets renamed

src/ext/Bal/wixiuiba/wixiuiba.vcxproj

+1 -1

@@ -82,7 +82,7 @@

82 </ItemGroup>

83

84 <ItemGroup>

85 - <PackageReference Include="WixToolset.BalUtil" />

85 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

86 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />

87 </ItemGroup>

88

src/ext/Bal/wixlib/bas.wixproj renamed

src/ext/Bal/wixlib/bas_arm64.wxs renamed

+1 -1

@@ -2,5 +2,5 @@

2

3 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

4 <?define platform=arm64 ?>

5 - <?include bal_platform.wxi ?>

5 + <?include bas_platform.wxi ?>

6 </Wix>

src/ext/Bal/wixlib/bas_platform.wxi renamed

src/ext/Bal/wixlib/bas_x64.wxs renamed

+1 -1

@@ -3,5 +3,5 @@

3

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

5 <?define platform=x64 ?>

6 - <?include bal_platform.wxi ?>

6 + <?include bas_platform.wxi ?>

7 </Wix>

src/ext/Bal/wixlib/bas_x86.wxs renamed

+1 -1

@@ -3,5 +3,5 @@

3

4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">

5 <?define platform=x86 ?>

6 - <?include bal_platform.wxi ?>

6 + <?include bas_platform.wxi ?>

7 </Wix>

src/ext/Bal/wixprqba/wixprqba.vcxproj

+1 -1

@@ -82,7 +82,7 @@

82 </ItemGroup>

83

84 <ItemGroup>

85 - <PackageReference Include="WixToolset.BalUtil" />

85 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

86 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />

87 </ItemGroup>

88

src/ext/Bal/wixstdba/wixstdba.vcxproj

+1 -1

@@ -82,7 +82,7 @@

82 </ItemGroup>

83

84 <ItemGroup>

85 - <PackageReference Include="WixToolset.BalUtil" />

85 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

86 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />

87 </ItemGroup>

88

src/ext/NetFx/be/precomp.h

-5

@@ -19,11 +19,6 @@

19 #include <procutil.h>

20 #include <xmlutil.h>

21

22 -#include <BundleExtensionEngine.h>

23 -#include <BundleExtension.h>

24 -

25 -#include <IBundleExtensionEngine.h>

26 -#include <IBundleExtension.h>

22 #include <bextutil.h>

23 #include <BextBundleExtensionEngine.h>

24

src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs

+8 -8

@@ -24,7 +24,7 @@ namespace WixToolsetTest.Netfx

24 var extensionResult = WixRunner.Execute(new[]

25 {

26 "extension", "add",

27 - "WixToolset.Bal.wixext"

27 + "WixToolset.BootstrapperApplications.wixext"

28 });

29

30 var compileResult = WixRunner.Execute(new[]

@@ -33,7 +33,7 @@ namespace WixToolsetTest.Netfx

33 Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),

34 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"),

35 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),

36 - "-ext", "WixToolset.Bal.wixext",

36 + "-ext", "WixToolset.BootstrapperApplications.wixext",

37 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),

38 "-intermediateFolder", intermediateFolder,

39 "-o", bundleFile,

@@ -57,7 +57,7 @@ namespace WixToolsetTest.Netfx

57 var extensionResult = WixRunner.Execute(new[]

58 {

59 "extension", "add",

60 - "WixToolset.Bal.wixext"

60 + "WixToolset.BootstrapperApplications.wixext"

61 });

62

63 var compileResult = WixRunner.Execute(new[]

@@ -65,7 +65,7 @@ namespace WixToolsetTest.Netfx

65 "build",

66 Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),

67 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),

68 - "-ext", "WixToolset.Bal.wixext",

68 + "-ext", "WixToolset.BootstrapperApplications.wixext",

69 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),

70 "-intermediateFolder", intermediateFolder,

71 "-o", bundleFile,

@@ -89,14 +89,14 @@ namespace WixToolsetTest.Netfx

89 var extensionResult = WixRunner.Execute(new[]

90 {

91 "extension", "add",

92 - "WixToolset.Bal.wixext"

92 + "WixToolset.BootstrapperApplications.wixext"

93 });

94

95 var compileResult = WixRunner.Execute(new[]

96 {

97 "build",

98 Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),

99 - "-ext", "WixToolset.Bal.wixext",

99 + "-ext", "WixToolset.BootstrapperApplications.wixext",

100 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),

101 "-intermediateFolder", intermediateFolder,

102 "-o", bundleFile,

@@ -121,7 +121,7 @@ namespace WixToolsetTest.Netfx

121 var extensionResult = WixRunner.Execute(warningsAsErrors: true, new[]

122 {

123 "extension", "add",

124 - "WixToolset.Bal.wixext",

124 + "WixToolset.BootstrapperApplications.wixext",

125 "extension", "add",

126 "WixToolset.Util.wixext",

127 });

@@ -130,7 +130,7 @@ namespace WixToolsetTest.Netfx

130 {

131 "build",

132 Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),

133 - "-ext", "WixToolset.Bal.wixext",

133 + "-ext", "WixToolset.BootstrapperApplications.wixext",

134 "-ext", "WixToolset.Util.wixext",

135 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),

136 "-intermediateFolder", intermediateFolder,

src/ext/NetFx/wixlib/netfx.wixproj

+1 -1

@@ -20,7 +20,7 @@

20 </ItemGroup>

21

22 <ItemGroup>

23 - <PackageReference Include="WixToolset.Bal.wixext" />

23 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

24 <PackageReference Include="WixToolset.Util.wixext" />

25 </ItemGroup>

26

src/ext/Util/be/precomp.h

-5

@@ -23,11 +23,6 @@

23 #include <pathutil.h>

24 #include <xmlutil.h>

25

26 -#include <BundleExtensionEngine.h>

27 -#include <BundleExtension.h>

28 -

29 -#include <IBundleExtensionEngine.h>

30 -#include <IBundleExtension.h>

26 #include <bextutil.h>

27 #include <BextBundleExtensionEngine.h>

28

src/ext/WixExt.props

+2 -1

@@ -6,11 +6,12 @@

6 <IncludeBuildOutput>false</IncludeBuildOutput>

7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>

8 <NoWarn>NU5100</NoWarn>

9 + <WixExtensionPackageFolder>wixext5</WixExtensionPackageFolder>

10 </PropertyGroup>

11

12 <ItemGroup>

13 <Content Include="$(MSBuildProjectName).targets" PackagePath="build" />

13 - <Content Include="$(TargetPath)" PackagePath="wixext5" />

14 + <Content Include="$(TargetPath)" PackagePath="$(WixExtensionPackageFolder)" />

15

16 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />

17 </ItemGroup>

src/internal/SetBuildNumber/Directory.Packages.props.pp

+2 -3

@@ -13,10 +13,8 @@

13 <PackageVersion Include="WixToolset.DUtil" Version="{packageversion}" />

14 <PackageVersion Include="WixToolset.WcaUtil" Version="{packageversion}" />

15

16 - <PackageVersion Include="WixToolset.BootstrapperCore.Native" Version="{packageversion}" />

17 - <PackageVersion Include="WixToolset.BalUtil" Version="{packageversion}" />

16 <PackageVersion Include="WixToolset.BextUtil" Version="{packageversion}" />

19 - <PackageVersion Include="WixToolset.Mba.Core" Version="{packageversion}" />

17 + <PackageVersion Include="WixToolset.BootstrapperApplicationApi" Version="{packageversion}" />

18

19 <PackageVersion Include="WixToolset.Data" Version="{packageversion}" />

20 <PackageVersion Include="WixToolset.Extensibility" Version="{packageversion}" />

@@ -32,6 +30,7 @@

30 <PackageVersion Include="WixToolset.Heat" Version="{packageversion}" />

31

32 <PackageVersion Include="WixToolset.Bal.wixext" Version="{packageversion}" />

33 + <PackageVersion Include="WixToolset.BootstrapperApplications.wixext" Version="{packageversion}" />

34 <PackageVersion Include="WixToolset.Dependency.wixext" Version="{packageversion}" />

35 <PackageVersion Include="WixToolset.NetFx.wixext" Version="{packageversion}" />

36 <PackageVersion Include="WixToolset.UI.wixext" Version="{packageversion}" />

src/setup/WixAdditionalTools/WixAdditionalTools.wixproj

+1 -1

@@ -11,7 +11,7 @@

11 </ItemGroup>

12

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 </ItemGroup>

16

17 <UsingTask TaskName="GenerateMetadata" AssemblyFile="$(BaseOutputPath)$(Configuration)\net472\MetadataTask.dll" />

src/test/burn/TestBA/Program.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace WixToolset.Test.BA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 internal class Program

8 {

src/test/burn/TestBA/TestBA.cs

+1 -1

@@ -10,7 +10,7 @@ namespace WixToolset.Test.BA

10 using System.Threading;

11 using System.Windows.Forms;

12 using Microsoft.Win32;

13 - using WixToolset.Mba.Core;

13 + using WixToolset.BootstrapperApplicationApi;

14

15 /// <summary>

16 /// A minimal UX used for testing.

src/test/burn/TestBA/TestBA.csproj

+1 -1

@@ -20,6 +20,6 @@

20 </ItemGroup>

21

22 <ItemGroup>

23 - <PackageReference Include="WixToolset.Mba.Core" />

23 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

24 </ItemGroup>

25 </Project>

src/test/burn/TestBA/TestBA_x64.csproj

+1 -1

@@ -20,6 +20,6 @@

20 </ItemGroup>

21

22 <ItemGroup>

23 - <PackageReference Include="WixToolset.Mba.Core" />

23 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

24 </ItemGroup>

25 </Project>

src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj

+1 -1

@@ -59,7 +59,7 @@

59 </ItemGroup>

60

61 <ItemGroup>

62 - <PackageReference Include="WixToolset.BalUtil" />

62 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

63 </ItemGroup>

64

65 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wixproj

+2 -1

@@ -5,6 +5,7 @@

5 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />

6 </ItemGroup>

7 <ItemGroup>

8 + <!-- For testing purposes: Use old Bal WiX extension instead of new BoostrapperApplications.wixext -->

9 <PackageReference Include="WixToolset.Bal.wixext" />

10 </ItemGroup>

10 -</Project>

\ No newline at end of file

11 +</Project>

src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wixproj

+2 -2

@@ -8,6 +8,6 @@

8 <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />

9 </ItemGroup>

10 <ItemGroup>

11 - <PackageReference Include="WixToolset.Bal.wixext" />

11 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

12 </ItemGroup>

13 -</Project>

\ No newline at end of file

13 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj

+2 -2

@@ -12,6 +12,6 @@

12 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj

+2 -2

@@ -13,6 +13,6 @@

13 <ProjectReference Include="..\PackageA_arm64\PackageA_arm64.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj

+2 -2

@@ -13,6 +13,6 @@

13 <ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj

+2 -2

@@ -13,6 +13,6 @@

13 <ProjectReference Include="..\PackageApu_x64\PackageApu_x64.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj

+2 -1

@@ -13,7 +13,8 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 + <!-- For testing purposes: Use old Bal WiX extension instead of new BoostrapperApplications.wixext -->

17 <PackageReference Include="WixToolset.Bal.wixext" />

18 <PackageReference Include="WixToolset.NetFx.wixext" />

19 </ItemGroup>

19 -</Project>

\ No newline at end of file

20 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj

+2 -2

@@ -15,7 +15,7 @@

15 <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

16 </ItemGroup>

17 <ItemGroup>

18 - <PackageReference Include="WixToolset.Bal.wixext" />

18 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

19 <PackageReference Include="WixToolset.NetFx.wixext" />

20 </ItemGroup>

21 -</Project>

\ No newline at end of file

21 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj

+2 -2

@@ -14,7 +14,7 @@

14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

15 </ItemGroup>

16 <ItemGroup>

17 - <PackageReference Include="WixToolset.Bal.wixext" />

17 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

18 <PackageReference Include="WixToolset.NetFx.wixext" />

19 </ItemGroup>

20 -</Project>

\ No newline at end of file

20 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj

+2 -2

@@ -15,7 +15,7 @@

15 <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

16 </ItemGroup>

17 <ItemGroup>

18 - <PackageReference Include="WixToolset.Bal.wixext" />

18 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

19 <PackageReference Include="WixToolset.NetFx.wixext" />

20 </ItemGroup>

21 -</Project>

\ No newline at end of file

21 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleD/BundleD.wixproj

+2 -2

@@ -14,7 +14,7 @@

14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

15 </ItemGroup>

16 <ItemGroup>

17 - <PackageReference Include="WixToolset.Bal.wixext" />

17 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

18 <PackageReference Include="WixToolset.NetFx.wixext" />

19 </ItemGroup>

20 -</Project>

\ No newline at end of file

20 +</Project>

src/test/burn/TestData/BasicFunctionalityTests/BundleD_x64/BundleD_x64.wixproj

+2 -2

@@ -15,7 +15,7 @@

15 <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

16 </ItemGroup>

17 <ItemGroup>

18 - <PackageReference Include="WixToolset.Bal.wixext" />

18 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

19 <PackageReference Include="WixToolset.NetFx.wixext" />

20 </ItemGroup>

21 -</Project>

\ No newline at end of file

21 +</Project>

src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesBundle/MultipleBundlePackagesBundle.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wixproj

+1 -1

@@ -11,7 +11,7 @@

11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

12 </ItemGroup>

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 <PackageReference Include="WixToolset.NetFx.wixext" />

16 </ItemGroup>

17 </Project>

src/test/burn/TestData/BundlePackageTests/UpgradeBundlePackageBundlev1/UpgradeBundlePackageBundle.props

+1 -1

@@ -9,6 +9,6 @@

9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 </ItemGroup>

14 </Project>

src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wixproj

+2 -2

@@ -17,7 +17,7 @@

17 <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

18 </ItemGroup>

19 <ItemGroup>

20 - <PackageReference Include="WixToolset.Bal.wixext" />

20 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

21 <PackageReference Include="WixToolset.NetFx.wixext" />

22 </ItemGroup>

23 -</Project>

\ No newline at end of file

23 +</Project>

src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 <!-- We do this dynamically to avoid committing such a large file to source control. -->

@@ -24,4 +24,4 @@

24 <Delete Files="$(OutputPath)fivegb.file" />

25 <Delete Files="$(MSBuildProjectDirectory)\fivegb.file" />

26 </Target>

27 -</Project>

\ No newline at end of file

27 +</Project>

src/test/burn/TestData/ContainerTests/BundleA/BundleA.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/ContainerTests/BundleB/BundleB.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj

+2 -2

@@ -9,8 +9,8 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 <PackageReference Include="WixToolset.Util.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj

+2 -2

@@ -9,8 +9,8 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 <PackageReference Include="WixToolset.Util.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj

+2 -2

@@ -9,8 +9,8 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 <PackageReference Include="WixToolset.Util.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj

+2 -2

@@ -11,8 +11,8 @@

11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

12 </ItemGroup>

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 <PackageReference Include="WixToolset.NetFx.wixext" />

16 <PackageReference Include="WixToolset.Util.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj

+2 -2

@@ -15,8 +15,8 @@

15 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

16 </ItemGroup>

17 <ItemGroup>

18 - <PackageReference Include="WixToolset.Bal.wixext" />

18 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

19 <PackageReference Include="WixToolset.NetFx.wixext" />

20 <PackageReference Include="WixToolset.Util.wixext" />

21 </ItemGroup>

22 -</Project>

\ No newline at end of file

22 +</Project>

src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj

+2 -2

@@ -15,8 +15,8 @@

15 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

16 </ItemGroup>

17 <ItemGroup>

18 - <PackageReference Include="WixToolset.Bal.wixext" />

18 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

19 <PackageReference Include="WixToolset.NetFx.wixext" />

20 <PackageReference Include="WixToolset.Util.wixext" />

21 </ItemGroup>

22 -</Project>

\ No newline at end of file

22 +</Project>

src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj

+2 -2

@@ -14,8 +14,8 @@

14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

15 </ItemGroup>

16 <ItemGroup>

17 - <PackageReference Include="WixToolset.Bal.wixext" />

17 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

18 <PackageReference Include="WixToolset.NetFx.wixext" />

19 <PackageReference Include="WixToolset.Util.wixext" />

20 </ItemGroup>

21 -</Project>

\ No newline at end of file

21 +</Project>

src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj

+2 -2

@@ -11,11 +11,11 @@

11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

12 </ItemGroup>

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 <PackageReference Include="WixToolset.NetFx.wixext" />

16 <PackageReference Include="WixToolset.Util.wixext" />

17 </ItemGroup>

18 <ItemGroup>

19 <WixExtension Include="$(ForTestingUseOnlyWixextPath)" />

20 </ItemGroup>

21 -</Project>

\ No newline at end of file

21 +</Project>

src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj

+2 -2

@@ -13,11 +13,11 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 <PackageReference Include="WixToolset.Util.wixext" />

19 </ItemGroup>

20 <ItemGroup>

21 <WixExtension Include="$(ForTestingUseOnlyWixextPath)" />

22 </ItemGroup>

23 -</Project>

\ No newline at end of file

23 +</Project>

src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj

+2 -2

@@ -13,11 +13,11 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 <PackageReference Include="WixToolset.Util.wixext" />

19 </ItemGroup>

20 <ItemGroup>

21 <WixExtension Include="$(ForTestingUseOnlyWixextPath)" />

22 </ItemGroup>

23 -</Project>

\ No newline at end of file

23 +</Project>

src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj

+2 -2

@@ -9,8 +9,8 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 <PackageReference Include="WixToolset.Util.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj

+2 -2

@@ -10,8 +10,8 @@

10 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 <PackageReference Include="WixToolset.NetFx.wixext" />

15 <PackageReference Include="WixToolset.Util.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj

+2 -2

@@ -10,8 +10,8 @@

10 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 <PackageReference Include="WixToolset.NetFx.wixext" />

15 <PackageReference Include="WixToolset.Util.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj

+2 -2

@@ -7,7 +7,7 @@

7 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

8 </ItemGroup>

9 <ItemGroup>

10 - <PackageReference Include="WixToolset.Bal.wixext" />

10 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

11 <PackageReference Include="WixToolset.NetFx.wixext" />

12 </ItemGroup>

13 -</Project>

\ No newline at end of file

13 +</Project>

src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj

+2 -2

@@ -10,7 +10,7 @@

10 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 <PackageReference Include="WixToolset.NetFx.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj

+2 -2

@@ -14,8 +14,8 @@

14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

15 </ItemGroup>

16 <ItemGroup>

17 - <PackageReference Include="WixToolset.Bal.wixext" />

17 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

18 <PackageReference Include="WixToolset.NetFx.wixext" />

19 <PackageReference Include="WixToolset.Util.wixext" />

20 </ItemGroup>

21 -</Project>

\ No newline at end of file

21 +</Project>

src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj

+2 -2

@@ -14,8 +14,8 @@

14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

15 </ItemGroup>

16 <ItemGroup>

17 - <PackageReference Include="WixToolset.Bal.wixext" />

17 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

18 <PackageReference Include="WixToolset.NetFx.wixext" />

19 <PackageReference Include="WixToolset.Util.wixext" />

20 </ItemGroup>

21 -</Project>

\ No newline at end of file

21 +</Project>

src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj

+2 -2

@@ -6,7 +6,7 @@

6 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

7 </ItemGroup>

8 <ItemGroup>

9 - <PackageReference Include="WixToolset.Bal.wixext" />

9 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

10 <PackageReference Include="WixToolset.NetFx.wixext" />

11 </ItemGroup>

12 -</Project>

\ No newline at end of file

12 +</Project>

src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj

+2 -2

@@ -9,7 +9,7 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj

+2 -2

@@ -13,8 +13,8 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 <PackageReference Include="WixToolset.Util.wixext" />

19 </ItemGroup>

20 -</Project>

\ No newline at end of file

20 +</Project>

src/test/burn/TestData/DependencyTests/BundleM/BundleM.wixproj

+2 -2

@@ -13,8 +13,8 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 <PackageReference Include="WixToolset.Util.wixext" />

19 </ItemGroup>

20 -</Project>

\ No newline at end of file

20 +</Project>

src/test/burn/TestData/DependencyTests/BundleNv1/BundleNv1.wixproj

+2 -2

@@ -7,7 +7,7 @@

7 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

8 </ItemGroup>

9 <ItemGroup>

10 - <PackageReference Include="WixToolset.Bal.wixext" />

10 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

11 <PackageReference Include="WixToolset.NetFx.wixext" />

12 </ItemGroup>

13 -</Project>

\ No newline at end of file

13 +</Project>

src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj

+2 -2

@@ -11,7 +11,7 @@

11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

12 </ItemGroup>

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 <PackageReference Include="WixToolset.NetFx.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj

+2 -2

@@ -11,7 +11,7 @@

11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

12 </ItemGroup>

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 <PackageReference Include="WixToolset.NetFx.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/ExePackageTests/BrokenPerUserArpEntryExePackage/BrokenPerUserArpEntryExePackage.wixproj

+2 -2

@@ -11,7 +11,7 @@

11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

12 </ItemGroup>

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 <PackageReference Include="WixToolset.NetFx.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wixproj

+2 -2

@@ -11,7 +11,7 @@

11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

12 </ItemGroup>

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 <PackageReference Include="WixToolset.NetFx.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackage/PerMachineArpEntryExePackage.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageFailure/PerMachineArpEntryExePackageFailure.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\PackageFail\PackageFail.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageUninstallFailure/PerMachineArpEntryExePackageUninstallFailure.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\PackageTestExe\PackageTestExe.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/ExePackageTests/PerMachineArpEntryWithUninstallStringExePackage/PerMachineArpEntryWithUninstallStringExePackage.wixproj

+1 -1

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 </Project>

src/test/burn/TestData/ExePackageTests/PerUserArpEntryExePackage/PerUserArpEntryExePackage.wixproj

+2 -2

@@ -11,7 +11,7 @@

11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

12 </ItemGroup>

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 <PackageReference Include="WixToolset.NetFx.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj

+2 -2

@@ -10,7 +10,7 @@

10 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 <PackageReference Include="WixToolset.NetFx.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj

+2 -2

@@ -13,10 +13,10 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 <Target Name="RemovePackageThatShouldBeMissing" AfterTargets="AfterBuild">

20 <Delete Files="$(OutputPath)MissingNonVital.msi" />

21 </Target>

22 -</Project>

\ No newline at end of file

22 +</Project>

src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj

+2 -2

@@ -12,8 +12,8 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 <PackageReference Include="WixToolset.Util.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj

+2 -2

@@ -9,8 +9,8 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 <PackageReference Include="WixToolset.Util.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj

+2 -2

@@ -9,8 +9,8 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 <PackageReference Include="WixToolset.Util.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/FilesInUseTests/BundleA/BundleA.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj

+2 -2

@@ -12,6 +12,6 @@

12 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj

+2 -2

@@ -6,7 +6,7 @@

6 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

7 </ItemGroup>

8 <ItemGroup>

9 - <PackageReference Include="WixToolset.Bal.wixext" />

9 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

10 <PackageReference Include="WixToolset.NetFx.wixext" />

11 </ItemGroup>

12 -</Project>

\ No newline at end of file

12 +</Project>

src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj

+2 -2

@@ -6,7 +6,7 @@

6 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

7 </ItemGroup>

8 <ItemGroup>

9 - <PackageReference Include="WixToolset.Bal.wixext" />

9 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

10 <PackageReference Include="WixToolset.NetFx.wixext" />

11 </ItemGroup>

12 -</Project>

\ No newline at end of file

12 +</Project>

src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj

+2 -2

@@ -9,7 +9,7 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/LayoutTests/BundleB/BundleB.wixproj

+2 -2

@@ -12,6 +12,6 @@

12 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/LongPathTests/NonCompressedBundle/NonCompressedBundle.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj

+1 -1

@@ -62,7 +62,7 @@

62 </ItemGroup>

63

64 <ItemGroup>

65 - <PackageReference Include="WixToolset.BalUtil" />

65 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

66 </ItemGroup>

67

68 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

src/test/burn/TestData/Manual/BundleA/BundleA.wixproj

+2 -2

@@ -14,9 +14,9 @@

14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

15 </ItemGroup>

16 <ItemGroup>

17 - <PackageReference Include="WixToolset.Bal.wixext" />

17 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

18 </ItemGroup>

19 <Target Name="CopyManualInstructions" AfterTargets="AfterBuild">

20 <Copy SourceFiles="ManualTests.txt" DestinationFiles="$(OutputPath)ManualTests.txt" />

21 </Target>

22 -</Project>

\ No newline at end of file

22 +</Project>

src/test/burn/TestData/Manual/BundleB/BundleB.wixproj

+1 -1

@@ -26,7 +26,7 @@

26

27 <ItemGroup>

28 <PackageReference Include="WixToolset.Heat" />

29 - <PackageReference Include="WixToolset.Bal.wixext" />

29 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

30 </ItemGroup>

31

32 <!-- We do this dynamically to avoid committing so many files to source control. -->

src/test/burn/TestData/Manual/BundleC/BundleC.wixproj

+2 -2

@@ -13,6 +13,6 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj

+2 -2

@@ -7,6 +7,6 @@

7 <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />

8 </ItemGroup>

9 <ItemGroup>

10 - <PackageReference Include="WixToolset.Bal.wixext" />

10 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

11 </ItemGroup>

12 -</Project>

\ No newline at end of file

12 +</Project>

src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj

+2 -2

@@ -10,6 +10,6 @@

10 <ProjectReference Include="..\PackageD\PackageD.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj

+2 -2

@@ -5,7 +5,7 @@

5 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />

6 </ItemGroup>

7 <ItemGroup>

8 - <PackageReference Include="WixToolset.Bal.wixext" />

8 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

9 <PackageReference Include="WixToolset.NetFx.wixext" />

10 </ItemGroup>

11 -</Project>

\ No newline at end of file

11 +</Project>

src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\PackageF\PackageF.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj

+2 -2

@@ -16,7 +16,7 @@

16 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

17 </ItemGroup>

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Bal.wixext" />

19 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

20 <PackageReference Include="WixToolset.NetFx.wixext" />

21 </ItemGroup>

22 -</Project>

\ No newline at end of file

22 +</Project>

src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj

+2 -2

@@ -14,7 +14,7 @@

14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

15 </ItemGroup>

16 <ItemGroup>

17 - <PackageReference Include="WixToolset.Bal.wixext" />

17 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

18 <PackageReference Include="WixToolset.NetFx.wixext" />

19 </ItemGroup>

20 -</Project>

\ No newline at end of file

20 +</Project>

src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj

+2 -2

@@ -18,7 +18,7 @@

18 <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />

19 </ItemGroup>

20 <ItemGroup>

21 - <PackageReference Include="WixToolset.Bal.wixext" />

21 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

22 <PackageReference Include="WixToolset.Util.wixext" />

23 </ItemGroup>

24 -</Project>

\ No newline at end of file

24 +</Project>

src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs

+1 -1

@@ -9,7 +9,7 @@

9 <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />

10 <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />

11 <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />

12 - <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />

12 + <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" />

13 <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />

14

15 <bal:WixPrerequisiteBootstrapperApplication />

src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj

+2 -2

@@ -18,7 +18,7 @@

18 <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />

19 </ItemGroup>

20 <ItemGroup>

21 - <PackageReference Include="WixToolset.Bal.wixext" />

21 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

22 <PackageReference Include="WixToolset.Util.wixext" />

23 </ItemGroup>

24 -</Project>

\ No newline at end of file

24 +</Project>

src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs

+1 -1

@@ -8,7 +8,7 @@

8 <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />

9 <Payload Name="TestBA.exe.config" SourceFile="bad.config" />

10 <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />

11 - <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />

11 + <Payload SourceFile="!(bindpath.net2x86)\WixToolset.BootstrapperApplicationApi.dll" />

12 <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />

13

14 <bal:WixPrerequisiteBootstrapperApplication />

src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj

+2 -2

@@ -18,7 +18,7 @@

18 <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />

19 </ItemGroup>

20 <ItemGroup>

21 - <PackageReference Include="WixToolset.Bal.wixext" />

21 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

22 <PackageReference Include="WixToolset.Util.wixext" />

23 </ItemGroup>

24 -</Project>

\ No newline at end of file

24 +</Project>

src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs

+1 -1

@@ -8,7 +8,7 @@

8 <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />

9 <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />

10 <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />

11 - <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />

11 + <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" />

12 <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />

13

14 <bal:WixPrerequisiteBootstrapperApplication />

src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj

+2 -2

@@ -18,7 +18,7 @@

18 <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />

19 </ItemGroup>

20 <ItemGroup>

21 - <PackageReference Include="WixToolset.Bal.wixext" />

21 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

22 <PackageReference Include="WixToolset.Util.wixext" />

23 </ItemGroup>

24 -</Project>

\ No newline at end of file

24 +</Project>

src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs

+1 -1

@@ -7,7 +7,7 @@

7 <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />

8 <Payload Name="TestBA.exe.config" SourceFile="bad.config" />

9 <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />

10 - <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />

10 + <Payload SourceFile="!(bindpath.net2x86)\WixToolset.BootstrapperApplicationApi.dll" />

11 <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />

12

13 <bal:WixPrerequisiteBootstrapperApplication />

src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj

+2 -2

@@ -16,7 +16,7 @@

16 <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />

17 </ItemGroup>

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Bal.wixext" />

19 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

20 <PackageReference Include="WixToolset.Util.wixext" />

21 </ItemGroup>

22 -</Project>

\ No newline at end of file

22 +</Project>

src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs

+1 -1

@@ -8,7 +8,7 @@

8 <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />

9 <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />

10 <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />

11 - <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />

11 + <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" />

12 <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />

13 </BootstrapperApplication>

14 </Fragment>

src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj

+1 -1

@@ -59,7 +59,7 @@

59 </ItemGroup>

60

61 <ItemGroup>

62 - <PackageReference Include="WixToolset.BalUtil" />

62 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

63 </ItemGroup>

64

65 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj

+2 -2

@@ -15,6 +15,6 @@

15 <ProjectReference Include="..\PackageF\PackageF.wixproj" />

16 </ItemGroup>

17 <ItemGroup>

18 - <PackageReference Include="WixToolset.Bal.wixext" />

18 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

19 </ItemGroup>

20 -</Project>

\ No newline at end of file

20 +</Project>

src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj

+2 -2

@@ -14,7 +14,7 @@

14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

15 </ItemGroup>

16 <ItemGroup>

17 - <PackageReference Include="WixToolset.Bal.wixext" />

17 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

18 <PackageReference Include="WixToolset.NetFx.wixext" />

19 </ItemGroup>

20 -</Project>

\ No newline at end of file

20 +</Project>

src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj

+2 -2

@@ -15,7 +15,7 @@

15 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

16 </ItemGroup>

17 <ItemGroup>

18 - <PackageReference Include="WixToolset.Bal.wixext" />

18 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

19 <PackageReference Include="WixToolset.NetFx.wixext" />

20 </ItemGroup>

21 -</Project>

\ No newline at end of file

21 +</Project>

src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj

+2 -2

@@ -13,7 +13,7 @@

13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

14 </ItemGroup>

15 <ItemGroup>

16 - <PackageReference Include="WixToolset.Bal.wixext" />

16 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

17 <PackageReference Include="WixToolset.NetFx.wixext" />

18 </ItemGroup>

19 -</Project>

\ No newline at end of file

19 +</Project>

src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs

+2 -2

@@ -6,7 +6,7 @@

6 <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />

7 <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />

8 <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />

9 - <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />

9 + <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" />

10 </BootstrapperApplication>

11

12 <PackageGroup Id="TestBAdnc">

@@ -17,7 +17,7 @@

17 <BootstrapperApplication SourceFile="!(bindpath.net2x86)\TestBA.exe">

18 <Payload SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />

19 <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />

20 - <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />

20 + <Payload SourceFile="!(bindpath.net2x86)\WixToolset.BootstrapperApplicationApi.dll" />

21 </BootstrapperApplication>

22

23 <PackageGroup Id="TestBA">

src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs

+1 -1

@@ -4,7 +4,7 @@

4 <BootstrapperApplication SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe">

5 <Payload SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe.config" />

6 <Payload SourceFile="!(bindpath.net4x86)\mbanative.dll" />

7 - <Payload SourceFile="!(bindpath.net4x86)\WixToolset.Mba.Core.dll" />

7 + <Payload SourceFile="!(bindpath.net4x86)\WixToolset.BootstrapperApplicationApi.dll" />

8 <Payload SourceFile='..\..\..\..\..\..\License.txt' />

9 </BootstrapperApplication>

10

src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj

+2 -2

@@ -16,7 +16,7 @@

16 <ProjectReference Include="..\..\..\WixToolset.WixBA\WixToolset.WixBA.csproj" />

17 </ItemGroup>

18 <ItemGroup>

19 - <PackageReference Include="WixToolset.Bal.wixext" />

19 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

20 <PackageReference Include="WixToolset.Netfx.wixext" />

21 </ItemGroup>

22 -</Project>

\ No newline at end of file

22 +</Project>

src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs

+2 -2

@@ -6,7 +6,7 @@

6 <Payload SourceFile="!(bindpath.dncx64)\TestBA.dll" />

7 <Payload SourceFile="!(bindpath.dncx64)\TestBA.runtimeconfig.json" />

8 <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />

9 - <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />

9 + <Payload SourceFile="!(bindpath.dncx64)\WixToolset.BootstrapperApplicationApi.dll" />

10 </BootstrapperApplication>

11

12 <PackageGroup Id="TestBAdnc_x64">

@@ -17,7 +17,7 @@

17 <BootstrapperApplication SourceFile="!(bindpath.net2x64)\TestBA.exe">

18 <Payload SourceFile="!(bindpath.net2x64)\TestBA.exe.config" />

19 <Payload SourceFile="!(bindpath.net2x64)\mbanative.dll" />

20 - <Payload SourceFile="!(bindpath.net2x64)\WixToolset.Mba.Core.dll" />

20 + <Payload SourceFile="!(bindpath.net2x64)\WixToolset.BootstrapperApplicationApi.dll" />

21 </BootstrapperApplication>

22

23 <PackageGroup Id="TestBA_x64">

src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs

+1 -1

@@ -6,7 +6,7 @@

6 <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.dll" />

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" />

9 + <Payload SourceFile="!(bindpath.dncx64)\WixToolset.BootstrapperApplicationApi.dll" />

10 <Payload SourceFile='..\..\..\..\..\..\License.txt' />

11 </BootstrapperApplication>

12

src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj

+3 -3

@@ -13,7 +13,7 @@

13 </ItemGroup>

14 <ItemGroup>

15 <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />

16 - <!-- An alternative to the above line is to explicitly reference projects with

16 + <!-- An alternative to the above line is to explicitly reference projects with

17 the required target framework. Since we want all target frameworks built,

18 the above line is shorter.

19 <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj">

@@ -28,7 +28,7 @@

28 <ProjectReference Include="..\..\..\WixToolset.WixBA\WixToolset.WixBA_x64.csproj" />

29 </ItemGroup>

30 <ItemGroup>

31 - <PackageReference Include="WixToolset.Bal.wixext" />

31 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

32 <PackageReference Include="WixToolset.Netfx.wixext" />

33 </ItemGroup>

34 -</Project>

\ No newline at end of file

34 +</Project>

src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj

+2 -2

@@ -6,7 +6,7 @@

6 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

7 </ItemGroup>

8 <ItemGroup>

9 - <PackageReference Include="WixToolset.Bal.wixext" />

9 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

10 <PackageReference Include="WixToolset.NetFx.wixext" />

11 </ItemGroup>

12 -</Project>

\ No newline at end of file

12 +</Project>

src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj

+2 -2

@@ -9,7 +9,7 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj

+2 -2

@@ -9,10 +9,10 @@

9 <Feeds Include="*.xml" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 </ItemGroup>

15 <Target Name="CopyFeeds" AfterTargets="AfterBuild">

16 <Copy SourceFiles="@(Feeds)" DestinationFolder="$(OutputPath)" />

17 </Target>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj

+2 -2

@@ -12,7 +12,7 @@

12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 <PackageReference Include="WixToolset.NetFx.wixext" />

17 </ItemGroup>

18 -</Project>

\ No newline at end of file

18 +</Project>

src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj

+2 -2

@@ -6,7 +6,7 @@

6 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

7 </ItemGroup>

8 <ItemGroup>

9 - <PackageReference Include="WixToolset.Bal.wixext" />

9 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

10 <PackageReference Include="WixToolset.NetFx.wixext" />

11 </ItemGroup>

12 -</Project>

\ No newline at end of file

12 +</Project>

src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1x64/BundleAv1x64.wixproj

+3 -3

@@ -7,10 +7,10 @@

7 </PropertyGroup>

8 <ItemGroup>

9 <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />

10 - <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

10 + <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 <PackageReference Include="WixToolset.NetFx.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj

+2 -2

@@ -9,7 +9,7 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj

+2 -2

@@ -9,7 +9,7 @@

9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 <PackageReference Include="WixToolset.NetFx.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj

+3 -3

@@ -8,10 +8,10 @@

8 </PropertyGroup>

9 <ItemGroup>

10 <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />

11 - <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

11 + <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />

12 </ItemGroup>

13 <ItemGroup>

14 - <PackageReference Include="WixToolset.Bal.wixext" />

14 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

15 <PackageReference Include="WixToolset.NetFx.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj

+2 -2

@@ -10,7 +10,7 @@

10 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 <PackageReference Include="WixToolset.NetFx.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj

+2 -2

@@ -10,7 +10,7 @@

10 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 <PackageReference Include="WixToolset.NetFx.wixext" />

15 </ItemGroup>

16 -</Project>

\ No newline at end of file

16 +</Project>

src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj

+2 -2

@@ -9,6 +9,6 @@

9 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 </ItemGroup>

14 -</Project>

\ No newline at end of file

14 +</Project>

src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj

+2 -2

@@ -12,6 +12,6 @@

12 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wixproj

+2 -2

@@ -12,6 +12,6 @@

12 <ProjectReference Include="..\InternalUIx86Package\InternalUIx86Package.wixproj" />

13 </ItemGroup>

14 <ItemGroup>

15 - <PackageReference Include="WixToolset.Bal.wixext" />

15 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

16 </ItemGroup>

17 -</Project>

\ No newline at end of file

17 +</Project>

src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wixproj

+2 -2

@@ -10,6 +10,6 @@

10 <ProjectReference Include="..\InternalUIPackage\InternalUIPackage.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wixproj

+2 -2

@@ -9,6 +9,6 @@

9 <ProjectReference Include="..\InternalUIPackage\InternalUIPackage.wixproj" />

10 </ItemGroup>

11 <ItemGroup>

12 - <PackageReference Include="WixToolset.Bal.wixext" />

12 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

13 </ItemGroup>

14 -</Project>

\ No newline at end of file

14 +</Project>

src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj

+2 -2

@@ -10,6 +10,6 @@

10 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj

+2 -2

@@ -10,6 +10,6 @@

10 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj

+2 -2

@@ -10,6 +10,6 @@

10 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj

+2 -2

@@ -10,6 +10,6 @@

10 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

11 </ItemGroup>

12 <ItemGroup>

13 - <PackageReference Include="WixToolset.Bal.wixext" />

13 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

14 </ItemGroup>

15 -</Project>

\ No newline at end of file

15 +</Project>

src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj

+2 -2

@@ -15,6 +15,6 @@

15 <ProjectReference Include="..\PackageA\PackageA.wixproj" />

16 </ItemGroup>

17 <ItemGroup>

18 - <PackageReference Include="WixToolset.Bal.wixext" />

18 + <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />

19 </ItemGroup>

20 -</Project>

\ No newline at end of file

20 +</Project>

src/test/burn/WixTestTools/WixTestTools.csproj

+1 -1

@@ -26,7 +26,7 @@

26 <PackageReference Include="System.Security.Principal.Windows" />

27 <PackageReference Include="WixInternal.TestSupport" />

28 <PackageReference Include="WixToolset.Data" />

29 - <PackageReference Include="WixToolset.Mba.Core" />

29 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

30 </ItemGroup>

31

32 <ItemGroup>

src/test/burn/WixToolset.WixBA/InstallationViewModel.cs

+1 -1

@@ -10,7 +10,7 @@ namespace WixToolset.WixBA

10 using System.Windows;

11 using System.Windows.Input;

12 using IO = System.IO;

13 - using WixToolset.Mba.Core;

13 + using WixToolset.BootstrapperApplicationApi;

14

15 /// <summary>

16 /// The states of detection.

src/test/burn/WixToolset.WixBA/Model.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolset.WixBA

5 using System;

6 using System.Collections.Generic;

7 using System.Net;

8 - using WixToolset.Mba.Core;

8 + using WixToolset.BootstrapperApplicationApi;

9

10 /// <summary>

11 /// The model.

src/test/burn/WixToolset.WixBA/Program.cs

+1 -1

@@ -2,7 +2,7 @@

2

3 namespace WixToolset.WixBA

4 {

5 - using WixToolset.Mba.Core;

5 + using WixToolset.BootstrapperApplicationApi;

6

7 internal class Program

8 {

src/test/burn/WixToolset.WixBA/ProgressViewModel.cs

+1 -1

@@ -5,7 +5,7 @@ using System.Collections.Generic;

5 using System.ComponentModel;

6 using System.Diagnostics;

7 using System.Text.RegularExpressions;

8 -using WixToolset.Mba.Core;

8 +using WixToolset.BootstrapperApplicationApi;

9

10 namespace WixToolset.WixBA

11 {

src/test/burn/WixToolset.WixBA/RootViewModel.cs

+1 -1

@@ -6,7 +6,7 @@ namespace WixToolset.WixBA

6 using System.Windows;

7 using System.Windows.Input;

8 using System.Windows.Threading;

9 - using WixToolset.Mba.Core;

9 + using WixToolset.BootstrapperApplicationApi;

10

11 /// <summary>

12 /// The errors returned from the engine

src/test/burn/WixToolset.WixBA/UpdateViewModel.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolset.WixBA

5 using System;

6 using System.ComponentModel;

7 using System.Windows.Input;

8 - using WixToolset.Mba.Core;

8 + using WixToolset.BootstrapperApplicationApi;

9

10 /// <summary>

11 /// The states of the update view model.

src/test/burn/WixToolset.WixBA/WixBA.BootstrapperCore.config deleted

-16

@@ -1,16 +0,0 @@

1 -<?xml version="1.0" encoding="utf-8" ?>

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 -

4 -<configuration>

5 - <configSections>

6 - <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Host.BootstrapperSectionGroup, WixToolset.Mba.Host">

7 - <section name="host" type="WixToolset.Mba.Host.HostSection, WixToolset.Mba.Host" />

8 - </sectionGroup>

9 - </configSections>

10 - <startup useLegacyV2RuntimeActivationPolicy="true">

11 - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />

12 - </startup>

13 - <wix.bootstrapper>

14 - <host assemblyName="WixToolset.WixBA" />

15 - </wix.bootstrapper>

16 -</configuration>

src/test/burn/WixToolset.WixBA/WixBA.cs

+1 -1

@@ -8,7 +8,7 @@ namespace WixToolset.WixBA

8 using System.IO;

9 using System.Net;

10 using System.Text;

11 - using WixToolset.Mba.Core;

11 + using WixToolset.BootstrapperApplicationApi;

12

13 using Threading = System.Windows.Threading;

14 using WinForms = System.Windows.Forms;

src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj

+1 -5

@@ -23,10 +23,6 @@

23 <UseWindowsForms>true</UseWindowsForms>

24 </PropertyGroup>

25

26 - <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'=='.NETFramework' ">

27 - <Content Include="WixBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />

28 - </ItemGroup>

29 -

26 <ItemGroup>

27 <Resource Include="Resources\logo-white-hollow.png" />

28 <Resource Include="Resources\logo-black-hollow.png" />

@@ -41,6 +37,6 @@

37 </ItemGroup>

38

39 <ItemGroup>

44 - <PackageReference Include="WixToolset.Mba.Core" />

40 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

41 </ItemGroup>

42 </Project>

src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj

+1 -5

@@ -23,10 +23,6 @@

23 <UseWindowsForms>true</UseWindowsForms>

24 </PropertyGroup>

25

26 - <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'=='.NETFramework' ">

27 - <Content Include="WixBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />

28 - </ItemGroup>

29 -

26 <ItemGroup>

27 <Resource Include="Resources\logo-white-hollow.png" />

28 <Resource Include="Resources\logo-black-hollow.png" />

@@ -41,6 +37,6 @@

37 </ItemGroup>

38

39 <ItemGroup>

44 - <PackageReference Include="WixToolset.Mba.Core" />

40 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

41 </ItemGroup>

42 </Project>

src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.BurnE2E

5 using System;

6 using System.IO;

7 using WixTestTools;

8 - using WixToolset.Mba.Core;

8 + using WixToolset.BootstrapperApplicationApi;

9 using Xunit;

10 using Xunit.Abstractions;

11

src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs

+1 -1

@@ -8,7 +8,7 @@ namespace WixToolsetTest.BurnE2E

8 using Microsoft.Win32;

9 using WixInternal.TestSupport;

10 using WixTestTools;

11 - using WixToolset.Mba.Core;

11 + using WixToolset.BootstrapperApplicationApi;

12 using Xunit;

13 using Xunit.Abstractions;

14

src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs

+2 -2

@@ -4,7 +4,7 @@ namespace WixToolsetTest.BurnE2E

4 {

5 using System;

6 using WixTestTools;

7 - using WixToolset.Mba.Core;

7 + using WixToolset.BootstrapperApplicationApi;

8 using Xunit;

9 using Xunit.Abstractions;

10

@@ -170,7 +170,7 @@ namespace WixToolsetTest.BurnE2E

170 packageAv2.VerifyInstalled(true);

171 bundleAv2.VerifyPackageIsCached("PackageA");

172 bundleAv1.VerifyExeTestRegistryValue(testRegistryValueExe, "2.0.0.0");

173 -

173 +

174 // Verify https://github.com/wixtoolset/issues/issues/3190

175 bundleB.Uninstall();

176

src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs

+1 -1

@@ -3,7 +3,7 @@

3 namespace WixToolsetTest.BurnE2E

4 {

5 using WixTestTools;

6 - using WixToolset.Mba.Core;

6 + using WixToolset.BootstrapperApplicationApi;

7 using Xunit;

8 using Xunit.Abstractions;

9

src/test/burn/WixToolsetTest.BurnE2E/FailureTests.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.BurnE2E

4 {

5 using System.Threading;

6 using WixTestTools;

7 - using WixToolset.Mba.Core;

7 + using WixToolset.BootstrapperApplicationApi;

8 using Xunit;

9 using Xunit.Abstractions;

10

src/test/burn/WixToolsetTest.BurnE2E/FeatureTests.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.BurnE2E

5 using System;

6 using System.IO;

7 using WixTestTools;

8 - using WixToolset.Mba.Core;

8 + using WixToolset.BootstrapperApplicationApi;

9 using Xunit;

10 using Xunit.Abstractions;

11

src/test/burn/WixToolsetTest.BurnE2E/LongPathTests.cs

+1 -1

@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E

9 using Microsoft.Win32;

10 using WixInternal.TestSupport;

11 using WixTestTools;

12 - using WixToolset.Mba.Core;

12 + using WixToolset.BootstrapperApplicationApi;

13 using Xunit;

14 using Xunit.Abstractions;

15

src/test/burn/WixToolsetTest.BurnE2E/RegistrationTests.cs

+1 -1

@@ -4,7 +4,7 @@ namespace WixToolsetTest.BurnE2E

4 {

5 using System;

6 using WixTestTools;

7 - using WixToolset.Mba.Core;

7 + using WixToolset.BootstrapperApplicationApi;

8 using Xunit;

9 using Xunit.Abstractions;

10

src/test/burn/WixToolsetTest.BurnE2E/SlipstreamTests.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.BurnE2E

5 using System;

6 using System.IO;

7 using WixTestTools;

8 - using WixToolset.Mba.Core;

8 + using WixToolset.BootstrapperApplicationApi;

9 using Xunit;

10 using Xunit.Abstractions;

11

src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs

+1 -1

@@ -5,7 +5,7 @@ namespace WixToolsetTest.BurnE2E

5 using System;

6 using Microsoft.Win32;

7 using WixTestTools;

8 - using WixToolset.Mba.Core;

8 + using WixToolset.BootstrapperApplicationApi;

9

10 public class TestBAController : IDisposable

11 {

src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs

+1 -1

@@ -6,7 +6,7 @@ namespace WixToolsetTest.BurnE2E

6 using System.IO;

7 using WixInternal.TestSupport;

8 using WixTestTools;

9 - using WixToolset.Mba.Core;

9 + using WixToolset.BootstrapperApplicationApi;

10 using Xunit;

11 using Xunit.Abstractions;

12

src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj

+1 -1

@@ -22,6 +22,6 @@

22 <PackageReference Include="System.Security.Principal.Windows" />

23 <PackageReference Include="WixInternal.TestSupport" />

24 <PackageReference Include="WixToolset.Data" />

25 - <PackageReference Include="WixToolset.Mba.Core" />

25 + <PackageReference Include="WixToolset.BootstrapperApplicationApi" />

26 </ItemGroup>

27 </Project>