Skip to content

[release/6.0 Cleanup remaining SSP references #36248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dougbu merged 3 commits into from
Sep 9, 2021
Merged

[release/6.0 Cleanup remaining SSP references #36248

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b969db
[release/6.0 Cleanup remaining SSP references
dougbu Sep 7, 2021
1be8200
Restore App.Ref exclusions
dougbu Sep 9, 2021
4f94240
!fixup! Correct comments
dougbu Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
BeforeTargets="_GetPackageFiles"
DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
<ItemGroup>
<!-- Exclude transitive external dependencies that are not directly referenced in AspNetCore or Runtime. -->
<_DisallowedReferenceAssemblies Include="
Microsoft.Win32.SystemEvents.dll;
System.Drawing.Common.dll;
System.Net.Quic.dll;
System.Security.Cryptography.Pkcs.dll;
System.Security.Permissions.dll;
System.Windows.Extensions.dll" />
<!-- Exclude a dependency that we don't want to expose. -->
<_DisallowedReferenceAssemblies Include="System.Net.Quic.dll" />
<_AvailableRuntimeRefAssemblies Include="$(RuntimeTransportReferenceDirectory)*.dll"
Exclude="@(_DisallowedReferenceAssemblies->'$(RuntimeTransportReferenceDirectory)%(Filename)%(Extension)')" />
</ItemGroup>
Expand All @@ -136,18 +130,22 @@ This package is an internal implementation of the .NET Core SDK and is not meant
</JoinItems>

<ItemGroup>
<!-- Again, ignore ref/ assemblies provided in the transport package that we don't want in this package. -->
<!--
Grab full dependency closure but exclude Microsoft.NETCore.App.Ref assets (avoid duplicates) and
Microsoft.Internal.Runtime.AspNetCore.Transport assets (almost all added just below).

Filename exclusions are due to implementation assemblies creeping into the closure. Reference assemblies
for all but System.Security.Cryptography.Pkcs are available in the transport package.
-->
<AspNetCoreReferenceAssemblyPath
Include="@(ReferencePathWithRefAssemblies)"
Exclude="
@(_ReferencedRuntimeRefAssemblies);
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'Microsoft.Win32.SystemEvents'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Drawing.Common'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Net.Quic'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.Internal.Runtime.AspNetCore.Transport'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Diagnostics.EventLog'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.IO.Pipelines'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Cryptography.Pkcs'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Permissions'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Windows.Extensions'));" />
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Cryptography.Xml'))" />

<AspNetCoreReferenceAssemblyPath
Include="@(_ReferencedRuntimeRefAssemblies->'$(RuntimeTransportReferenceDirectory)%(FileName)%(Extension)')" />
Expand Down