Skip to content

Commit f538fff

Browse files
committed
[main] React to dotnet/runtime#57816 (#36155)
- `cherry-pick` e58a6c2 - see dotnet/runtime#57816 (comment) - also reacting to dotnet/runtime#58731 - undo much of 18a61fb
1 parent e23fd04 commit f538fff

5 files changed

Lines changed: 0 additions & 42 deletions

File tree

eng/Dependencies.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@ and are generated based on the last package release.
7979
<LatestPackageReference Include="System.Threading.Channels" />
8080
<LatestPackageReference Include="System.ValueTuple" />
8181

82-
<!-- Runtime packages referenced only for exclusions -->
83-
<LatestPackageReference Include="Microsoft.Win32.SystemEvents" />
84-
<LatestPackageReference Include="System.Drawing.Common" />
85-
<LatestPackageReference Include="System.Security.Permissions" />
86-
<LatestPackageReference Include="System.Windows.Extensions" />
87-
8882
<!-- Runtime packages required for crossgen -->
8983
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x64" />
9084
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x86" />

eng/Version.Details.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,6 @@
177177
<Uri>https://github.com/dotnet/runtime</Uri>
178178
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="7.0.0-alpha.1.21457.1">
181-
<Uri>https://github.com/dotnet/runtime</Uri>
182-
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
183-
</Dependency>
184180
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.0-alpha.1.21457.1">
185181
<Uri>https://github.com/dotnet/runtime</Uri>
186182
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
@@ -197,10 +193,6 @@
197193
<Uri>https://github.com/dotnet/runtime</Uri>
198194
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
199195
</Dependency>
200-
<Dependency Name="System.Drawing.Common" Version="7.0.0-alpha.1.21457.1">
201-
<Uri>https://github.com/dotnet/runtime</Uri>
202-
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
203-
</Dependency>
204196
<Dependency Name="System.IO.Pipelines" Version="7.0.0-alpha.1.21457.1">
205197
<Uri>https://github.com/dotnet/runtime</Uri>
206198
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
@@ -233,10 +225,6 @@
233225
<Uri>https://github.com/dotnet/runtime</Uri>
234226
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
235227
</Dependency>
236-
<Dependency Name="System.Security.Permissions" Version="7.0.0-alpha.1.21457.1">
237-
<Uri>https://github.com/dotnet/runtime</Uri>
238-
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
239-
</Dependency>
240228
<Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.0-alpha.1.21457.1">
241229
<Uri>https://github.com/dotnet/runtime</Uri>
242230
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
@@ -253,10 +241,6 @@
253241
<Uri>https://github.com/dotnet/runtime</Uri>
254242
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
255243
</Dependency>
256-
<Dependency Name="System.Windows.Extensions" Version="7.0.0-alpha.1.21457.1">
257-
<Uri>https://github.com/dotnet/runtime</Uri>
258-
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>
259-
</Dependency>
260244
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-alpha.1.21457.1">
261245
<Uri>https://github.com/dotnet/runtime</Uri>
262246
<Sha>7292301fc5e0071b2e6e0a7d221d82ba7199e73c</Sha>

