Skip to content

Commit 5076157

Browse files
committed
Feedback
1 parent 514ae40 commit 5076157

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

eng/targets/ResolveReferences.targets

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -160,29 +160,22 @@
160160
'@(_FrameworkProjectReference)' != '' AND
161161
'@(FrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->Count())' == '0'">
162162
<KnownFrameworkReference Include="@(_RemovedAspNetKnownFrameworkReference)" />
163-
<!-- Mark as IsTransitiveFrameworkReference to exclude the pruning data -->
164-
<FrameworkReference Include="Microsoft.AspNetCore.App" IsTransitiveFrameworkReference="true" />
163+
<!-- Mark as IsTransitiveFrameworkReference to exclude the pruning data: https://github.com/dotnet/sdk/issues/53106 -->
164+
<FrameworkReference Include="Microsoft.AspNetCore.App" IsTransitiveFrameworkReference="true" DoNotResolve="true" />
165165
</ItemGroup>
166166

167167
<!-- Remove the referenced AspNetCore framework before it's resolved in ResolveFrameworkReferences. This lets us use our own references. -->
168168
<Target Name="_RemoveAspNetCoreFrameworkReference"
169-
BeforeTargets="ResolveFrameworkReferences"
170-
Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' AND
171-
'$(IsPackable)' == 'true' AND
172-
'$(IsAspNetCoreApp)' != 'true' AND
173-
'@(_FrameworkProjectReference)' != '' AND
174-
'@(FrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->Count())' != '0'" >
169+
BeforeTargets="ResolveFrameworkReferences" >
175170
<ItemGroup>
176-
<FrameworkReference Remove="Microsoft.AspNetCore.App" />
171+
<FrameworkReference Remove="@(FrameworkReference->WithMetadataValue('DoNotResolve', 'true')" />
177172
</ItemGroup>
178173
</Target>
179174

180175
<!-- Remove Transtive Microsoft.Aspnetcore.App FrameworkReference, for projects referencing the affected projects above -->
181176
<Target Name="_RemoveAspNetCoreTransitiveFrameworkReference"
182177
BeforeTargets="AddTransitiveFrameworkReferences"
183-
AfterTargets="ResolvePackageAssets"
184-
Condition="'@(TransitiveFrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->Count())' != '0' AND
185-
'$(UseAspNetCoreSharedRuntime)' != 'true'" >
178+
Condition="'@(TransitiveFrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->Count())' != '0'">
186179
<ItemGroup>
187180
<TransitiveFrameworkReference Remove="Microsoft.AspNetCore.App" />
188181
</ItemGroup>

0 commit comments

Comments
 (0)