3cb9bbe9 · joebigelow/wix-1 · siGit Code & Deploy

src/ext/Bal/bal.cmd

+32 -11

@@ -3,35 +3,56 @@

3

4 @set _C=Debug

5 @set _L=%~dp0..\..\..\build\logs

6 +

7 :parse_args

8 @if /i "%1"=="release" set _C=Release

9 +@if /i "%1"=="inc" set _INC=1

10 +@if /i "%1"=="clean" set _CLEAN=1

11 @if not "%1"=="" shift & goto parse_args

12

13 +@set _B=%~dp0..\..\..\build\Bal.wixext\%_C%

14 +

15 +:: Clean

16 +

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

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

19 +

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

21

22 :: Restore

23 nuget restore dnchost\packages.config || exit /b

14 -msbuild -t:Restore -p:Configuration=%_C% || exit /b

24

25 :: Build

17 -msbuild -p:Configuration=%_C%;Platform=x86 test\examples\TestEngine\Example.TestEngine.vcxproj || exit /b

18 -msbuild -p:Configuration=%_C%;Platform=x64 test\examples\TestEngine\Example.TestEngine.vcxproj || exit /b

19 -msbuild -p:Configuration=%_C%;Platform=ARM64 test\examples\TestEngine\Example.TestEngine.vcxproj || exit /b

20 -

21 -msbuild -p:Configuration=%_C% -bl:%_L%\bal_build.binlog || exit /b

22 -

23 -dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" || exit /b

26 +msbuild -Restore -p:Configuration=%_C% -bl:%_L%\ext_bal_build.binlog || exit /b

27

25 -msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -bl:%_L%\bal_examples_build.binlog || exit /b

28 +msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -m -bl:%_L%\bal_examples_build.binlog || exit /b

29

30 :: Test

28 -dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" || exit /b

29 -dotnet test test\WixToolsetTest.ManagedHost -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.ManagedHost.trx" || exit /b

31 +dotnet test ^

32 + %_B%\net6.0\WixToolsetTest.Dnc.HostGenerator.dll ^

33 + %_B%\net6.0\WixToolsetTest.Bal.dll ^

34 + %_B%\net6.0\WixToolsetTest.ManagedHost.dll ^

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

36

37 :: Pack

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

39 msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj || exit /b

40 msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b

41

42 +@goto :end

43 +

44 +:clean

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

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

47 +@del "..\..\..\build\artifacts\WixToolset.Dnc.HostGenerator.*.nupkg" 2> nul

48 +@del "..\..\..\build\artifacts\WixToolset.Mba.Host.*.nupkg" 2> nul

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

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

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

52 +@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.dnc.hostgenerator" 2> nul

53 +@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.mba.host" 2> nul

54 +@exit /b

55 +

56 +:end

57 @popd

58 @endlocal

src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj

+3 -1

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

8 </PropertyGroup>

9

10 <ItemGroup>

11 - <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" ReferenceOutputAssembly="false" />

11 + <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />

12 + <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />

13 + <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />

14 </ItemGroup>

15

16 <ItemGroup>

src/ext/Bal/wixlib/BalExtension_platform.wxi

+5 -5

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

6

7 <Fragment>

8 <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)">

9 - <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\dnchost.dll" />

10 - <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="dncpreq.dll" />

9 + <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.dnchost.$(var.platform))\dnchost.dll" />

10 + <Payload SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" Name="dncpreq.dll" />

11 </BootstrapperApplication>

12 </Fragment>

13

@@ -20,8 +20,8 @@

20

21 <Fragment>

22 <BootstrapperApplication Id="WixInternalUIBootstrapperApplication$(var.Suffix)">

23 - <BootstrapperApplicationDll Id="WixInternalUIBootstrapperApplication" SourceFile="!(bindpath.$(var.platform))\wixiuiba.dll" />

24 - <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="prereqba.dll" />

23 + <BootstrapperApplicationDll Id="WixInternalUIBootstrapperApplication" SourceFile="!(bindpath.wixiuiba.$(var.platform))\wixiuiba.dll" />

24 + <Payload SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" Name="prereqba.dll" />

25 </BootstrapperApplication>

26 </Fragment>

27

@@ -34,7 +34,7 @@

34

35 <Fragment>

36 <BootstrapperApplication Id="WixStandardBootstrapperApplication$(var.Suffix)">

37 - <BootstrapperApplicationDll Id="WixStandardBootstrapperApplication" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />

37 + <BootstrapperApplicationDll Id="WixStandardBootstrapperApplication" SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" />

38 </BootstrapperApplication>

39 </Fragment>

