aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-12-09 12:51:21 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-12-09 13:33:18 -0600
commitb9ba35486245a65cd8e376cc7a808f6fa7d41682 (patch)
tree93304a7be837c3c6ec32c46a7d04ecf580e67407 /src
parent70e370b4494a87cbbe234130882cad4a1021f82a (diff)
downloadwix-b9ba35486245a65cd8e376cc7a808f6fa7d41682.tar.gz
wix-b9ba35486245a65cd8e376cc7a808f6fa7d41682.tar.bz2
wix-b9ba35486245a65cd8e376cc7a808f6fa7d41682.zip
WIXFEAT:6209 - Add x64 and ARM64 versions of built-in BAs.
Diffstat (limited to 'src')
-rw-r--r--src/Samples/bafunctions/bafunctions.vcxproj16
-rw-r--r--src/dnchost/dnchost.vcxproj20
-rw-r--r--src/dnchost/dncutil.cpp6
-rw-r--r--src/dnchost/packages.config2
-rw-r--r--src/mbahost/mbahost.vcxproj16
-rw-r--r--src/test/examples/TestEngine/Example.TestEngine.vcxproj8
-rw-r--r--src/wixext/BalCompiler.cs2
-rw-r--r--src/wixlib/bal.wixproj22
-rw-r--r--src/wixstdba/wixstdba.vcxproj16
9 files changed, 99 insertions, 9 deletions
diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj
index 9e0aa581..755d0ca6 100644
--- a/src/Samples/bafunctions/bafunctions.vcxproj
+++ b/src/Samples/bafunctions/bafunctions.vcxproj
@@ -7,6 +7,14 @@
7 <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> 7 <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
8 8
9 <ItemGroup Label="ProjectConfigurations"> 9 <ItemGroup Label="ProjectConfigurations">
10 <ProjectConfiguration Include="Debug|ARM64">
11 <Configuration>Debug</Configuration>
12 <Platform>ARM64</Platform>
13 </ProjectConfiguration>
14 <ProjectConfiguration Include="Release|ARM64">
15 <Configuration>Release</Configuration>
16 <Platform>ARM64</Platform>
17 </ProjectConfiguration>
10 <ProjectConfiguration Include="Debug|Win32"> 18 <ProjectConfiguration Include="Debug|Win32">
11 <Configuration>Debug</Configuration> 19 <Configuration>Debug</Configuration>
12 <Platform>Win32</Platform> 20 <Platform>Win32</Platform>
@@ -15,6 +23,14 @@
15 <Configuration>Release</Configuration> 23 <Configuration>Release</Configuration>
16 <Platform>Win32</Platform> 24 <Platform>Win32</Platform>
17 </ProjectConfiguration> 25 </ProjectConfiguration>
26 <ProjectConfiguration Include="Debug|x64">
27 <Configuration>Debug</Configuration>
28 <Platform>x64</Platform>
29 </ProjectConfiguration>
30 <ProjectConfiguration Include="Release|x64">
31 <Configuration>Release</Configuration>
32 <Platform>x64</Platform>
33 </ProjectConfiguration>
18 </ItemGroup> 34 </ItemGroup>
19 35
20 <PropertyGroup Label="Globals"> 36 <PropertyGroup Label="Globals">
diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj
index 419077ac..5959d6ea 100644
--- a/src/dnchost/dnchost.vcxproj
+++ b/src/dnchost/dnchost.vcxproj
@@ -8,6 +8,14 @@
8 <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" /> 8 <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" />
9 <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> 9 <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
10 <ItemGroup Label="ProjectConfigurations"> 10 <ItemGroup Label="ProjectConfigurations">
11 <ProjectConfiguration Include="Debug|ARM64">
12 <Configuration>Debug</Configuration>
13 <Platform>ARM64</Platform>
14 </ProjectConfiguration>
15 <ProjectConfiguration Include="Release|ARM64">
16 <Configuration>Release</Configuration>
17 <Platform>ARM64</Platform>
18 </ProjectConfiguration>
11 <ProjectConfiguration Include="Debug|Win32"> 19 <ProjectConfiguration Include="Debug|Win32">
12 <Configuration>Debug</Configuration> 20 <Configuration>Debug</Configuration>
13 <Platform>Win32</Platform> 21 <Platform>Win32</Platform>
@@ -16,6 +24,14 @@
16 <Configuration>Release</Configuration> 24 <Configuration>Release</Configuration>
17 <Platform>Win32</Platform> 25 <Platform>Win32</Platform>
18 </ProjectConfiguration> 26 </ProjectConfiguration>
27 <ProjectConfiguration Include="Debug|x64">
28 <Configuration>Debug</Configuration>
29 <Platform>x64</Platform>
30 </ProjectConfiguration>
31 <ProjectConfiguration Include="Release|x64">
32 <Configuration>Release</Configuration>
33 <Platform>x64</Platform>
34 </ProjectConfiguration>
19 </ItemGroup> 35 </ItemGroup>
20 <PropertyGroup Label="Globals"> 36 <PropertyGroup Label="Globals">
21 <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid> 37 <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid>
@@ -28,7 +44,9 @@
28 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 44 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
30 <PropertyGroup> 46 <PropertyGroup>
31 <NetHostPath>..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-x86\native\</NetHostPath> 47 <NetHostPlatform>$(Platform)</NetHostPlatform>
48 <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform>
49 <NetHostPath>..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
32 <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries> 50 <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries>
33 </PropertyGroup> 51 </PropertyGroup>
34 <ItemGroup> 52 <ItemGroup>
diff --git a/src/dnchost/dncutil.cpp b/src/dnchost/dncutil.cpp
index 89fe707f..34d14911 100644
--- a/src/dnchost/dncutil.cpp
+++ b/src/dnchost/dncutil.cpp
@@ -37,7 +37,7 @@ static HRESULT LoadCoreClr(
37static HRESULT StartCoreClr( 37static HRESULT StartCoreClr(
38 __in HOSTFXR_STATE* pState, 38 __in HOSTFXR_STATE* pState,
39 __in LPCWSTR wzNativeHostPath, 39 __in LPCWSTR wzNativeHostPath,
40 __in size_t cProperties, 40 __in DWORD cProperties,
41 __in LPCWSTR* propertyKeys, 41 __in LPCWSTR* propertyKeys,
42 __in LPCWSTR* propertyValues 42 __in LPCWSTR* propertyValues
43 ); 43 );
@@ -320,7 +320,7 @@ static HRESULT InitializeCoreClrPre5(
320 hr = LoadCoreClr(pState, sczCoreClrPath); 320 hr = LoadCoreClr(pState, sczCoreClrPath);
321 BalExitOnFailure(hr, "Failed to load coreclr."); 321 BalExitOnFailure(hr, "Failed to load coreclr.");
322 322
323 hr = StartCoreClr(pState, wzNativeHostPath, cProperties, rgPropertyKeys, rgPropertyValues); 323 hr = StartCoreClr(pState, wzNativeHostPath, (DWORD)cProperties, rgPropertyKeys, rgPropertyValues);
324 BalExitOnFailure(hr, "Failed to start coreclr."); 324 BalExitOnFailure(hr, "Failed to start coreclr.");
325 325
326LExit: 326LExit:
@@ -358,7 +358,7 @@ LExit:
358static HRESULT StartCoreClr( 358static HRESULT StartCoreClr(
359 __in HOSTFXR_STATE* pState, 359 __in HOSTFXR_STATE* pState,
360 __in LPCWSTR wzNativeHostPath, 360 __in LPCWSTR wzNativeHostPath,
361 __in size_t cProperties, 361 __in DWORD cProperties,
362 __in LPCWSTR* propertyKeys, 362 __in LPCWSTR* propertyKeys,
363 __in LPCWSTR* propertyValues 363 __in LPCWSTR* propertyValues
364 ) 364 )
diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config
index af177833..cf40ae64 100644
--- a/src/dnchost/packages.config
+++ b/src/dnchost/packages.config
@@ -4,6 +4,8 @@
4 <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> 4 <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5 <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> 5 <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> 6 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7 <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
8 <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
7 <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" /> 9 <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
8 <package id="WixToolset.BalUtil" version="4.0.44" targetFramework="native" /> 10 <package id="WixToolset.BalUtil" version="4.0.44" targetFramework="native" />
9 <package id="WixToolset.BootstrapperCore.Native" version="4.0.54" targetFramework="native" /> 11 <package id="WixToolset.BootstrapperCore.Native" version="4.0.54" targetFramework="native" />
diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj
index e2cc562e..c05304d4 100644
--- a/src/mbahost/mbahost.vcxproj
+++ b/src/mbahost/mbahost.vcxproj
@@ -10,6 +10,14 @@
10 <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> 10 <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
11 11
12 <ItemGroup Label="ProjectConfigurations"> 12 <ItemGroup Label="ProjectConfigurations">
13 <ProjectConfiguration Include="Debug|ARM64">
14 <Configuration>Debug</Configuration>
15 <Platform>ARM64</Platform>
16 </ProjectConfiguration>
17 <ProjectConfiguration Include="Release|ARM64">
18 <Configuration>Release</Configuration>
19 <Platform>ARM64</Platform>
20 </ProjectConfiguration>
13 <ProjectConfiguration Include="Debug|Win32"> 21 <ProjectConfiguration Include="Debug|Win32">
14 <Configuration>Debug</Configuration> 22 <Configuration>Debug</Configuration>
15 <Platform>Win32</Platform> 23 <Platform>Win32</Platform>
@@ -18,6 +26,14 @@
18 <Configuration>Release</Configuration> 26 <Configuration>Release</Configuration>
19 <Platform>Win32</Platform> 27 <Platform>Win32</Platform>
20 </ProjectConfiguration> 28 </ProjectConfiguration>
29 <ProjectConfiguration Include="Debug|x64">
30 <Configuration>Debug</Configuration>
31 <Platform>x64</Platform>
32 </ProjectConfiguration>
33 <ProjectConfiguration Include="Release|x64">
34 <Configuration>Release</Configuration>
35 <Platform>x64</Platform>
36 </ProjectConfiguration>
21 </ItemGroup> 37 </ItemGroup>
22 38
23 <PropertyGroup Label="Globals"> 39 <PropertyGroup Label="Globals">
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
index 50fd7559..b420c18e 100644
--- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -5,6 +5,14 @@
5 <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" /> 5 <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" />
6 <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> 6 <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
7 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
8 <ProjectConfiguration Include="Debug|ARM64">
9 <Configuration>Debug</Configuration>
10 <Platform>ARM64</Platform>
11 </ProjectConfiguration>
12 <ProjectConfiguration Include="Release|ARM64">
13 <Configuration>Release</Configuration>
14 <Platform>ARM64</Platform>
15 </ProjectConfiguration>
8 <ProjectConfiguration Include="Debug|Win32"> 16 <ProjectConfiguration Include="Debug|Win32">
9 <Configuration>Debug</Configuration> 17 <Configuration>Debug</Configuration>
10 <Platform>Win32</Platform> 18 <Platform>Win32</Platform>
diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs
index 1629a670..c01905cc 100644
--- a/src/wixext/BalCompiler.cs
+++ b/src/wixext/BalCompiler.cs
@@ -918,7 +918,7 @@ namespace WixToolset.Bal
918 918
919 private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name) 919 private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name)
920 { 920 {
921 var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86); 921 var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
922 if (id == null) 922 if (id == null)
923 { 923 {
924 this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName)); 924 this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName));
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index 38cdf242..8c88c3ce 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -9,14 +9,28 @@
9 <BindInputPaths Include="..\wixstdba\Resources\" /> 9 <BindInputPaths Include="..\wixstdba\Resources\" />
10 <BindInputPaths Include="$(OutputPath)netcoreapp3.0" /> 10 <BindInputPaths Include="$(OutputPath)netcoreapp3.0" />
11 <BindInputPaths Include="$(OutputPath)" /> 11 <BindInputPaths Include="$(OutputPath)" />
12 <BindInputPaths Include="$(OutputPath)Win32" BindName="x86" /> 12 <BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
13 <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
14 <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />
13 </ItemGroup> 15 </ItemGroup>
14 <ItemGroup> 16 <ItemGroup>
15 <ProjectReference Include="..\dnchost\dnchost.vcxproj" /> 17 <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=ARM64" />
16 <ProjectReference Include="..\mbahost\mbahost.vcxproj" /> 18 <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=ARM64" />
17 <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" /> 19 <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=ARM64" />
20 <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x86" />
21 <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x86" />
22 <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x86" />
23 <ProjectReference Include="..\dnchost\dnchost.vcxproj" Properties="Platform=x64" />
24 <ProjectReference Include="..\mbahost\mbahost.vcxproj" Properties="Platform=x64" />
25 <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Properties="Platform=x64" />
18 </ItemGroup> 26 </ItemGroup>
19 <ItemGroup> 27 <ItemGroup>
20 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> 28 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
21 </ItemGroup> 29 </ItemGroup>
30 <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
31 <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
32 <PropertyGroup>
33 <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
34 </PropertyGroup>
35 </Target>
22</Project> \ No newline at end of file 36</Project> \ No newline at end of file
diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj
index 48d013a2..a9d518b4 100644
--- a/src/wixstdba/wixstdba.vcxproj
+++ b/src/wixstdba/wixstdba.vcxproj
@@ -10,6 +10,14 @@
10 <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> 10 <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
11 11
12 <ItemGroup Label="ProjectConfigurations"> 12 <ItemGroup Label="ProjectConfigurations">
13 <ProjectConfiguration Include="Debug|ARM64">
14 <Configuration>Debug</Configuration>
15 <Platform>ARM64</Platform>
16 </ProjectConfiguration>
17 <ProjectConfiguration Include="Release|ARM64">
18 <Configuration>Release</Configuration>
19 <Platform>ARM64</Platform>
20 </ProjectConfiguration>
13 <ProjectConfiguration Include="Debug|Win32"> 21 <ProjectConfiguration Include="Debug|Win32">
14 <Configuration>Debug</Configuration> 22 <Configuration>Debug</Configuration>
15 <Platform>Win32</Platform> 23 <Platform>Win32</Platform>
@@ -18,6 +26,14 @@
18 <Configuration>Release</Configuration> 26 <Configuration>Release</Configuration>
19 <Platform>Win32</Platform> 27 <Platform>Win32</Platform>
20 </ProjectConfiguration> 28 </ProjectConfiguration>
29 <ProjectConfiguration Include="Debug|x64">
30 <Configuration>Debug</Configuration>
31 <Platform>x64</Platform>
32 </ProjectConfiguration>
33 <ProjectConfiguration Include="Release|x64">
34 <Configuration>Release</Configuration>
35 <Platform>x64</Platform>
36 </ProjectConfiguration>
21 </ItemGroup> 37 </ItemGroup>
22 38
23 <PropertyGroup Label="Globals"> 39 <PropertyGroup Label="Globals">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 13:54:10 +0000