Prechádzať zdrojové kódy

Exclude native assets from Microsoft.NETCore.App

John Luo 8 rokov pred
rodič
commit
beefdd5f46

+ 0 - 3
build/SharedFx.targets

@@ -169,9 +169,6 @@
       <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx" />
       <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx" />
       <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.dll" />
       <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.dll" />
       <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.pdb" />
       <ToDelete Include="$(SharedFxPublishDirectory)\SharedFx.pdb" />
-      <ToDelete Include="$(SharedFxPublishDirectory)\apphost$(ExeExtension)" />
-      <ToDelete Include="$(SharedFxPublishDirectory)\$(LibPrefix)hostfxr$(LibExtension)" />
-      <ToDelete Include="$(SharedFxPublishDirectory)\$(LibPrefix)hostpolicy$(LibExtension)" />
     </ItemGroup>
     </ItemGroup>
 
 
     <Delete Files="@(ToDelete)" />
     <Delete Files="@(ToDelete)" />

+ 1 - 1
build/tools/templates/SharedFx/SharedFx.csproj

@@ -22,7 +22,7 @@
   <ItemGroup>
   <ItemGroup>
    <PackageReference Include="$(SharedFxPackage)" Version="$(SharedFxPackageVersion)" ExcludeAssets="Build" />
    <PackageReference Include="$(SharedFxPackage)" Version="$(SharedFxPackageVersion)" ExcludeAssets="Build" />
    <PackageReference Include="$(SharedFxDep)" Version="$(SharedFxDepVersion)" Condition="'$(SharedFxDep)' != ''"/>
    <PackageReference Include="$(SharedFxDep)" Version="$(SharedFxDepVersion)" Condition="'$(SharedFxDep)' != ''"/>
-   <PackageReference Include="Microsoft.NETCore.App" Version="$(RuntimeFrameworkVersion)"/>
+   <PackageReference Include="Microsoft.NETCore.App" Version="$(RuntimeFrameworkVersion)" ExcludeAssets="Native"/>
   </ItemGroup>
   </ItemGroup>
 
 
   <Target Name="GetPackageDefinitions" Returns="@(_PackageDefinitions)">
   <Target Name="GetPackageDefinitions" Returns="@(_PackageDefinitions)">