Skip to content

Commit 6356266

Browse files
committed
Fix conditions
1 parent 233105d commit 6356266

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,19 @@
101101
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
102102
</ItemGroup>
103103

104+
<!-- Explicitly include symbols for libraries we redistribute from runtime -->
104105
<Target Name="_AddExtensionsSymbolsToSymbolPack">
105-
<!-- Explicitly include symbols for libraries we redistribute from runtime -->
106+
<!-- Flatten ExternalAspNetCoreAppReference into a property -->
107+
<PropertyGroup>
108+
<FileNameList>@(ExternalAspNetCoreAppReference, ';')</FileNameList>
109+
</PropertyGroup>
110+
106111
<ItemGroup>
107112
<_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
108113
Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
109114

110-
<_TransportPdbsWithName Include="@(_TransportPdbs)"
111-
Name="%(Filename)" />
112-
113-
<_SymbolFilesToPackage Include="@(_TransportPdbsWithName)"
114-
Condition="'@(ExternalAspNetCoreAppReference->AnyHaveMetadataValue('Identity', '%(Name)'))' == 'true'" />
115+
<_SymbolFilesToPackage Include="@(_TransportPdbs)"
116+
Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename)'))" />
115117
</ItemGroup>
116118
</Target>
117119

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,19 @@
9797
Include="$(ArtifactsBinDir)InProcessRequestHandler\$(NativePlatform)\$(Configuration)\aspnetcorev2_inprocess.pdb" />
9898
</ItemGroup>
9999

100+
<!-- Explicitly include symbols for libraries we redistribute from runtime -->
100101
<Target Name="_AddExtensionsSymbolsToSymbolPack">
101-
<!-- Explicitly include symbols for libraries we redistribute from runtime -->
102+
<!-- Flatten ExternalAspNetCoreAppReference into a property -->
103+
<PropertyGroup>
104+
<FileNameList>@(ExternalAspNetCoreAppReference, ';')</FileNameList>
105+
</PropertyGroup>
106+
102107
<ItemGroup>
103108
<_TransportPdbs Include="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.pdb"
104109
Exclude="$(PkgMicrosoft_Internal_Runtime_AspNetCore_Transport)\**\*.ni.pdb" />
105110

106-
<_TransportPdbsWithName Include="@(_TransportPdbs)"
107-
Name="%(Filename)" />
108-
109-
<_SymbolFilesToPackage Include="@(_TransportPdbsWithName)"
110-
Condition="'@(ExternalAspNetCoreAppReference->AnyHaveMetadataValue('Identity', '%(Name)'))' == 'true'" />
111+
<_SymbolFilesToPackage Include="@(_TransportPdbs)"
112+
Condition="'$(FileNameList)' != '' and $(FileNameList.Contains('%(Filename)'))" />
111113
</ItemGroup>
112114
</Target>
113115

0 commit comments

Comments
 (0)