diff --git a/build/SharedFx.props b/build/SharedFx.props
index f9559d6d7d..2f35fd7778 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -17,6 +17,12 @@
     <PathSeparator Condition="'$(PathSeparator)' == ''">:</PathSeparator>
     <PathSeparator Condition="$(SharedFxRID.StartsWith('win'))">%3B</PathSeparator>
 
+    <LibPrefix Condition="$([MSBuild]::IsOSPlatform('Linux')) OR $([MSBuild]::IsOSPlatform('OSX'))">lib</LibPrefix>
+    <LibExtension>.so</LibExtension>
+    <LibExtension Condition="$([MSBuild]::IsOSPlatform('Windows'))">.dll</LibExtension>
+    <LibExtension Condition="$([MSBuild]::IsOSPlatform('OSX'))">.dylib</LibExtension>
+    <ExeExtension Condition="$([MSBuild]::IsOSPlatform('Windows'))">.exe</ExeExtension>
+
     <!-- installers -->
     <SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName>
     <!--
@@ -24,9 +30,7 @@
       Subsequent build steps will combine this with Microsoft.NETCore.App and produce final tarballs/zips.
     -->
     <SharedFxIntermediateArchiveBaseName>$(SharedFxInstallerName)-internal</SharedFxIntermediateArchiveBaseName>
-
     <DebConfigInFile>$(_PackagingDir)debian_config.json.in</DebConfigInFile>
-
     <PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix>
 
     <!-- In an orchestrated build, this may be overriden to other Azure feeds. -->
diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 6ec447b623..132b3aa94b 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -132,13 +132,13 @@
   <Target Name="PrepareForSharedFx" DependsOnTargets="DefineSharedFxPrerequisites;ResolveCommitHash">
     <PropertyGroup>
       <AppSharedFxProps>SharedFxWorkDirectory=$(AppSharedFxWorkDirectory)</AppSharedFxProps>
+      <AppSharedFxProps>$(AppSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion)</AppSharedFxProps>
       <AppSharedFxProps>$(AppSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.App</AppSharedFxProps>
-      <AppSharedFxProps>$(AppSharedFxProps);SharedFxBase=Microsoft.NETCore.App</AppSharedFxProps>
-      <AppSharedFxProps>$(AppSharedFxProps);SharedFxBaseVersion=$(MicrosoftNETCoreApp21PackageVersion)</AppSharedFxProps>
       <AllSharedFxProps>SharedFxWorkDirectory=$(AllSharedFxWorkDirectory)</AllSharedFxProps>
+      <AllSharedFxProps>$(AllSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion)</AllSharedFxProps>
       <AllSharedFxProps>$(AllSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.All</AllSharedFxProps>
-      <AllSharedFxProps>$(AllSharedFxProps);SharedFxBase=Microsoft.AspNetCore.App</AllSharedFxProps>
-      <AllSharedFxProps>$(AllSharedFxProps);SharedFxBaseVersion=$(PackageVersion)</AllSharedFxProps>
+      <AllSharedFxProps>$(AllSharedFxProps);SharedFxDep=Microsoft.AspNetCore.App</AllSharedFxProps>
+      <AllSharedFxProps>$(AllSharedFxProps);SharedFxDepVersion=$(PackageVersion)</AllSharedFxProps>
     </PropertyGroup>
 
     <ItemGroup>
@@ -169,6 +169,9 @@
       <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx" />
       <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.dll" />
       <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.pdb" />
+      <ToDelete Include="$(SharedFxPublishDirectory)\apphost$(ExeExtension)" />
+      <ToDelete Include="$(SharedFxPublishDirectory)\$(LibPrefix)hostfxr$(LibExtension)" />
+      <ToDelete Include="$(SharedFxPublishDirectory)\$(LibPrefix)hostpolicy$(LibExtension)" />
     </ItemGroup>
 
     <Delete Files="@(ToDelete)" />
@@ -225,11 +228,6 @@
       <RuntimePackageName>Microsoft.NETCore.App</RuntimePackageName>
       <CrossGenTool>crossgen</CrossGenTool>
       <CrossGenTool Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(CrossGenTool).exe</CrossGenTool>
-
-      <LibPrefix Condition="$([MSBuild]::IsOSPlatform('Linux')) OR $([MSBuild]::IsOSPlatform('OSX'))">lib</LibPrefix>
-      <LibExtension>.so</LibExtension>
-      <LibExtension Condition="$([MSBuild]::IsOSPlatform('Windows'))">.dll</LibExtension>
-      <LibExtension Condition="$([MSBuild]::IsOSPlatform('OSX'))">.dylib</LibExtension>
     </PropertyGroup>
 
     <!-- Determine runtime location (via .App shared framework) -->
diff --git a/build/tools/templates/SharedFx/SharedFx.csproj b/build/tools/templates/SharedFx/SharedFx.csproj
index 5f130476e7..587662bb05 100644
--- a/build/tools/templates/SharedFx/SharedFx.csproj
+++ b/build/tools/templates/SharedFx/SharedFx.csproj
@@ -21,7 +21,8 @@
 
   <ItemGroup>
    <PackageReference Include="$(SharedFxPackage)" Version="$(SharedFxPackageVersion)" ExcludeAssets="Build" />
-   <PackageReference Include="$(SharedFxBase)" Version="$(SharedFxBaseVersion)"/>
+   <PackageReference Include="$(SharedFxDep)" Version="$(SharedFxDepVersion)" Condition="'$(SharedFxDep)' != ''"/>
+   <PackageReference Include="Microsoft.NETCore.App" Version="$(RuntimeFrameworkVersion)"/>
   </ItemGroup>
 
   <Target Name="GetPackageDefinitions" Returns="@(_PackageDefinitions)">