40

src/ext/Bal/wixlib/Mbahost_platform.wxi

+2 -2

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

6

7 <Fragment>

8 <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)">

9 - <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" />

10 - <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" />

9 + <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.mbahost.$(var.platform))\mbahost.dll" />

10 + <Payload SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" />

11 <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" />

12 </BootstrapperApplication>

13 </Fragment>

src/ext/Bal/wixlib/bal.wixproj

+4 -16

@@ -8,26 +8,14 @@

8

9 <ItemGroup>

10 <BindPath Include="..\wixstdba\Resources\" />

11 - <BindPath Include="$(OutputPath)net6.0" />

11 <BindPath Include="$(OutputPath)net20" />

13 - <BindPath Include="$(OutputPath)x86" BindName="x86" />

14 - <BindPath Include="$(OutputPath)x64" BindName="x64" />

15 - <BindPath Include="$(OutputPath)arm64" BindName="arm64" />

12 </ItemGroup>

13

14 <ItemGroup>

19 - <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />

20 - <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />

21 - <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />

22 - <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />

23 - <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />

24 - <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />

25 - <ProjectReference Include="..\wixiuiba\wixiuiba.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />

26 - <ProjectReference Include="..\wixiuiba\wixiuiba.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />

27 - <ProjectReference Include="..\wixiuiba\wixiuiba.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />

28 - <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />

29 - <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />

30 - <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />

15 + <ProjectReference Include="..\dnchost\dnchost.vcxproj" Platforms="arm64,x86,x64" />

16 + <ProjectReference Include="..\mbahost\mbahost.vcxproj" Platforms="arm64,x86,x64" />

17 + <ProjectReference Include="..\wixiuiba\wixiuiba.vcxproj" Platforms="arm64,x86,x64" />

18 + <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Platforms="arm64,x86,x64" />

19 </ItemGroup>

20

21 <ItemGroup>

src/ext/NetFx/netfx.cmd

+25 -3

@@ -3,24 +3,46 @@

3

4 @set _C=Debug

5 @set _L=%~dp0..\..\..\build\logs

6 +

7 :parse_args

8 @if /i "%1"=="release" set _C=Release

9 +@if /i "%1"=="inc" set _INC=1

10 +@if /i "%1"=="clean" set _CLEAN=1

11 @if not "%1"=="" shift & goto parse_args

12

13 +@set _B=%~dp0..\..\..\build\NetFx.wixext\%_C%

14 +

15 +:: Clean

16 +

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

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

19 +

20 @echo NetFx.wixext build %_C%

21

22 :: Restore

23 nuget restore netcoresearch\packages.config || exit /b

14 -msbuild -t:Restore -p:Configuration=%_C% || exit /b

24

25 :: Build

17 -msbuild -p:Configuration=%_C% -bl:%_L%\netfx_build.binlog || exit /b

26 +msbuild -Restore -p:Configuration=%_C% -bl:%_L%\ext_netfx_build.binlog || exit /b

27

28 :: Test

20 -dotnet test -c %_C% --no-build test\WixToolsetTest.Netfx || exit /b

29 +dotnet test ^

30 + %_B%\net6.0\WixToolsetTest.NetFx.dll ^

31 + --nologo -l "trx;LogFileName=%_L%\TestResults\netfx.wixext.trx" || exit /b

32

33 :: Pack

34 msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Netfx.wixext.csproj || exit /b

35

36 +@goto :end

37 +

38 +:clean

39 +@rd /s/q "..\..\build\NetFx.wixext" 2> nul

40 +@del "..\..\build\artifacts\WixToolset.NetFx.wixext.*.nupkg" 2> nul

41 +@del "%_L%\ext_netfx_build.binlog" 2> nul

42 +@del "%_L%\TestResults\netfx.wixext.trx" 2> nul

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

44 +@exit /b

45 +

46 +:end

47 @popd

48 @endlocal

src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi

+1 -1

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

28

29

30 <Fragment>

31 - <Binary Id="$(var.Prefix)NetFxCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))netfxca.dll" />

31 + <Binary Id="$(var.Prefix)NetFxCA$(var.Suffix)" SourceFile="!(bindpath.netfxca.$(var.platform))netfxca.dll" />

32 <Binary Id="$(var.Prefix)NetCheck_x86" SourceFile="!(bindpath.x86)NetCoreCheck.exe" />

33 <Binary Id="$(var.Prefix)NetCheck_x64" SourceFile="!(bindpath.x64)NetCoreCheck.exe" />

34 <Binary Id="$(var.Prefix)NetCheck_arm64" SourceFile="!(bindpath.arm64)NetCoreCheck.exe" />

