Upgrade DotNetAppHost package to .NET 5 to use its static nethost lib and headers.

5 files changed, 5 insertions, 106 deletions

diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj
index a278d714..f9a2546f 100644
--- a/src/dnchost/dnchost.vcxproj
+++ b/src/dnchost/dnchost.vcxproj
@@ -28,8 +28,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <PropertyGroup>
-    <NetHostPath>..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.3.1.3\runtimes\win-x86\native\</NetHostPath>
-    <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)nethost.lib</ProjectAdditionalLinkLibraries>
+    <NetHostPath>..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0-preview.7.20364.11\runtimes\win-x86\native\</NetHostPath>
+    <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
   <ItemGroup>
     <ClCompile Include="dnchost.cpp" />
@@ -42,7 +42,6 @@
     <ClInclude Include="coreclrhost.h" />
     <ClInclude Include="dnchost.h" />
     <ClInclude Include="dncutil.h" />
-    <ClInclude Include="hostfxr.h" />
     <ClInclude Include="precomp.h" />
   </ItemGroup>
   <ItemGroup>
@@ -50,10 +49,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <Content Include="$(NetHostPath)nethost.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/src/dnchost/hostfxr.h b/src/dnchost/hostfxr.h
deleted file mode 100644
index 85e6e0ab..00000000
--- a/src/dnchost/hostfxr.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-
-// ***** ABOUT THIS HEADER *****
-// **************************************************************************************
-//
-// This is the version on 2019-12-22 from
-// https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/hostfxr.h
-//
-// **************************************************************************************
-// ****************************
-
-
-#ifndef __HOSTFXR_H__
-#define __HOSTFXR_H__
-
-#include <stddef.h>
-#include <stdint.h>
-
-#if defined(_WIN32)
-    #define HOSTFXR_CALLTYPE __cdecl
-    #ifdef _WCHAR_T_DEFINED
-        typedef wchar_t char_t;
-    #else
-        typedef unsigned short char_t;
-    #endif
-#else
-    #define HOSTFXR_CALLTYPE
-    typedef char char_t;
-#endif
-
-enum hostfxr_delegate_type
-{
-    hdt_com_activation,
-    hdt_load_in_memory_assembly,
-    hdt_winrt_activation,
-    hdt_com_register,
-    hdt_com_unregister,
-    hdt_load_assembly_and_get_function_pointer
-};
-
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_main_fn)(const int argc, const char_t **argv);
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_main_startupinfo_fn)(
-    const int argc,
-    const char_t **argv,
-    const char_t *host_path,
-    const char_t *dotnet_root,
-    const char_t *app_path);
-
-typedef void(HOSTFXR_CALLTYPE *hostfxr_error_writer_fn)(const char_t *message);
-typedef hostfxr_error_writer_fn(HOSTFXR_CALLTYPE *hostfxr_set_error_writer_fn)(hostfxr_error_writer_fn error_writer);
-
-typedef void* hostfxr_handle;
-struct hostfxr_initialize_parameters
-{
-    size_t size;
-    const char_t *host_path;
-    const char_t *dotnet_root;
-};
-
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_initialize_for_dotnet_command_line_fn)(
-    int argc,
-    const char_t **argv,
-    const struct hostfxr_initialize_parameters *parameters,
-    /*out*/ hostfxr_handle *host_context_handle);
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_initialize_for_runtime_config_fn)(
-    const char_t *runtime_config_path,
-    const struct hostfxr_initialize_parameters *parameters,
-    /*out*/ hostfxr_handle *host_context_handle);
-
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_get_runtime_property_value_fn)(
-    const hostfxr_handle host_context_handle,
-    const char_t *name,
-    /*out*/ const char_t **value);
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_set_runtime_property_value_fn)(
-    const hostfxr_handle host_context_handle,
-    const char_t *name,
-    const char_t *value);
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_get_runtime_properties_fn)(
-    const hostfxr_handle host_context_handle,
-    /*inout*/ size_t * count,
-    /*out*/ const char_t **keys,
-    /*out*/ const char_t **values);
-
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_run_app_fn)(const hostfxr_handle host_context_handle);
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_get_runtime_delegate_fn)(
-    const hostfxr_handle host_context_handle,
-    enum hostfxr_delegate_type type,
-    /*out*/ void **delegate);
-
-typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_close_fn)(const hostfxr_handle host_context_handle);
-
-#endif //__HOSTFXR_H__
\ No newline at end of file
diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config
index e0396349..dfeefbc4 100644
--- a/src/dnchost/packages.config
+++ b/src/dnchost/packages.config
@@ -4,7 +4,7 @@
   <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
-  <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" />
+  <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0-preview.7.20364.11" targetFramework="native" />
   <package id="WixToolset.BalUtil" version="4.0.33" targetFramework="native" />
   <package id="WixToolset.BootstrapperCore.Native" version="4.0.31" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
diff --git a/src/dnchost/precomp.h b/src/dnchost/precomp.h
index 6a12ef67..d19a0780 100644
--- a/src/dnchost/precomp.h
+++ b/src/dnchost/precomp.h
@@ -21,9 +21,10 @@
 #include <balutil.h>
 
 #include <WixToolset.Dnc.Host.h>
+#define NETHOST_USE_AS_STATIC
 #include <nethost.h>
+#include <hostfxr.h>
 
 #include "coreclrhost.h"
-#include "hostfxr.h"
 #include "dncutil.h"
 #include "dnchost.h"
diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs
index 2a27050f..2663360f 100644
--- a/src/wixlib/Dnc.wxs
+++ b/src/wixlib/Dnc.wxs
@@ -40,7 +40,6 @@
 
     <Fragment>
         <PayloadGroup Id='Dnc'>
-            <Payload Compressed='yes' SourceFile='nethost.dll' />
             <Payload Compressed='yes' SourceFile='WixToolset.Dnc.Host.dll' />
             <Payload Compressed='yes' SourceFile='wixstdba.dll' Name='dncpreq.dll' />
         </PayloadGroup>