|
160 | 160 | '@(_FrameworkProjectReference)' != '' AND |
161 | 161 | '@(FrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->Count())' == '0'"> |
162 | 162 | <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" /> |
165 | 165 | </ItemGroup> |
166 | 166 |
|
167 | 167 | <!-- Remove the referenced AspNetCore framework before it's resolved in ResolveFrameworkReferences. This lets us use our own references. --> |
168 | 168 | <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" > |
175 | 170 | <ItemGroup> |
176 | | - <FrameworkReference Remove="Microsoft.AspNetCore.App" /> |
| 171 | + <FrameworkReference Remove="@(FrameworkReference->WithMetadataValue('DoNotResolve', 'true')" /> |
177 | 172 | </ItemGroup> |
178 | 173 | </Target> |
179 | 174 |
|
180 | 175 | <!-- Remove Transtive Microsoft.Aspnetcore.App FrameworkReference, for projects referencing the affected projects above --> |
181 | 176 | <Target Name="_RemoveAspNetCoreTransitiveFrameworkReference" |
182 | 177 | 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'"> |
186 | 179 | <ItemGroup> |
187 | 180 | <TransitiveFrameworkReference Remove="Microsoft.AspNetCore.App" /> |
188 | 181 | </ItemGroup> |
|
0 commit comments