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 /src/ext/Bal/wixlib | |
| 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
Diffstat (limited to 'src/ext/Bal/wixlib')
| -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 |
3 files changed, 11 insertions, 23 deletions
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> |