remove from sharedFramework and add to externals

Author: max-charlamb

src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

@@ -115,9 +115,6 @@
     <PlatformManifestFileEntry Condition="'$(PgoInstrument)' != ''" Include="clrjit.pgd" IsNative="true" />
     <PlatformManifestFileEntry Include="libclrjit.so" IsNative="true" />
     <PlatformManifestFileEntry Include="libclrjit.dylib" IsNative="true" />
-    <PlatformManifestFileEntry Include="mscordaccore_universal.dll" IsNative="true" />
-    <PlatformManifestFileEntry Include="libmscordaccore_universal.so" IsNative="true" />
-    <PlatformManifestFileEntry Include="libmscordaccore_universal.dylib" IsNative="true" />
     <PlatformManifestFileEntry Include="mscordaccore.dll" IsNative="true" />
     <PlatformManifestFileEntry Include="libmscordaccore.so" IsNative="true" />
     <PlatformManifestFileEntry Include="libmscordaccore.dylib" IsNative="true" />

src/libraries/externals.csproj

@@ -90,8 +90,8 @@
       <RuntimeFiles Include="$(CoreCLRArtifactsPath)\PDB\corerun*" Condition="'$(TargetsAndroid)' != 'true'" />
       <!-- Include cDAC reader library
            TODO: [cdac] Remove once cdacreader is added to shipping shared framework -->
-      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\*cdacreader*" />
-      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\PDB\*cdacreader*" />
+      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\$(LibPrefix)mscordaccore_universal$(LibSuffix)" />
+      <RuntimeFiles Include="$(CoreCLRArtifactsPath)\PDB\$(LibPrefix)mscordaccore_universal$(SymbolsSuffix)" />
     </ItemGroup>
     <!-- If the build has native sanitizers, copy over the non-sanitized diagnostic binaries so they can be loaded by a debugger -->
     <ItemGroup Condition="'$(EnableNativeSanitizers)' != ''">

src/native/managed/cdac/mscordaccore_universal/mscordaccore_universal.csproj

@@ -27,7 +27,8 @@
   </ItemGroup>
   <ItemGroup>
     <InstallRuntimeComponentDestination Include="." />
-    <InstallRuntimeComponentDestination Include="sharedFramework" Condition="'$(RuntimeFlavor)' == 'coreclr'"/>
+    <!-- TODO: [cdac] Output to sharedFramework and add PlatformManifestFileEntry for Microsoft.NETCore.App once ready to include in shipping package -->
+    <!-- <InstallRuntimeComponentDestination Include="sharedFramework" Condition="'$(RuntimeFlavor)' == 'coreclr'"/> -->
   </ItemGroup>
 
   <ItemGroup>