From 2f07492a7643d54d71c155794aca1d8326386b80 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 20 Jun 2025 12:30:30 -0700 Subject: [PATCH 01/11] Pack symbols in SharedFx for libraries we redist from runtime --- ...t.AspNetCore.App.Runtime.Composite.sfxproj | 19 +++++++++++++++++++ .../Microsoft.AspNetCore.App.Runtime.sfxproj | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj index 6e118063f32d..97a61bfb5de1 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj @@ -33,6 +33,25 @@ PartialCompositeAssemblyListPath.txt + + + + + + + <_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'" /> + + Runtime;Native diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj index b9434fb6e186..aec20bf4395a 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj @@ -50,6 +50,25 @@ true + + + + + + + <_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'" /> + + Runtime;Native From 6e288364a65999cc3872e5dcfa806655b78ef167 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 20 Jun 2025 12:40:50 -0700 Subject: [PATCH 02/11] Make it a target --- ...t.AspNetCore.App.Runtime.Composite.sfxproj | 23 +++++++++---------- .../Microsoft.AspNetCore.App.Runtime.sfxproj | 23 +++++++++---------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj index 97a61bfb5de1..40f743c4cd20 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj @@ -40,18 +40,6 @@ GeneratePathProperty="true" /> - - - <_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'" /> - - Runtime;Native @@ -105,6 +93,17 @@ Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" /> + + + + <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb" + Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" /> + + <_SymbolFilesToPackage Include="@(_TransportPdbs)" + Condition="'@(ExternalAspNetCoreAppReference->AnyHaveMetadataValue('Identity', '%(Filename)'))' == 'true'" /> + + + - - - <_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'" /> - - Runtime;Native @@ -102,6 +90,17 @@ Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" /> + + + + <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb" + Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" /> + + <_SymbolFilesToPackage Include="@(_TransportPdbs)" + Condition="'@(ExternalAspNetCoreAppReference->AnyHaveMetadataValue('Identity', '%(Filename)'))' == 'true'" /> + + + - + <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb" diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj index e901e0d6555a..7a794dc4d070 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj @@ -90,7 +90,7 @@ Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" /> - + <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb" From 6897c51c16db003f192a3fbdba6a8dc588db0637 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 20 Jun 2025 17:55:07 -0700 Subject: [PATCH 05/11] Use dependson --- .../Microsoft.AspNetCore.App.Runtime.Composite.sfxproj | 9 ++++++++- .../src/Microsoft.AspNetCore.App.Runtime.sfxproj | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj index eb3c0a95494b..f056dae992eb 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj @@ -34,6 +34,13 @@ true + + + $(GetSharedFrameworkFilesForReadyToRunDependsOn); + _AddExtensionsSymbolsToSymbolPack; + + + - + <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb" diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj index 7a794dc4d070..2d66ec0f2b9e 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj @@ -50,6 +50,13 @@ true + + + $(GetSharedFrameworkFilesForReadyToRunDependsOn); + _AddExtensionsSymbolsToSymbolPack; + + + - + <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb" From dff1fb292e02316732e056517b8b350ca86a0ec0 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 20 Jun 2025 20:46:22 -0700 Subject: [PATCH 06/11] Just reference it --- ...t.AspNetCore.App.Runtime.Composite.sfxproj | 24 ++----------------- .../Microsoft.AspNetCore.App.Runtime.sfxproj | 22 +---------------- 2 files changed, 3 insertions(+), 43 deletions(-) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj index f056dae992eb..3945390a8ad2 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj @@ -34,22 +34,13 @@ true - - - $(GetSharedFrameworkFilesForReadyToRunDependsOn); - _AddExtensionsSymbolsToSymbolPack; - - - + Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" /> - + Runtime;Native @@ -101,17 +92,6 @@ Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" /> - - - - <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb" - Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" /> - - <_SymbolFilesToPackage Include="@(_TransportPdbs)" - Condition="'@(ExternalAspNetCoreAppReference->AnyHaveMetadataValue('Identity', '%(Filename)'))' == 'true'" /> - - - - + Runtime;Native @@ -97,17 +88,6 @@ Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" /> - - - - <_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb" - Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" /> - - <_SymbolFilesToPackage Include="@(_TransportPdbs)" - Condition="'@(ExternalAspNetCoreAppReference->AnyHaveMetadataValue('Identity', '%(Filename)'))' == 'true'" /> - - - From 233105d139465a472df7e1453595339788558fe6 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Sat, 21 Jun 2025 11:09:57 -0700 Subject: [PATCH 08/11] Unduplicate --- ...t.AspNetCore.App.Runtime.Composite.sfxproj | 27 +++++++++++++++++-- .../Microsoft.AspNetCore.App.Runtime.sfxproj | 27 +++++++++++++++++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj index 3945390a8ad2..f31cc11e44de 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj @@ -34,13 +34,22 @@ true + + + $(GetSharedFrameworkFilesForReadyToRunDependsOn); + _AddExtensionsSymbolsToSymbolPack; + + + + Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" + ExcludeAssets="All" + GeneratePathProperty="true" /> - + Runtime;Native @@ -92,6 +101,20 @@ Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" /> + + + + <_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'" /> + + + + Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" + ExcludeAssets="All" + GeneratePathProperty="true" /> - + Runtime;Native @@ -88,6 +97,20 @@ Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" /> + + + + <_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'" /> + + + + - + + + @(ExternalAspNetCoreAppReference, ';') + + <_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'" /> + <_SymbolFilesToPackage Include="@(_TransportPdbs)" + Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename)'))" /> diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj index ffc2f48cfe52..c5f5894ea1c9 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj @@ -97,17 +97,19 @@ Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" /> + - + + + @(ExternalAspNetCoreAppReference, ';') + + <_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'" /> + <_SymbolFilesToPackage Include="@(_TransportPdbs)" + Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename)'))" /> From 3291251fd216d563c6e99008f4b56ec86822974d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 23 Jun 2025 10:10:51 -0700 Subject: [PATCH 10/11] Exact match --- .../src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj | 4 +++- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj index d9262c62b0ee..c3fd5871aff7 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj @@ -106,6 +106,8 @@ @(ExternalAspNetCoreAppReference, ';') + + $(FileNameList); @@ -113,7 +115,7 @@ Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" /> <_SymbolFilesToPackage Include="@(_TransportPdbs)" - Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename)'))" /> + Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" /> diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj index c5f5894ea1c9..addea01eb2cb 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj @@ -102,6 +102,8 @@ @(ExternalAspNetCoreAppReference, ';') + + $(FileNameList); @@ -109,7 +111,7 @@ Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" /> <_SymbolFilesToPackage Include="@(_TransportPdbs)" - Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename)'))" /> + Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" /> From 065552ffa1ad86df6cbdc36485ef03b8f061383a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 23 Jun 2025 11:12:15 -0700 Subject: [PATCH 11/11] Include transitive .pdb's --- .../Microsoft.AspNetCore.App.Runtime.Composite.sfxproj | 8 ++++++-- .../src/Microsoft.AspNetCore.App.Runtime.sfxproj | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj index c3fd5871aff7..f70515ab14fa 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj @@ -54,6 +54,10 @@ + + <_AllExternalAspNetCoreAppReferences Include="@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" /> + + @@ -103,9 +107,9 @@ - + - @(ExternalAspNetCoreAppReference, ';') + @(_AllExternalAspNetCoreAppReferences, ';') $(FileNameList); diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj index addea01eb2cb..590895e2929c 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj @@ -69,6 +69,11 @@ Runtime;Native + + + <_AllExternalAspNetCoreAppReferences Include="@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" /> + + @@ -99,9 +104,9 @@ - + - @(ExternalAspNetCoreAppReference, ';') + @(_AllExternalAspNetCoreAppReferences, ';') $(FileNameList);