copy cDAC instead of adding it to sharedFramework

Author: max-charlamb

eng/pipelines/runtime-diagnostics.yml

@@ -46,7 +46,12 @@ extends:
             isOfficialBuild: ${{ variables.isOfficialBuild }}
             timeoutInMinutes: 360
             postBuildSteps:
+            # The cDAC is not included in the runtime pack, so we need to copy it into the testhost directory
             - powershell: |
+                $cdacPath = Get-ChildItem -Path "$(Build.SourcesDirectory)\artifacts\bin\coreclr\*\mscordaccore_universal.dll" | Select-Object -ExpandProperty FullName
+                $outputDacDir = Get-ChildItem -Directory -Path "$(Build.SourcesDirectory)\artifacts\bin\testhost\net*\shared\Microsoft.NETCore.App\*" | Select-Object -ExpandProperty FullName
+                Copy-Item $cdacPath -Destination $outputDacDir
+                Write-Host "Copied $cdacPath to $outputDacDir"
                 $versionDir = Get-ChildItem -Directory -Path "$(Build.SourcesDirectory)\artifacts\bin\testhost\net*\shared\Microsoft.NETCore.App" | Select-Object -ExpandProperty FullName
                 Write-Host "##vso[task.setvariable variable=versionDir]$versionDir"
               displayName: 'Set Path to Shared Framework Artifacts'

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/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>