src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi

+3 -3

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

5 <?include ..\..\caDecor.wxi ?>

6

7 <Fragment>

8 - <BundleExtension Id="$(var.Prefix)NetfxBundleExtension$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))netfxbe.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\netfxbe.dll">

8 + <BundleExtension Id="$(var.Prefix)NetfxBundleExtension$(var.Suffix)" SourceFile="!(bindpath.netfxbe.$(var.platform))netfxbe.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\netfxbe.dll">

9 <?foreach PLATFORM in x86;x64;arm64?>

10 - <Payload SourceFile="!(bindpath.$(var.PLATFORM))netcoresearch.exe" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\netcoresearch.exe" />

11 - <Payload SourceFile="!(bindpath.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" />

10 + <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))netcoresearch.exe" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\netcoresearch.exe" />

11 + <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" />

12 <?endforeach?>

13 </BundleExtension>

14 </Fragment>

src/ext/NetFx/wixlib/netfx.wixproj

+6 -15

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

8 </PropertyGroup>

9

10 <ItemGroup>

11 - <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />

12 - <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />

13 - <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />

14 - <BindInputPaths Include="$(PkgMicrosoft_NET_Tools_NETCoreCheck_x86)\win-x86" BindName='x86' />

15 - <BindInputPaths Include="$(PkgMicrosoft_NET_Tools_NETCoreCheck_x64)\win-x64" BindName='x64' />

16 - <BindInputPaths Include="$(PkgMicrosoft_NET_Tools_NETCoreCheck_arm64)\win-arm64" BindName='arm64' />

11 + <BindPath Include="$(PkgMicrosoft_NET_Tools_NETCoreCheck_x86)\win-x86" BindName='x86' />

12 + <BindPath Include="$(PkgMicrosoft_NET_Tools_NETCoreCheck_x64)\win-x64" BindName='x64' />

13 + <BindPath Include="$(PkgMicrosoft_NET_Tools_NETCoreCheck_arm64)\win-arm64" BindName='arm64' />

14 </ItemGroup>

15

16 <ItemGroup>

20 - <ProjectReference Include="..\be\netfxbe.vcxproj" Properties="Platform=ARM64" />

21 - <ProjectReference Include="..\be\netfxbe.vcxproj" Properties="Platform=x64" />

22 - <ProjectReference Include="..\be\netfxbe.vcxproj" Properties="Platform=x86" />

23 - <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" />

24 - <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" />

25 - <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" />

26 - <ProjectReference Include="..\netcoresearch\netcoresearch.vcxproj" Properties="Platform=ARM64" />

27 - <ProjectReference Include="..\netcoresearch\netcoresearch.vcxproj" Properties="Platform=x86" />

28 - <ProjectReference Include="..\netcoresearch\netcoresearch.vcxproj" Properties="Platform=x64" />

17 + <ProjectReference Include="..\be\netfxbe.vcxproj" Platforms="arm64,x86,x64" />

18 + <ProjectReference Include="..\ca\netfxca.vcxproj" Platforms="arm64,x86,x64" />

19 + <ProjectReference Include="..\netcoresearch\netcoresearch.vcxproj" Platforms="arm64,x86,x64" />

20 </ItemGroup>

21

22 <ItemGroup>

src/ext/UI/ui.cmd

+4 -1

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

8 @if /i "%1"=="clean" set _CLEAN=1

9 @if not "%1"=="" shift & goto parse_args

10

11 +@set _B=%~dp0..\..\..\build\UI.wixext\%_C%

12 +

13 :: Clean

14

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

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

18 @echo UI.wixext build %_C%

19

20 :: Build

19 -msbuild -Restore -p:Configuration=%_C% || exit /b

21 +msbuild -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\ext_ui_build.binlog || exit /b

22

23 :: Test

24 :: dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b

@@ -29,6 +31,7 @@ msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixex

31 :clean

32 @rd /s/q "..\..\..\build\UI.wixext" 2> nul

33 @del "..\..\..\build\artifacts\WixToolset.UI.wixext.*.nupkg" 2> nul

34 +@del "%_L%\ext_ui_build.binlog" 2> nul

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

36 @exit /b

37

src/ext/UI/wixlib/Common_Platform.wxi

+1 -1

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

13 </Fragment>

14

15 <Fragment>

16 - <Binary Id="WixUiCa$(Suffix)" SourceFile="!(bindpath.$(platform))uica.dll" />

16 + <Binary Id="WixUiCa$(Suffix)" SourceFile="!(bindpath.uica.$(platform))uica.dll" />

