diff options
author | Rob Mensching <rob@firegiant.com> | 2023-02-14 23:11:29 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-02-21 23:31:32 -0700 |
commit | 3cb9bbe90e329a3550bb55fda5c620f23fc4eb86 (patch) | |
tree | 78064d1008a6f8c6682e8adc9b4f85d18e4bfed2 | |
parent | 69f11ee0275692528ed034a3885fa9f0c1504704 (diff) | |
download | wix-3cb9bbe90e329a3550bb55fda5c620f23fc4eb86.tar.gz wix-3cb9bbe90e329a3550bb55fda5c620f23fc4eb86.tar.bz2 wix-3cb9bbe90e329a3550bb55fda5c620f23fc4eb86.zip |
Update some extensions to take advantage of multitargeting project references
-rw-r--r-- | src/ext/Bal/bal.cmd | 43 | ||||
-rw-r--r-- | src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | 4 | ||||
-rw-r--r-- | src/ext/Bal/wixlib/BalExtension_platform.wxi | 10 | ||||
-rw-r--r-- | src/ext/Bal/wixlib/Mbahost_platform.wxi | 4 | ||||
-rw-r--r-- | src/ext/Bal/wixlib/bal.wixproj | 20 | ||||
-rw-r--r-- | src/ext/NetFx/netfx.cmd | 28 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi | 2 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi | 6 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/netfx.wixproj | 21 | ||||
-rw-r--r-- | src/ext/UI/ui.cmd | 5 | ||||
-rw-r--r-- | src/ext/UI/wixlib/Common_Platform.wxi | 2 | ||||
-rw-r--r-- | src/ext/UI/wixlib/ui.wixproj | 13 | ||||
-rw-r--r-- | src/ext/Util/util.cmd | 3 | ||||
-rw-r--r-- | src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi | 2 | ||||
-rw-r--r-- | src/ext/Util/wixlib/UtilExtension_Platform.wxi | 2 | ||||
-rw-r--r-- | src/ext/Util/wixlib/util.wixproj | 14 | ||||
-rw-r--r-- | src/testresultfilelist.txt | 4 |
17 files changed, 98 insertions, 85 deletions
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd index f3028d58..eebef70f 100644 --- a/src/ext/Bal/bal.cmd +++ b/src/ext/Bal/bal.cmd | |||
@@ -3,35 +3,56 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | @set _L=%~dp0..\..\..\build\logs | 5 | @set _L=%~dp0..\..\..\build\logs |
6 | |||
6 | :parse_args | 7 | :parse_args |
7 | @if /i "%1"=="release" set _C=Release | 8 | @if /i "%1"=="release" set _C=Release |
9 | @if /i "%1"=="inc" set _INC=1 | ||
10 | @if /i "%1"=="clean" set _CLEAN=1 | ||
8 | @if not "%1"=="" shift & goto parse_args | 11 | @if not "%1"=="" shift & goto parse_args |
9 | 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 | |||
10 | @echo Building ext\Bal %_C% using %_N% | 20 | @echo Building ext\Bal %_C% using %_N% |
11 | 21 | ||
12 | :: Restore | 22 | :: Restore |
13 | nuget restore dnchost\packages.config || exit /b | 23 | nuget restore dnchost\packages.config || exit /b |
14 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
15 | 24 | ||
16 | :: Build | 25 | :: Build |
17 | msbuild -p:Configuration=%_C%;Platform=x86 test\examples\TestEngine\Example.TestEngine.vcxproj || exit /b | 26 | msbuild -Restore -p:Configuration=%_C% -bl:%_L%\ext_bal_build.binlog || 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 | ||
24 | 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 |
26 | 29 | ||
27 | :: Test | 30 | :: Test |
28 | dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" || exit /b | 31 | dotnet test ^ |
29 | dotnet test test\WixToolsetTest.ManagedHost -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.ManagedHost.trx" || exit /b | 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 | ||
30 | 36 | ||
31 | :: Pack | 37 | :: Pack |
32 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b | 38 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b |
33 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj || exit /b | 39 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj || exit /b |
34 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b | 40 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b |
35 | 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 | ||
36 | @popd | 57 | @popd |
37 | @endlocal | 58 | @endlocal |
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 16a05fec..9caf3aa6 100644 --- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | |||
@@ -8,7 +8,9 @@ | |||
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
10 | <ItemGroup> | 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" /> | ||
12 | </ItemGroup> | 14 | </ItemGroup> |
13 | 15 | ||
14 | <ItemGroup> | 16 | <ItemGroup> |
diff --git a/src/ext/Bal/wixlib/BalExtension_platform.wxi b/src/ext/Bal/wixlib/BalExtension_platform.wxi index 5b0d78d0..bb922317 100644 --- a/src/ext/Bal/wixlib/BalExtension_platform.wxi +++ b/src/ext/Bal/wixlib/BalExtension_platform.wxi | |||
@@ -6,8 +6,8 @@ | |||
6 | 6 | ||
7 | <Fragment> | 7 | <Fragment> |
8 | <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)"> | 8 | <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)"> |
9 | <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\dnchost.dll" /> | 9 | <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.dnchost.$(var.platform))\dnchost.dll" /> |
10 | <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="dncpreq.dll" /> | 10 | <Payload SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" Name="dncpreq.dll" /> |
11 | </BootstrapperApplication> | 11 | </BootstrapperApplication> |
12 | </Fragment> | 12 | </Fragment> |
13 | 13 | ||
@@ -20,8 +20,8 @@ | |||
20 | 20 | ||
21 | <Fragment> | 21 | <Fragment> |
22 | <BootstrapperApplication Id="WixInternalUIBootstrapperApplication$(var.Suffix)"> | 22 | <BootstrapperApplication Id="WixInternalUIBootstrapperApplication$(var.Suffix)"> |
23 | <BootstrapperApplicationDll Id="WixInternalUIBootstrapperApplication" SourceFile="!(bindpath.$(var.platform))\wixiuiba.dll" /> | 23 | <BootstrapperApplicationDll Id="WixInternalUIBootstrapperApplication" SourceFile="!(bindpath.wixiuiba.$(var.platform))\wixiuiba.dll" /> |
24 | <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="prereqba.dll" /> | 24 | <Payload SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" Name="prereqba.dll" /> |
25 | </BootstrapperApplication> | 25 | </BootstrapperApplication> |
26 | </Fragment> | 26 | </Fragment> |
27 | 27 | ||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | <Fragment> | 35 | <Fragment> |
36 | <BootstrapperApplication Id="WixStandardBootstrapperApplication$(var.Suffix)"> | 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> | 38 | </BootstrapperApplication> |
39 | </Fragment> | 39 | </Fragment> |
40 | 40 | ||
diff --git a/src/ext/Bal/wixlib/Mbahost_platform.wxi b/src/ext/Bal/wixlib/Mbahost_platform.wxi index 9a5241cf..3ea7840f 100644 --- a/src/ext/Bal/wixlib/Mbahost_platform.wxi +++ b/src/ext/Bal/wixlib/Mbahost_platform.wxi | |||
@@ -6,8 +6,8 @@ | |||
6 | 6 | ||
7 | <Fragment> | 7 | <Fragment> |
8 | <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)"> | 8 | <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)"> |
9 | <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" /> | 9 | <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.mbahost.$(var.platform))\mbahost.dll" /> |
10 | <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" /> | 10 | <Payload SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" /> |
11 | <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" /> | 11 | <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" /> |
12 | </BootstrapperApplication> | 12 | </BootstrapperApplication> |
13 | </Fragment> | 13 | </Fragment> |
diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj index 64c9c122..e703a0a8 100644 --- a/src/ext/Bal/wixlib/bal.wixproj +++ b/src/ext/Bal/wixlib/bal.wixproj | |||
@@ -8,26 +8,14 @@ | |||
8 | 8 | ||
9 | <ItemGroup> | 9 | <ItemGroup> |
10 | <BindPath Include="..\wixstdba\Resources\" /> | 10 | <BindPath Include="..\wixstdba\Resources\" /> |
11 | <BindPath Include="$(OutputPath)net6.0" /> | ||
12 | <BindPath Include="$(OutputPath)net20" /> | 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" /> | ||
16 | </ItemGroup> | 12 | </ItemGroup> |
17 | 13 | ||
18 | <ItemGroup> | 14 | <ItemGroup> |
19 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> | 15 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Platforms="arm64,x86,x64" /> |
20 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> | 16 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" Platforms="arm64,x86,x64" /> |
21 | <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> | 17 | <ProjectReference Include="..\wixiuiba\wixiuiba.vcxproj" Platforms="arm64,x86,x64" /> |
22 | <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> | 18 | <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Platforms="arm64,x86,x64" /> |
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" /> | ||
31 | </ItemGroup> | 19 | </ItemGroup> |
32 | 20 | ||
33 | <ItemGroup> | 21 | <ItemGroup> |
diff --git a/src/ext/NetFx/netfx.cmd b/src/ext/NetFx/netfx.cmd index 65cd1dcb..0b3fb28f 100644 --- a/src/ext/NetFx/netfx.cmd +++ b/src/ext/NetFx/netfx.cmd | |||
@@ -3,24 +3,46 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | @set _L=%~dp0..\..\..\build\logs | 5 | @set _L=%~dp0..\..\..\build\logs |
6 | |||
6 | :parse_args | 7 | :parse_args |
7 | @if /i "%1"=="release" set _C=Release | 8 | @if /i "%1"=="release" set _C=Release |
9 | @if /i "%1"=="inc" set _INC=1 | ||
10 | @if /i "%1"=="clean" set _CLEAN=1 | ||
8 | @if not "%1"=="" shift & goto parse_args | 11 | @if not "%1"=="" shift & goto parse_args |
9 | 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 | |||
10 | @echo NetFx.wixext build %_C% | 20 | @echo NetFx.wixext build %_C% |
11 | 21 | ||
12 | :: Restore | 22 | :: Restore |
13 | nuget restore netcoresearch\packages.config || exit /b | 23 | nuget restore netcoresearch\packages.config || exit /b |
14 | msbuild -t:Restore -p:Configuration=%_C% || exit /b | ||
15 | 24 | ||
16 | :: Build | 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 |
18 | 27 | ||
19 | :: Test | 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 | ||
21 | 32 | ||
22 | :: Pack | 33 | :: Pack |
23 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Netfx.wixext.csproj || exit /b | 34 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Netfx.wixext.csproj || exit /b |
24 | 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 | ||
25 | @popd | 47 | @popd |
26 | @endlocal | 48 | @endlocal |
diff --git a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi index c9c8af02..81746db1 100644 --- a/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi +++ b/src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | <!-- NetFx Custom Action DLL Definitions --> | 29 | <!-- NetFx Custom Action DLL Definitions --> |
30 | <Fragment> | 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" /> | 32 | <Binary Id="$(var.Prefix)NetCheck_x86" SourceFile="!(bindpath.x86)NetCoreCheck.exe" /> |
33 | <Binary Id="$(var.Prefix)NetCheck_x64" SourceFile="!(bindpath.x64)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" /> | 34 | <Binary Id="$(var.Prefix)NetCheck_arm64" SourceFile="!(bindpath.arm64)NetCoreCheck.exe" /> |
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi index e3300534..bc332efc 100644 --- a/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi +++ b/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi | |||
@@ -5,10 +5,10 @@ | |||
5 | <?include ..\..\caDecor.wxi ?> | 5 | <?include ..\..\caDecor.wxi ?> |
6 | 6 | ||
7 | <Fragment> | 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?> | 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" /> | 10 | <Payload SourceFile="!(bindpath.netcoresearch.$(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" /> | 11 | <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" /> |
12 | <?endforeach?> | 12 | <?endforeach?> |
13 | </BundleExtension> | 13 | </BundleExtension> |
14 | </Fragment> | 14 | </Fragment> |
diff --git a/src/ext/NetFx/wixlib/netfx.wixproj b/src/ext/NetFx/wixlib/netfx.wixproj index 1ab72e8e..2bd09d95 100644 --- a/src/ext/NetFx/wixlib/netfx.wixproj +++ b/src/ext/NetFx/wixlib/netfx.wixproj | |||
@@ -8,24 +8,15 @@ | |||
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
10 | <ItemGroup> | 10 | <ItemGroup> |
11 | <BindInputPaths Include="$(OutputPath)x86" BindName='x86' /> | 11 | <BindPath Include="$(PkgMicrosoft_NET_Tools_NETCoreCheck_x86)\win-x86" BindName='x86' /> |
12 | <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> | 12 | <BindPath Include="$(PkgMicrosoft_NET_Tools_NETCoreCheck_x64)\win-x64" BindName='x64' /> |
13 | <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' /> | 13 | <BindPath Include="$(PkgMicrosoft_NET_Tools_NETCoreCheck_arm64)\win-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' /> | ||
17 | </ItemGroup> | 14 | </ItemGroup> |
18 | 15 | ||
19 | <ItemGroup> | 16 | <ItemGroup> |
20 | <ProjectReference Include="..\be\netfxbe.vcxproj" Properties="Platform=ARM64" /> | 17 | <ProjectReference Include="..\be\netfxbe.vcxproj" Platforms="arm64,x86,x64" /> |
21 | <ProjectReference Include="..\be\netfxbe.vcxproj" Properties="Platform=x64" /> | 18 | <ProjectReference Include="..\ca\netfxca.vcxproj" Platforms="arm64,x86,x64" /> |
22 | <ProjectReference Include="..\be\netfxbe.vcxproj" Properties="Platform=x86" /> | 19 | <ProjectReference Include="..\netcoresearch\netcoresearch.vcxproj" Platforms="arm64,x86,x64" /> |
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" /> | ||
29 | </ItemGroup> | 20 | </ItemGroup> |
30 | 21 | ||
31 | <ItemGroup> | 22 | <ItemGroup> |
diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd index 3823f45a..0b0036af 100644 --- a/src/ext/UI/ui.cmd +++ b/src/ext/UI/ui.cmd | |||
@@ -8,6 +8,8 @@ | |||
8 | @if /i "%1"=="clean" set _CLEAN=1 | 8 | @if /i "%1"=="clean" set _CLEAN=1 |
9 | @if not "%1"=="" shift & goto parse_args | 9 | @if not "%1"=="" shift & goto parse_args |
10 | 10 | ||
11 | @set _B=%~dp0..\..\..\build\UI.wixext\%_C% | ||
12 | |||
11 | :: Clean | 13 | :: Clean |
12 | 14 | ||
13 | @if "%_INC%"=="" call :clean | 15 | @if "%_INC%"=="" call :clean |
@@ -16,7 +18,7 @@ | |||
16 | @echo UI.wixext build %_C% | 18 | @echo UI.wixext build %_C% |
17 | 19 | ||
18 | :: Build | 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 |
20 | 22 | ||
21 | :: Test | 23 | :: Test |
22 | :: dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b | 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 | |||
29 | :clean | 31 | :clean |
30 | @rd /s/q "..\..\..\build\UI.wixext" 2> nul | 32 | @rd /s/q "..\..\..\build\UI.wixext" 2> nul |
31 | @del "..\..\..\build\artifacts\WixToolset.UI.wixext.*.nupkg" 2> nul | 33 | @del "..\..\..\build\artifacts\WixToolset.UI.wixext.*.nupkg" 2> nul |
34 | @del "%_L%\ext_ui_build.binlog" 2> nul | ||
32 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.ui.wixext" 2> nul | 35 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.ui.wixext" 2> nul |
33 | @exit /b | 36 | @exit /b |
34 | 37 | ||
diff --git a/src/ext/UI/wixlib/Common_Platform.wxi b/src/ext/UI/wixlib/Common_Platform.wxi index cd050e06..329abb2e 100644 --- a/src/ext/UI/wixlib/Common_Platform.wxi +++ b/src/ext/UI/wixlib/Common_Platform.wxi | |||
@@ -13,6 +13,6 @@ | |||
13 | </Fragment> | 13 | </Fragment> |
14 | 14 | ||
15 | <Fragment> | 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> | 17 | </Fragment> |
18 | </Include> | 18 | </Include> |
diff --git a/src/ext/UI/wixlib/ui.wixproj b/src/ext/UI/wixlib/ui.wixproj index ebac0c79..848bc882 100644 --- a/src/ext/UI/wixlib/ui.wixproj +++ b/src/ext/UI/wixlib/ui.wixproj | |||
@@ -5,6 +5,7 @@ | |||
5 | <BindFiles>true</BindFiles> | 5 | <BindFiles>true</BindFiles> |
6 | <Cultures>en-us</Cultures> | 6 | <Cultures>en-us</Cultures> |
7 | </PropertyGroup> | 7 | </PropertyGroup> |
8 | |||
8 | <PropertyGroup> | 9 | <PropertyGroup> |
9 | <DefineConstants> | 10 | <DefineConstants> |
10 | $(DefineConstants); | 11 | $(DefineConstants); |
@@ -17,19 +18,15 @@ | |||
17 | upIco=$(MSBuildProjectDirectory)\Bitmaps\up.ico; | 18 | upIco=$(MSBuildProjectDirectory)\Bitmaps\up.ico; |
18 | </DefineConstants> | 19 | </DefineConstants> |
19 | </PropertyGroup> | 20 | </PropertyGroup> |
20 | <ItemGroup> | 21 | |
21 | <BindInputPaths Include="$(OutputPath)x86" BindName="x86" /> | ||
22 | <BindInputPaths Include="$(OutputPath)x64" BindName="x64" /> | ||
23 | <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" /> | ||
24 | </ItemGroup> | ||
25 | <ItemGroup> | 22 | <ItemGroup> |
26 | <Content Include="Common_Platform.wxi" /> | 23 | <Content Include="Common_Platform.wxi" /> |
27 | </ItemGroup> | 24 | </ItemGroup> |
25 | |||
28 | <ItemGroup> | 26 | <ItemGroup> |
29 | <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x86" /> | 27 | <ProjectReference Include="..\ca\uica.vcxproj" Platforms="arm64,x86,x64" /> |
30 | <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x64" /> | ||
31 | <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=ARM64" /> | ||
32 | </ItemGroup> | 28 | </ItemGroup> |
29 | |||
33 | <ItemGroup> | 30 | <ItemGroup> |
34 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 31 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
35 | </ItemGroup> | 32 | </ItemGroup> |
diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd index aad9c65c..54ede2bf 100644 --- a/src/ext/Util/util.cmd +++ b/src/ext/Util/util.cmd | |||
@@ -20,7 +20,7 @@ | |||
20 | @echo Building ext\Util %_C% using %_N% | 20 | @echo Building ext\Util %_C% using %_N% |
21 | 21 | ||
22 | :: Build | 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 | 24 | ||
25 | :: Test | 25 | :: Test |
26 | dotnet test ^ | 26 | dotnet test ^ |
@@ -35,6 +35,7 @@ msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Util.wix | |||
35 | :clean | 35 | :clean |
36 | @rd /s/q "..\..\build\Util.wixext" 2> nul | 36 | @rd /s/q "..\..\build\Util.wixext" 2> nul |
37 | @del "..\..\build\artifacts\WixToolset.Util.wixext.*.nupkg" 2> nul | 37 | @del "..\..\build\artifacts\WixToolset.Util.wixext.*.nupkg" 2> nul |
38 | @del "%_L%\ext_util_build.binlog" 2> nul | ||
38 | @del "%_L%\TestResults\util.wixext.trx" 2> nul | 39 | @del "%_L%\TestResults\util.wixext.trx" 2> nul |
39 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.util.wixext" 2> nul | 40 | @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.util.wixext" 2> nul |
40 | @exit /b | 41 | @exit /b |
diff --git a/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi index a2e295f2..5c964d7d 100644 --- a/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi +++ b/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi | |||
@@ -5,6 +5,6 @@ | |||
5 | <?include ..\..\caDecor.wxi ?> | 5 | <?include ..\..\caDecor.wxi ?> |
6 | 6 | ||
7 | <Fragment> | 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> | 9 | </Fragment> |
10 | </Include> | 10 | </Include> |
diff --git a/src/ext/Util/wixlib/UtilExtension_Platform.wxi b/src/ext/Util/wixlib/UtilExtension_Platform.wxi index c748fff7..be48c495 100644 --- a/src/ext/Util/wixlib/UtilExtension_Platform.wxi +++ b/src/ext/Util/wixlib/UtilExtension_Platform.wxi | |||
@@ -367,6 +367,6 @@ | |||
367 | </Fragment> | 367 | </Fragment> |
368 | 368 | ||
369 | <Fragment> | 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> | 371 | </Fragment> |
372 | </Include> | 372 | </Include> |
diff --git a/src/ext/Util/wixlib/util.wixproj b/src/ext/Util/wixlib/util.wixproj index c1975af2..7631e149 100644 --- a/src/ext/Util/wixlib/util.wixproj +++ b/src/ext/Util/wixlib/util.wixproj | |||
@@ -6,18 +6,8 @@ | |||
6 | </PropertyGroup> | 6 | </PropertyGroup> |
7 | 7 | ||
8 | <ItemGroup> | 8 | <ItemGroup> |
9 | <BindInputPaths Include="$(OutputPath)x86" BindName='x86' /> | 9 | <ProjectReference Include="..\be\utilbe.vcxproj" Platforms="arm64,x86,x64" /> |
10 | <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> | 10 | <ProjectReference Include="..\ca\utilca.vcxproj" Platforms="arm64,x86,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" /> | ||
21 | </ItemGroup> | 11 | </ItemGroup> |
22 | 12 | ||
23 | <ItemGroup> | 13 | <ItemGroup> |
diff --git a/src/testresultfilelist.txt b/src/testresultfilelist.txt index 6a2eadcb..9e156730 100644 --- a/src/testresultfilelist.txt +++ b/src/testresultfilelist.txt | |||
@@ -3,10 +3,8 @@ build/logs/TestResults/burn.trx | |||
3 | build/logs/TestResults/libs.trx | 3 | build/logs/TestResults/libs.trx |
4 | build/logs/TestResults/tools.trx | 4 | build/logs/TestResults/tools.trx |
5 | build/logs/TestResults/wix.trx | 5 | build/logs/TestResults/wix.trx |
6 | build/logs/TestResults/WixToolsetTest.Bal.trx | ||
7 | build/logs/TestResults/WixToolsetTest.BurnE2E.trx | 6 | build/logs/TestResults/WixToolsetTest.BurnE2E.trx |
8 | build/logs/TestResults/WixToolsetTest.Dnc.HostGenerator.trx | ||
9 | build/logs/TestResults/WixToolsetTest.ManagedHost.trx | ||
10 | build/logs/TestResults/util.wixext.trx | 7 | build/logs/TestResults/util.wixext.trx |
8 | build/logs/TestResults/bal.wixext.trx | ||
11 | build/logs/TestResults/WixToolsetTest.MsiE2E.trx | 9 | build/logs/TestResults/WixToolsetTest.MsiE2E.trx |
12 | build/logs/TestResults/WixToolsetTest.WixE2ETests.trx \ No newline at end of file | 10 | build/logs/TestResults/WixToolsetTest.WixE2ETests.trx \ No newline at end of file |