Unduplicate

Author: wtgodbe

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj

@@ -34,13 +34,22 @@
     <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <GetSharedFrameworkFilesForReadyToRunDependsOn>
+      $(GetSharedFrameworkFilesForReadyToRunDependsOn);
+      _AddExtensionsSymbolsToSymbolPack;
+    </GetSharedFrameworkFilesForReadyToRunDependsOn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport"
-        Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" />
+        Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
+        ExcludeAssets="All"
+        GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage)">
+    <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)">
       <IncludeAssets>Runtime;Native</IncludeAssets>
     </Reference>
   </ItemGroup>
@@ -92,6 +101,20 @@
         Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
   </ItemGroup>
 
+  <Target Name="_AddExtensionsSymbolsToSymbolPack">
+    <!-- Explicitly include symbols for libraries we redistribute from runtime -->
+    <ItemGroup>
+      <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
+          Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
+
+      <_TransportPdbsWithName Include="@(_TransportPdbs)"
+          Name="%(Filename)" />
+
+      <_SymbolFilesToPackage Include="@(_TransportPdbsWithName)"
+          Condition="'@(ExternalAspNetCoreAppReference->AnyHaveMetadataValue('Identity', '%(Name)'))' == 'true'" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="_WarnAboutUnbuiltNativeDependencies"
           BeforeTargets="Build"
           Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) AND

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj

@@ -50,13 +50,22 @@
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <GetSharedFrameworkFilesForReadyToRunDependsOn>
+      $(GetSharedFrameworkFilesForReadyToRunDependsOn);
+      _AddExtensionsSymbolsToSymbolPack;
+    </GetSharedFrameworkFilesForReadyToRunDependsOn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport"
-        Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" />
+        Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
+        ExcludeAssets="All"
+        GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage)">
+    <Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)">
       <IncludeAssets>Runtime;Native</IncludeAssets>
     </Reference>
   </ItemGroup>
@@ -88,6 +97,20 @@
         Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
   </ItemGroup>
 
+  <Target Name="_AddExtensionsSymbolsToSymbolPack">
+    <!-- Explicitly include symbols for libraries we redistribute from runtime -->
+    <ItemGroup>
+      <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
+          Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
+
+      <_TransportPdbsWithName Include="@(_TransportPdbs)"
+          Name="%(Filename)" />
+
+      <_SymbolFilesToPackage Include="@(_TransportPdbsWithName)"
+          Condition="'@(ExternalAspNetCoreAppReference->AnyHaveMetadataValue('Identity', '%(Name)'))' == 'true'" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="_WarnAboutUnbuiltNativeDependencies"
           BeforeTargets="Build"
           Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) AND