Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/installer/pkg/archives/dotnet-nethost.proj
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
Destination="$(OutputPath)$(LibPrefix)nethost.lib" />
<FilesToPublish Include="$(DotNetHostBinDir)\nethost.h"
Destination="$(OutputPath)$(LibPrefix)nethost.h" />
<FilesToPublish Include="$(DotNetHostBinDir)\host_error_codes.h"
Destination="$(OutputPath)$(LibPrefix)host_error_codes.h" />
</ItemGroup>

<Copy SourceFiles="@(FilesToPublish)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<NativeBinary Include="$(DotNetHostBinDir)/$(LibPrefix)nethost$(StaticLibSuffix)" />
<NativeBinary Include="$(DotNetHostBinDir)/coreclr_delegates.h" />
<NativeBinary Include="$(DotNetHostBinDir)/hostfxr.h" />
<NativeBinary Include="$(DotNetHostBinDir)/host_error_codes.h" />
<NativeBinary Include="$(DotNetHostBinDir)/nethost.h" />
Comment thread
elinor-fung marked this conversation as resolved.
</ItemGroup>
<ItemGroup Condition="'$(RuntimeFlavor)' != 'Mono' and '$(TargetsLinuxBionic)' != 'true'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibPrefix)nethost$(StaticLibSuffix)" />
<NativeRuntimeAsset Include="$(DotNetHostBinDir)/nethost.h" />
<NativeRuntimeAsset Include="$(DotNetHostBinDir)/hostfxr.h" />
<NativeRuntimeAsset Include="$(DotNetHostBinDir)/host_error_codes.h" />
<NativeRuntimeAsset Include="$(DotNetHostBinDir)/coreclr_delegates.h" />
</ItemGroup>
<ItemGroup Condition="'$(RuntimeFlavor)' != 'Mono'">
Expand Down
2 changes: 1 addition & 1 deletion src/native/corehost/error_codes.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ enum StatusCode
HostFeatureDisabled = 0x800080a7, // Support for a requested feature is disabled
};

#define STATUS_CODE_SUCCEEDED(status_code) ((static_cast<int>(static_cast<StatusCode>(status_code))) >= 0)
#define STATUS_CODE_SUCCEEDED(status_code) (((int)(status_code)) >= 0)

#endif // __ERROR_CODES_H__
1 change: 1 addition & 0 deletions src/native/corehost/nethost/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ target_link_libraries (libnethost PUBLIC ${CMAKE_DL_LIBS})

install(FILES ../coreclr_delegates.h DESTINATION corehost)
install(FILES ../hostfxr.h DESTINATION corehost)
install(FILES ../error_codes.h DESTINATION corehost RENAME host_error_codes.h)
install(FILES nethost.h DESTINATION corehost)
install_with_stripped_symbols(nethost TARGETS corehost)

Expand Down
1 change: 1 addition & 0 deletions src/native/corehost/test/mockhostfxr/test_c_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
// Since the runtime repository primarily uses these APIs in C++ code, such issues
// might not be caught during regular development or testing.
#include <coreclr_delegates.h>
#include <error_codes.h>
#include <hostfxr.h>
#include <nethost/nethost.h>
Loading