aboutsummaryrefslogtreecommitdiff
path: root/src/ext/NetFx
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2023-02-14 23:11:29 -0800
committerRob Mensching <rob@firegiant.com>2023-02-21 23:31:32 -0700
commit3cb9bbe90e329a3550bb55fda5c620f23fc4eb86 (patch)
tree78064d1008a6f8c6682e8adc9b4f85d18e4bfed2 /src/ext/NetFx
parent69f11ee0275692528ed034a3885fa9f0c1504704 (diff)
downloadwix-3cb9bbe90e329a3550bb55fda5c620f23fc4eb86.tar.gz
wix-3cb9bbe90e329a3550bb55fda5c620f23fc4eb86.tar.bz2
wix-3cb9bbe90e329a3550bb55fda5c620f23fc4eb86.zip
Update some extensions to take advantage of multitargeting project references
Diffstat (limited to 'src/ext/NetFx')
-rw-r--r--src/ext/NetFx/netfx.cmd28
-rw-r--r--src/ext/NetFx/wixlib/NetFxExtension_Platform.wxi2
-rw-r--r--src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi6
-rw-r--r--src/ext/NetFx/wixlib/netfx.wixproj21
4 files changed, 35 insertions, 22 deletions
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
13nuget restore netcoresearch\packages.config || exit /b 23nuget restore netcoresearch\packages.config || exit /b
14msbuild -t:Restore -p:Configuration=%_C% || exit /b
15 24
16:: Build 25:: Build
17msbuild -p:Configuration=%_C% -bl:%_L%\netfx_build.binlog || exit /b 26msbuild -Restore -p:Configuration=%_C% -bl:%_L%\ext_netfx_build.binlog || exit /b
18 27
19:: Test 28:: Test
20dotnet test -c %_C% --no-build test\WixToolsetTest.Netfx || exit /b 29dotnet 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
23msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.Netfx.wixext.csproj || exit /b 34msbuild -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>