Skip to content

Commit

Permalink
Restore the Microsoft.NETCore.DotNetAppHost package since the SDK tra…
Browse files Browse the repository at this point in the history
…nsitively uses it through the Microsoft.NETCore.DotNetHostResolver package. (dotnet#44883)
  • Loading branch information
jkoritzinsky authored Nov 18, 2020
1 parent 38259c8 commit eeba597
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionProp>AppHostVersion</VersionProp>
</PropertyGroup>

<ItemGroup>
<NativeBinary Include="$(DotNetHostBinDir)/apphost$(ApplicationFileExtension)" />
<NativeBinary Include="$(DotNetHostBinDir)/singlefilehost$(ApplicationFileExtension)" />
<NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)nethost$(LibraryFileExtension)" />
<NativeBinary Include="$(DotNetHostBinDir)/$(LibraryFilePrefix)nethost$(StaticLibraryFileExtension)" />
<NativeBinary Include="$(DotNetHostBinDir)/coreclr_delegates.h" />
<NativeBinary Include="$(DotNetHostBinDir)/hostfxr.h" />
<NativeBinary Include="$(DotNetHostBinDir)/nethost.h" />
</ItemGroup>
<ItemGroup Condition="'$(TargetOS)' == 'windows'">
<NativeBinary Include="$(DotNetHostBinDir)/comhost.dll" />
<NativeBinary Include="$(DotNetHostBinDir)/ijwhost.dll" />
<NativeBinary Include="$(DotNetHostBinDir)/ijwhost.lib" />
<!-- The libnethost.lib is a static library for the nethost scenario.
The symbols file is also shipped to enable users to fully debug
binaries that link against the static version. -->
<NativeBinary Include="$(DotNetHostBinDir)/libnethost.lib" />
<NativeBinary Include="$(DotNetHostBinDir)/PDB/libnethost.pdb" />
</ItemGroup>

<ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
<File Include="@(NativeBinary)">
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
<IsNative>true</IsNative>
</File>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/installer/pkg/projects/host-packages.proj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Sdk="Microsoft.Build.Traversal" Project="Sdk.props" />

<ItemGroup>
<ProjectReference Include="Microsoft.NETCore.DotNetAppHost\Microsoft.NETCore.DotNetAppHost.pkgproj" />
<ProjectReference Include="Microsoft.NETCore.DotNetHost\Microsoft.NETCore.DotNetHost.pkgproj" />
<ProjectReference Include="Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.pkgproj" />
<ProjectReference Include="Microsoft.NETCore.DotNetHostResolver\Microsoft.NETCore.DotNetHostResolver.pkgproj" />
Expand Down

0 comments on commit eeba597

Please sign in to comment.