Skip to content

Commit 18a61fb

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/runtime dotnet/efcore (#33560)
[main] Update dependencies from dotnet/runtime dotnet/efcore - React to dotnet/runtime#54147 - remove newly-unnecessary package references - do not expect affected assemblies in _our_ targeting packs - Add baseline suppression - !fixup! Suppress correct reference - Manually align w/ #33571 - add excluded System.Security.Permissions references - stop auto-updating dead-ended packages - switch to 5.0.0 version of Microsoft.Win32.Registry - switch to 5.0.0 version of System.Security.Principal.Windows - Suppress all of System.Security.Permissions dependency closure - cherry-picked from #33571 - Add missing dependencies - cherry-picked from #33571
1 parent b1480ca commit 18a61fb

15 files changed

+254
-227
lines changed

‎eng/Dependencies.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ 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+
8288
<!-- Runtime packages required for crossgen -->
8389
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x64" />
8490
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x86" />

‎eng/SharedFramework.External.props

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,4 @@
8989
<_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" />
9090
<_CompilationOnlyReference Include="System.Text.Json" />
9191
</ItemGroup>
92-
93-
<!--
94-
These compilation references are necessary to workaround the mismatch of what is found in the ref pack for NETCore.App and what
95-
is actually present at runtime. See https://github.com/dotnet/corefx/issues/34906
96-
-->
97-
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' or $(TargetFrameworks.Contains('$(DefaultNetCoreTargetFramework)'))">
98-
<_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
99-
<_CompilationOnlyReference Include="System.Security.Principal.Windows" />
100-
</ItemGroup>
101-
10292
</Project>

‎eng/Version.Details.xml

Lines changed: 144 additions & 136 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 72 additions & 68 deletions
Large diffs are not rendered by default.

‎src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@
2626
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
2727
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
2828
<Reference Include="Microsoft.Extensions.Options" />
29-
<Reference Include="Microsoft.Win32.Registry" />
3029
<Reference Include="System.Security.Cryptography.Xml" />
3130
</ItemGroup>
3231

32+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR
33+
'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR
34+
'$(MSBuildRestoreSessionId)' == '' ">
35+
<Reference Include="Microsoft.Win32.Registry" />
36+
</ItemGroup>
37+
3338
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(MSBuildRestoreSessionId)' == ''">
3439
<Reference Include="System.Security.Principal.Windows" />
3540
</ItemGroup>
@@ -38,4 +43,7 @@
3843
<Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
3944
</ItemGroup>
4045

46+
<ItemGroup Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">
47+
<SuppressBaselineReference Include="Microsoft.Win32.Registry" />
48+
</ItemGroup>
4149
</Project>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ This package is an internal implementation of the .NET Core SDK and is not meant
6363
<ItemGroup>
6464
<!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
6565
<Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
66+
67+
<!-- Omit System.Security.Permissions closure. https://github.com/dotnet/runtime/issues/54341
68+
It is brought in by System.Security.Cryptography.Xml for netstandard2.0 compatibility
69+
but not required in net6.0 since the types required exist in System.Security.AccessControl. -->
70+
<Reference Include="Microsoft.Win32.SystemEvents" ExcludeAssets="All" />
71+
<Reference Include="System.Drawing.Common" ExcludeAssets="All" />
72+
<Reference Include="System.Security.Permissions" ExcludeAssets="All" />
73+
<Reference Include="System.Windows.Extensions" ExcludeAssets="All" />
74+
6675
<!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
6776
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
6877
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

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

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

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

‎src/Framework/test/TestData.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,10 @@ static TestData()
276276
{ "Microsoft.Extensions.WebEncoders", "6.0.0.0" },
277277
{ "Microsoft.JSInterop", "6.0.0.0" },
278278
{ "Microsoft.Net.Http.Headers", "6.0.0.0" },
279-
{ "Microsoft.Win32.Registry", "6.0.0.0" },
280279
{ "System.Diagnostics.EventLog", "6.0.0.0" },
281280
{ "System.IO.Pipelines", "6.0.0.0" },
282-
{ "System.Security.AccessControl", "6.0.0.0" },
283281
{ "System.Security.Cryptography.Cng", "6.0.0.0" },
284282
{ "System.Security.Cryptography.Xml", "6.0.0.0" },
285-
{ "System.Security.Principal.Windows", "6.0.0.0" },
286283
};
287284

288285
if (!VerifyAncmBinary())

‎src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
<Reference Include="Microsoft.AspNetCore.Connections.Abstractions" />
2727
<Reference Include="Microsoft.AspNetCore.Hosting" />
2828
<Reference Include="Microsoft.Net.Http.Headers" />
29-
<Reference Include="Microsoft.Win32.Registry" />
30-
<Reference Include="System.Security.Principal.Windows" />
3129
</ItemGroup>
3230

3331
</Project>

‎src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<Reference Include="Microsoft.AspNetCore.Http.Features" />
4747
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
4848
<Reference Include="System.IO.Pipelines" />
49-
<Reference Include="System.Security.Principal.Windows" />
5049
</ItemGroup>
5150

5251
<Import Project="..\..\build\assets.props" />

0 commit comments

Comments
 (0)