Skip to content

Commit a1b8651

Browse files
github-actions[bot]wtgodbe
github-actions[bot]
and
wtgodbe
authored
[release/10.0-preview6] Pack symbols in SharedFx for libraries we redist from runtime (#62446)
* Pack symbols in SharedFx for libraries we redist from runtime * Make it a target * Fix PackageRef * Fix target name * Use dependson * Just reference it * Fixup * Unduplicate * Fix conditions * Exact match * Include transitive .pdb's --------- Co-authored-by: Will Godbe <[email protected]>
1 parent d5954c2 commit a1b8651

File tree

2 files changed

+74
-0
lines changed

2 files changed

+74
-0
lines changed

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,33 @@
3131
<AllowedReferenceRelatedFileExtensions>.pdb</AllowedReferenceRelatedFileExtensions>
3232

3333
<PartialCompositeAssemblyListPath>PartialCompositeAssemblyListPath.txt</PartialCompositeAssemblyListPath>
34+
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
35+
</PropertyGroup>
36+
37+
<PropertyGroup>
38+
<GetSharedFrameworkFilesForReadyToRunDependsOn>
39+
$(GetSharedFrameworkFilesForReadyToRunDependsOn);
40+
_AddExtensionsSymbolsToSymbolPack;
41+
</GetSharedFrameworkFilesForReadyToRunDependsOn>
3442
</PropertyGroup>
3543

44+
<ItemGroup>
45+
<PackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport"
46+
Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
47+
ExcludeAssets="All"
48+
GeneratePathProperty="true" />
49+
</ItemGroup>
50+
3651
<ItemGroup>
3752
<Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)">
3853
<IncludeAssets>Runtime;Native</IncludeAssets>
3954
</Reference>
4055
</ItemGroup>
4156

57+
<ItemGroup>
58+
<_AllExternalAspNetCoreAppReferences Include="@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" />
59+
</ItemGroup>
60+
4261
<ItemGroup>
4362
<IgnoredDuplicateType Include="Microsoft.AspNetCore.Hosting.WebHostBuilderIISExtensions" />
4463
<IgnoredDuplicateType Include="Microsoft.Extensions.DependencyInjection.SignalRDependencyInjectionExtensions" />
@@ -86,6 +105,24 @@
86105
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
87106
</ItemGroup>
88107

108+
<!-- Explicitly include symbols for libraries we redistribute from runtime -->
109+
<Target Name="_AddExtensionsSymbolsToSymbolPack">
110+
<!-- Flatten _AllExternalAspNetCoreAppReferences into a property -->
111+
<PropertyGroup>
112+
<FileNameList>@(_AllExternalAspNetCoreAppReferences, ';')</FileNameList>
113+
<!-- Add trailing semicolon -->
114+
<FileNameList>$(FileNameList);</FileNameList>
115+
</PropertyGroup>
116+
117+
<ItemGroup>
118+
<_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
119+
Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
120+
121+
<_SymbolFilesToPackage Include="@(_TransportPdbs)"
122+
Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
123+
</ItemGroup>
124+
</Target>
125+
89126
<Target Name="_WarnAboutUnbuiltNativeDependencies"
90127
BeforeTargets="Build"
91128
Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) AND

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,30 @@
5050
<GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
5151
</PropertyGroup>
5252

53+
<PropertyGroup>
54+
<GetSharedFrameworkFilesForReadyToRunDependsOn>
55+
$(GetSharedFrameworkFilesForReadyToRunDependsOn);
56+
_AddExtensionsSymbolsToSymbolPack;
57+
</GetSharedFrameworkFilesForReadyToRunDependsOn>
58+
</PropertyGroup>
59+
60+
<ItemGroup>
61+
<PackageReference Include="Microsoft.Internal.Runtime.AspNetCore.Transport"
62+
Version="$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
63+
ExcludeAssets="All"
64+
GeneratePathProperty="true" />
65+
</ItemGroup>
66+
5367
<ItemGroup>
5468
<Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)">
5569
<IncludeAssets>Runtime;Native</IncludeAssets>
5670
</Reference>
5771
</ItemGroup>
72+
73+
<ItemGroup>
74+
<_AllExternalAspNetCoreAppReferences Include="@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" />
75+
</ItemGroup>
76+
5877
<ItemGroup>
5978
<PackageReference Condition="'$(GenerateInstallers)' == 'true'" Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
6079
<LinuxPackageDependency Include="dotnet-runtime-$(DotnetRuntimeDependencyMajorMinorVersion)" Version="$(DotnetRuntimeDependencyVersion)" />
@@ -83,6 +102,24 @@
83102
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
84103
</ItemGroup>
85104

105+
<!-- Explicitly include symbols for libraries we redistribute from runtime -->
106+
<Target Name="_AddExtensionsSymbolsToSymbolPack">
107+
<!-- Flatten _AllExternalAspNetCoreAppReferences into a property -->
108+
<PropertyGroup>
109+
<FileNameList>@(_AllExternalAspNetCoreAppReferences, ';')</FileNameList>
110+
<!-- Add trailing semicolon -->
111+
<FileNameList>$(FileNameList);</FileNameList>
112+
</PropertyGroup>
113+
114+
<ItemGroup>
115+
<_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
116+
Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
117+
118+
<_SymbolFilesToPackage Include="@(_TransportPdbs)"
119+
Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename);'))" />
120+
</ItemGroup>
121+
</Target>
122+
86123
<Target Name="_WarnAboutUnbuiltNativeDependencies"
87124
BeforeTargets="Build"
88125
Condition=" '$(UseIisNativeAssets)' == 'true' AND !$(BuildNative) AND

0 commit comments

Comments
 (0)