Skip to content

Remove System.Security.Permissions closure #36828

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 23, 2021
Merged

Remove System.Security.Permissions closure #36828

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0412c9d
[main] React to dotnet/runtime#57816 (#36155)
dougbu Sep 7, 2021
58a79a6
[main] Cleanup remaining SSP references (#36248)
dougbu Sep 9, 2021
2ea09da
Merge branch 'main' into dougbu/permissions.closure/main
dougbu Sep 22, 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
6 changes: 0 additions & 6 deletions eng/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ and are generated based on the last package release.
<LatestPackageReference Include="System.Threading.Channels" />
<LatestPackageReference Include="System.ValueTuple" />

<!-- Runtime packages referenced only for exclusions -->
<LatestPackageReference Include="Microsoft.Win32.SystemEvents" />
<LatestPackageReference Include="System.Drawing.Common" />
<LatestPackageReference Include="System.Security.Permissions" />
<LatestPackageReference Include="System.Windows.Extensions" />

<!-- Runtime packages required for crossgen -->
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x64" />
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x86" />
Expand Down
16 changes: 0 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
Expand All @@ -197,10 +193,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
Expand Down Expand Up @@ -233,10 +225,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
Expand All @@ -253,10 +241,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
Expand Down
4 changes: 0 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,9 @@
<MicrosoftExtensionsOptionsVersion>7.0.0-alpha.1.21471.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>7.0.0-alpha.1.21471.1</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-alpha.1.21471.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<MicrosoftWin32SystemEventsVersion>7.0.0-alpha.1.21471.1</MicrosoftWin32SystemEventsVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-alpha.1.21471.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>7.0.0-alpha.1.21471.1</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>7.0.0-alpha.1.21471.1</SystemDirectoryServicesProtocolsVersion>
<SystemDrawingCommonVersion>7.0.0-alpha.1.21471.1</SystemDrawingCommonVersion>
<SystemIOPipelinesVersion>7.0.0-alpha.1.21471.1</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>7.0.0-alpha.1.21471.1</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>7.0.0-alpha.1.21471.1</SystemNetHttpWinHttpHandlerVersion>
Expand All @@ -120,12 +118,10 @@
<SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-alpha.1.21471.1</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityCryptographyPkcsVersion>7.0.0-alpha.1.21471.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>7.0.0-alpha.1.21471.1</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>7.0.0-alpha.1.21471.1</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0-alpha.1.21471.1</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>7.0.0-alpha.1.21471.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>7.0.0-alpha.1.21471.1</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>7.0.0-alpha.1.21471.1</SystemThreadingChannelsVersion>
<SystemWindowsExtensionsVersion>7.0.0-alpha.1.21471.1</SystemWindowsExtensionsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>7.0.0-alpha.1.21471.1</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
Expand Down
36 changes: 13 additions & 23 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 @@ -72,14 +72,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
SkipGetTargetFrameworkProperties="true"
UndefineProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;PublishDir" />

<!-- Omit System.Security.Permissions closure. https://github.com/dotnet/runtime/issues/54341
It is brought in by System.Security.Cryptography.Xml for netstandard2.0 compatibility
but not required in net7.0 since the types required exist in System.Security.AccessControl. -->
<Reference Include="Microsoft.Win32.SystemEvents" ExcludeAssets="All" />
<Reference Include="System.Drawing.Common" ExcludeAssets="All" />
<Reference Include="System.Security.Permissions" ExcludeAssets="All" />
<Reference Include="System.Windows.Extensions" ExcludeAssets="All" />

<!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Expand Down Expand Up @@ -131,14 +123,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 @@ -148,18 +134,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
8 changes: 0 additions & 8 deletions src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<IncludeAssets>Runtime;Native</IncludeAssets>
</Reference>

<!-- Omit System.Security.Permissions closure. https://github.com/dotnet/runtime/issues/54341
It is brought in by System.Security.Cryptography.Xml for netstandard2.0 compatibility
but not required in net7.0 since the types required exist in System.Security.AccessControl. -->
<Reference Include="Microsoft.Win32.SystemEvents" ExcludeAssets="All" />
<Reference Include="System.Drawing.Common" ExcludeAssets="All" />
<Reference Include="System.Security.Permissions" ExcludeAssets="All" />
<Reference Include="System.Windows.Extensions" ExcludeAssets="All" />

<Reference Condition="'$(CrossgenOutput)' == 'true'"
Include="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)"
ExcludeAssets="All"
Expand Down