17 </Fragment>

18 </Include>

src/ext/UI/wixlib/ui.wixproj

+5 -8

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

5 <BindFiles>true</BindFiles>

6 <Cultures>en-us</Cultures>

7 </PropertyGroup>

8 +

9 <PropertyGroup>

10 <DefineConstants>

11 $(DefineConstants);

@@ -17,19 +18,15 @@

18 upIco=$(MSBuildProjectDirectory)\Bitmaps\up.ico;

19 </DefineConstants>

20 </PropertyGroup>

20 - <ItemGroup>

21 - <BindInputPaths Include="$(OutputPath)x86" BindName="x86" />

22 - <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />

23 - <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />

24 - </ItemGroup>

21 +

22 <ItemGroup>

23 <Content Include="Common_Platform.wxi" />

24 </ItemGroup>

25 +

26 <ItemGroup>

29 - <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x86" />

30 - <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x64" />

31 - <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=ARM64" />

27 + <ProjectReference Include="..\ca\uica.vcxproj" Platforms="arm64,x86,x64" />

28 </ItemGroup>

29 +

30 <ItemGroup>

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

32 </ItemGroup>

src/ext/Util/util.cmd

+2 -1

@@ -20,7 +20,7 @@

20 @echo Building ext\Util %_C% using %_N%

21

22 :: Build

23 -msbuild -Restore -p:Configuration=%_C% || exit /b

23 +msbuild -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\ext_util_build.binlog || exit /b

24

25 :: Test

26 dotnet test ^

@@ -35,6 +35,7 @@ msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wix

35 :clean

36 @rd /s/q "..\..\build\Util.wixext" 2> nul

37 @del "..\..\build\artifacts\WixToolset.Util.wixext.*.nupkg" 2> nul

38 +@del "%_L%\ext_util_build.binlog" 2> nul

39 @del "%_L%\TestResults\util.wixext.trx" 2> nul

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

41 @exit /b

src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi

+1 -1

@@ -5,6 +5,6 @@

5 <?include ..\..\caDecor.wxi ?>

6

7 <Fragment>

8 - <BundleExtension Id="$(var.Prefix)UtilBundleExtension$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilbe.dll" Name="$(var.Prefix)UtilBundleExtension$(var.Suffix)\utilbe.dll" />

8 + <BundleExtension Id="$(var.Prefix)UtilBundleExtension$(var.Suffix)" SourceFile="!(bindpath.utilbe.$(var.platform))utilbe.dll" Name="$(var.Prefix)UtilBundleExtension$(var.Suffix)\utilbe.dll" />

9 </Fragment>

10 </Include>

src/ext/Util/wixlib/UtilExtension_Platform.wxi

+1 -1

@@ -367,6 +367,6 @@

367 </Fragment>

368

369 <Fragment>

370 - <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilca.dll" />

370 + <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.utilca.$(var.platform))utilca.dll" />

371 </Fragment>

372 </Include>

src/ext/Util/wixlib/util.wixproj

+2 -12

@@ -6,18 +6,8 @@

6 </PropertyGroup>

7

8 <ItemGroup>

9 - <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />

10 - <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />

11 - <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />

12 - </ItemGroup>

13 -

14 - <ItemGroup>

15 - <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=ARM64" />

16 - <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x86" />

17 - <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x64" />

18 - <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" />

19 - <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" />

20 - <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" />

9 + <ProjectReference Include="..\be\utilbe.vcxproj" Platforms="arm64,x86,x64" />

10 + <ProjectReference Include="..\ca\utilca.vcxproj" Platforms="arm64,x86,x64" />

11 </ItemGroup>

12

13 <ItemGroup>

src/testresultfilelist.txt

+1 -3

@@ -3,10 +3,8 @@ build/logs/TestResults/burn.trx

3 build/logs/TestResults/libs.trx

4 build/logs/TestResults/tools.trx

5 build/logs/TestResults/wix.trx

6 -build/logs/TestResults/WixToolsetTest.Bal.trx

6 build/logs/TestResults/WixToolsetTest.BurnE2E.trx

8 -build/logs/TestResults/WixToolsetTest.Dnc.HostGenerator.trx

9 -build/logs/TestResults/WixToolsetTest.ManagedHost.trx

7 build/logs/TestResults/util.wixext.trx

8 +build/logs/TestResults/bal.wixext.trx

9 build/logs/TestResults/WixToolsetTest.MsiE2E.trx

10 build/logs/TestResults/WixToolsetTest.WixE2ETests.trx

\ No newline at end of file

Update some extensions to take advantage of multitargeting project references