eng/Versions.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,10 @@
106106
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
107107
<MicrosoftExtensionsOptionsVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsOptionsVersion>
108108
<MicrosoftExtensionsPrimitivesVersion>7.0.0-alpha.1.21457.1</MicrosoftExtensionsPrimitivesVersion>
109-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-alpha.1.21457.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
110109
<MicrosoftWin32SystemEventsVersion>7.0.0-alpha.1.21457.1</MicrosoftWin32SystemEventsVersion>
111110
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-alpha.1.21457.1</SystemDiagnosticsDiagnosticSourceVersion>
112111
<SystemDiagnosticsEventLogVersion>7.0.0-alpha.1.21457.1</SystemDiagnosticsEventLogVersion>
113112
<SystemDirectoryServicesProtocolsVersion>7.0.0-alpha.1.21457.1</SystemDirectoryServicesProtocolsVersion>
114-
<SystemDrawingCommonVersion>7.0.0-alpha.1.21457.1</SystemDrawingCommonVersion>
115113
<SystemIOPipelinesVersion>7.0.0-alpha.1.21457.1</SystemIOPipelinesVersion>
116114
<SystemNetHttpJsonVersion>7.0.0-alpha.1.21457.1</SystemNetHttpJsonVersion>
117115
<SystemNetHttpWinHttpHandlerVersion>7.0.0-alpha.1.21457.1</SystemNetHttpWinHttpHandlerVersion>
@@ -120,12 +118,10 @@
120118
<SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-alpha.1.21457.1</SystemRuntimeCompilerServicesUnsafeVersion>
121119
<SystemSecurityCryptographyPkcsVersion>7.0.0-alpha.1.21457.1</SystemSecurityCryptographyPkcsVersion>
122120
<SystemSecurityCryptographyXmlVersion>7.0.0-alpha.1.21457.1</SystemSecurityCryptographyXmlVersion>
123-
<SystemSecurityPermissionsVersion>7.0.0-alpha.1.21457.1</SystemSecurityPermissionsVersion>
124121
<SystemServiceProcessServiceControllerVersion>7.0.0-alpha.1.21457.1</SystemServiceProcessServiceControllerVersion>
125122
<SystemTextEncodingsWebVersion>7.0.0-alpha.1.21457.1</SystemTextEncodingsWebVersion>
126123
<SystemTextJsonVersion>7.0.0-alpha.1.21457.1</SystemTextJsonVersion>
127124
<SystemThreadingChannelsVersion>7.0.0-alpha.1.21457.1</SystemThreadingChannelsVersion>
128-
<SystemWindowsExtensionsVersion>7.0.0-alpha.1.21457.1</SystemWindowsExtensionsVersion>
129125
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
130126
<MicrosoftNETCorePlatformsVersion>7.0.0-alpha.1.21457.1</MicrosoftNETCorePlatformsVersion>
131127
<!-- Packages from dotnet/efcore -->

src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
6868
SkipGetTargetFrameworkProperties="true"
6969
UndefineProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;PublishDir" />
7070

71-
<!-- Omit System.Security.Permissions closure. https://github.com/dotnet/runtime/issues/54341
72-
It is brought in by System.Security.Cryptography.Xml for netstandard2.0 compatibility
73-
but not required in net6.0 since the types required exist in System.Security.AccessControl. -->
74-
<Reference Include="Microsoft.Win32.SystemEvents" ExcludeAssets="All" />
75-
<Reference Include="System.Drawing.Common" ExcludeAssets="All" />
76-
<Reference Include="System.Security.Permissions" ExcludeAssets="All" />
77-
<Reference Include="System.Windows.Extensions" ExcludeAssets="All" />
78-
7971
<!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
8072
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
8173
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
121121
<IncludeAssets>Runtime;Native</IncludeAssets>
122122
</Reference>
123123

124-
<!-- Omit System.Security.Permissions closure. https://github.com/dotnet/runtime/issues/54341
125-
It is brought in by System.Security.Cryptography.Xml for netstandard2.0 compatibility
126-
but not required in net6.0 since the types required exist in System.Security.AccessControl. -->
127-
<Reference Include="Microsoft.Win32.SystemEvents" ExcludeAssets="All" />
128-
<Reference Include="System.Drawing.Common" ExcludeAssets="All" />
129-
<Reference Include="System.Security.Permissions" ExcludeAssets="All" />
130-
<Reference Include="System.Windows.Extensions" ExcludeAssets="All" />
131-
132124
<Reference Condition="'$(CrossgenOutput)' == 'true'"
133125
Include="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)"
134126
ExcludeAssets="All"

0 commit comments

Comments
 (0)