diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-09 12:51:21 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-09 13:33:18 -0600 |
commit | b9ba35486245a65cd8e376cc7a808f6fa7d41682 (patch) | |
tree | 93304a7be837c3c6ec32c46a7d04ecf580e67407 /src/dnchost | |
parent | 70e370b4494a87cbbe234130882cad4a1021f82a (diff) | |
download | wix-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/dnchost')
-rw-r--r-- | src/dnchost/dnchost.vcxproj | 20 | ||||
-rw-r--r-- | src/dnchost/dncutil.cpp | 6 | ||||
-rw-r--r-- | src/dnchost/packages.config | 2 |
3 files changed, 24 insertions, 4 deletions
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( | |||
37 | static HRESULT StartCoreClr( | 37 | static 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 | ||
326 | LExit: | 326 | LExit: |
@@ -358,7 +358,7 @@ LExit: | |||
358 | static HRESULT StartCoreClr( | 358 | static 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" /> |