diff --git a/core/hosting/HostWithHostFxr/Directory.Build.props b/core/hosting/Directory.Build.props similarity index 100% rename from core/hosting/HostWithHostFxr/Directory.Build.props rename to core/hosting/Directory.Build.props diff --git a/core/hosting/HostWithHostFxr/build.proj b/core/hosting/build.proj similarity index 100% rename from core/hosting/HostWithHostFxr/build.proj rename to core/hosting/build.proj diff --git a/core/hosting/HostWithHostFxr/global.json b/core/hosting/global.json similarity index 100% rename from core/hosting/HostWithHostFxr/global.json rename to core/hosting/global.json diff --git a/core/hosting/HostWithHostFxr/readme.md b/core/hosting/readme.md similarity index 81% rename from core/hosting/HostWithHostFxr/readme.md rename to core/hosting/readme.md index 6e893fdf3d3..3b2dfea23fa 100644 --- a/core/hosting/HostWithHostFxr/readme.md +++ b/core/hosting/readme.md @@ -1,16 +1,16 @@ -# .NET Core Hosting Sample +# .NET Hosting Sample -This project demonstrates a way for a native process to host .NET Core using the `nethost` and `hostfxr` libraries. Documentation on the `nethost` and `hostfxr` APIs can be found [here](https://github.com/dotnet/runtime/blob/main/docs/design/features/native-hosting.md). +This project demonstrates a way for a native process to host .NET using the `nethost` and `hostfxr` libraries. Documentation on the `nethost` and `hostfxr` APIs can be found [here](https://github.com/dotnet/runtime/blob/main/docs/design/features/native-hosting.md). -This sample is part of the [.NET Core hosting tutorial](https://docs.microsoft.com/dotnet/core/tutorials/netcore-hosting). Please see that topic for a more detailed explanation of the sample and the steps necessary to host .NET Core. +This sample is part of the [.NET hosting tutorial](https://docs.microsoft.com/dotnet/core/tutorials/netcore-hosting). Please see that topic for a more detailed explanation of the sample and the steps necessary to host .NET. -The host is small and bypasses a lot of complexity (thorough error checking, etc.) that a real host would have. Hopefully by remaining simple, though, it will be useful for demonstrating the core concepts of hosting managed .NET Core code in a native process. +The host is small and bypasses a lot of complexity (thorough error checking, etc.) that a real host would have. Hopefully by remaining simple, though, it will be useful for demonstrating the core concepts of hosting managed .NET code in a native process. ## Key Features -Demonstrates how to locate and initialize .NET Core runtime from a non-.NET Core process and subsequently load and call into a .NET Core assembly. +Demonstrates how to locate and initialize .NET runtime from a non-.NET process and subsequently load and call into a .NET assembly. -The `nethost` header and library are part of the `Microsoft.NETCore.DotNetAppHost` package and are also installed as a runtime pack by the .NET Core SDK. The library should be deployed alongside the host. This sample uses the files installed with the .NET Core SDK. +The `nethost` header and library are part of the `Microsoft.NETCore.DotNetAppHost` package and are also installed as a runtime pack by the .NET SDK. The library should be deployed alongside the host. This sample uses the files installed with the .NET SDK. *Note: The `Microsoft.NETCore.DotNetAppHost` package is a [metapackage](https://docs.microsoft.com/dotnet/core/packages#metapackages) that doesn't actually contain the files. It only references RID-specific packages that contain the files. For example, the package with the actual files for `linux-x64` is `runtime.linux-x64.Microsoft.NETCore.DotNetAppHost`.* The `coreclr_delegates.h` and `hostfxr.h` files are copied from the [dotnet/runtime](https://github.com/dotnet/runtime) repo - [coreclr_delegates.h](https://github.com/dotnet/runtime/blob/main/src/installer/corehost/cli/coreclr_delegates.h) and [hostfxr.h](https://github.com/dotnet/runtime/blob/main/src/installer/corehost/cli/hostfxr.h). diff --git a/core/hosting/HostWithHostFxr/src/DotNetLib/DotNetLib.csproj b/core/hosting/src/DotNetLib/DotNetLib.csproj similarity index 100% rename from core/hosting/HostWithHostFxr/src/DotNetLib/DotNetLib.csproj rename to core/hosting/src/DotNetLib/DotNetLib.csproj diff --git a/core/hosting/HostWithHostFxr/src/DotNetLib/Lib.cs b/core/hosting/src/DotNetLib/Lib.cs similarity index 100% rename from core/hosting/HostWithHostFxr/src/DotNetLib/Lib.cs rename to core/hosting/src/DotNetLib/Lib.cs diff --git a/core/hosting/HostWithHostFxr/src/HostWithHostFxr.sln b/core/hosting/src/HostWithHostFxr.sln similarity index 100% rename from core/hosting/HostWithHostFxr/src/HostWithHostFxr.sln rename to core/hosting/src/HostWithHostFxr.sln diff --git a/core/hosting/HostWithHostFxr/src/NativeHost/NativeHost.csproj b/core/hosting/src/NativeHost/NativeHost.csproj similarity index 100% rename from core/hosting/HostWithHostFxr/src/NativeHost/NativeHost.csproj rename to core/hosting/src/NativeHost/NativeHost.csproj diff --git a/core/hosting/HostWithHostFxr/src/NativeHost/NativeHost.vs.vcxproj b/core/hosting/src/NativeHost/NativeHost.vs.vcxproj similarity index 100% rename from core/hosting/HostWithHostFxr/src/NativeHost/NativeHost.vs.vcxproj rename to core/hosting/src/NativeHost/NativeHost.vs.vcxproj diff --git a/core/hosting/HostWithHostFxr/src/NativeHost/NativeHost.vs.vcxproj.filters b/core/hosting/src/NativeHost/NativeHost.vs.vcxproj.filters similarity index 100% rename from core/hosting/HostWithHostFxr/src/NativeHost/NativeHost.vs.vcxproj.filters rename to core/hosting/src/NativeHost/NativeHost.vs.vcxproj.filters diff --git a/core/hosting/HostWithHostFxr/src/NativeHost/Properties/launchSettings.json b/core/hosting/src/NativeHost/Properties/launchSettings.json similarity index 100% rename from core/hosting/HostWithHostFxr/src/NativeHost/Properties/launchSettings.json rename to core/hosting/src/NativeHost/Properties/launchSettings.json diff --git a/core/hosting/HostWithHostFxr/src/NativeHost/inc.vs/nethost.h b/core/hosting/src/NativeHost/inc.vs/nethost.h similarity index 100% rename from core/hosting/HostWithHostFxr/src/NativeHost/inc.vs/nethost.h rename to core/hosting/src/NativeHost/inc.vs/nethost.h diff --git a/core/hosting/HostWithHostFxr/src/NativeHost/inc/coreclr_delegates.h b/core/hosting/src/NativeHost/inc/coreclr_delegates.h similarity index 100% rename from core/hosting/HostWithHostFxr/src/NativeHost/inc/coreclr_delegates.h rename to core/hosting/src/NativeHost/inc/coreclr_delegates.h diff --git a/core/hosting/HostWithHostFxr/src/NativeHost/inc/hostfxr.h b/core/hosting/src/NativeHost/inc/hostfxr.h similarity index 100% rename from core/hosting/HostWithHostFxr/src/NativeHost/inc/hostfxr.h rename to core/hosting/src/NativeHost/inc/hostfxr.h diff --git a/core/hosting/HostWithHostFxr/src/NativeHost/nativehost.cpp b/core/hosting/src/NativeHost/nativehost.cpp similarity index 100% rename from core/hosting/HostWithHostFxr/src/NativeHost/nativehost.cpp rename to core/hosting/src/NativeHost/nativehost.cpp