Skip to content
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

Jump to bottom

[release/6.0-preview6] Update dependencies from dotnet/runtime dotnet/efcore #33571

Merged
merged 22 commits into from
Jun 18, 2021
Merged

[release/6.0-preview6] Update dependencies from dotnet/runtime dotnet/efcore #33571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c7a1cf5
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jun 16, 2021
110ba9b
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jun 16, 2021
697aee9
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jun 16, 2021
c5ca81f
React to dotnet/runtime#54147
dougbu Jun 16, 2021
161ed50
Add baseline suppression
dougbu Jun 16, 2021
3a96400
!fixup! Suppress correct reference
dougbu Jun 16, 2021
d2e9f75
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jun 16, 2021
82259c7
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jun 17, 2021
007db7c
Omit System.Security.Permissions.
ericstj Jun 17, 2021
27c5999
Permit PackageReferences from ref/runtime-pack
ericstj Jun 17, 2021
f9c789b
Fix Permissions version reference and delete dead packages
ericstj Jun 17, 2021
a4d9261
More dead package cleanup
ericstj Jun 17, 2021
8063f86
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jun 17, 2021
f298fa0
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jun 17, 2021
8dcc7e8
Try again at transitioning dead-end package to 5.0 version
ericstj Jun 17, 2021
f0e6464
Fix up version of added package
ericstj Jun 17, 2021
7cadc77
Fix PackageReference from DataProtection -> Registry
ericstj Jun 17, 2021
63b4179
Apply suggestions from code review
ericstj Jun 17, 2021
071c17c
Get System.Security.Permissions refs working
dougbu Jun 17, 2021
725e73e
Update src/DataProtection/DataProtection/src/Microsoft.AspNetCore.Dat…
dougbu Jun 17, 2021
7247bb8
Suppress all of System.Security.Permissions dependency closure
ericstj Jun 18, 2021
3f3e3cf
Add missing dependencies
dougbu Jun 18, 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: 6 additions & 0 deletions eng/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ 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" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need the three of these that aren't already in eng/Version.Details.xml to either use 5.0.0 versions (and move out of the automated section of eng/Versions.props) or be included in eng/Version.Details.xml.

Copy link
Member

@ericstj ericstj Jun 18, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These all still build live, so they can be included in the main section. These should all be temporary until dotnet/runtime#54341 is addressed. IMHO it's worth carrying this package (System.Security.AccessControl) for one more release to make the type move. I'd like to hear @ViktorHofer's thoughts.


<!-- Runtime packages required for crossgen -->
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x64" />
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x86" />
Expand Down
10 changes: 0 additions & 10 deletions eng/SharedFramework.External.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,4 @@
<_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" />
<_CompilationOnlyReference Include="System.Text.Json" />
</ItemGroup>

<!--
These compilation references are necessary to workaround the mismatch of what is found in the ref pack for NETCore.App and what
is actually present at runtime. See https://github.com/dotnet/corefx/issues/34906
-->
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' or $(TargetFrameworks.Contains('$(DefaultNetCoreTargetFramework)'))">
<_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
<_CompilationOnlyReference Include="System.Security.Principal.Windows" />
</ItemGroup>

</Project>
280 changes: 144 additions & 136 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

140 changes: 72 additions & 68 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
<Reference Include="Microsoft.Win32.Registry" />
<Reference Include="System.Security.Cryptography.Xml" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR
'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR
'$(MSBuildRestoreSessionId)' == '' ">
<Reference Include="Microsoft.Win32.Registry" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(MSBuildRestoreSessionId)' == ''">
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>
Expand All @@ -38,4 +43,7 @@
<Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">
<SuppressBaselineReference Include="Microsoft.Win32.Registry" />
</ItemGroup>
</Project>
9 changes: 9 additions & 0 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 @@ -63,6 +63,15 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<ItemGroup>
<!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
<Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />

<!-- 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 net6.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
8 changes: 8 additions & 0 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 @@ -120,6 +120,14 @@ 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 net6.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 Include="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)"
ExcludeAssets="All"
PrivateAssets="All"
Expand Down
3 changes: 0 additions & 3 deletions src/Framework/test/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,10 @@ static TestData()
{ "Microsoft.Extensions.WebEncoders", "6.0.0.0" },
{ "Microsoft.JSInterop", "6.0.0.0" },
{ "Microsoft.Net.Http.Headers", "6.0.0.0" },
{ "Microsoft.Win32.Registry", "6.0.0.0" },
{ "System.Diagnostics.EventLog", "6.0.0.0" },
{ "System.IO.Pipelines", "6.0.0.0" },
{ "System.Security.AccessControl", "6.0.0.0" },
{ "System.Security.Cryptography.Cng", "6.0.0.0" },
{ "System.Security.Cryptography.Xml", "6.0.0.0" },
{ "System.Security.Principal.Windows", "6.0.0.0" },
};

if (!VerifyAncmBinary())
Expand Down
2 changes: 0 additions & 2 deletions src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
<Reference Include="Microsoft.AspNetCore.Connections.Abstractions" />
<Reference Include="Microsoft.AspNetCore.Hosting" />
<Reference Include="Microsoft.Net.Http.Headers" />
<Reference Include="Microsoft.Win32.Registry" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
<Reference Include="Microsoft.AspNetCore.Http.Features" />
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
<Reference Include="System.IO.Pipelines" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>

<Import Project="..\..\build\assets.props" />
Expand Down
1 change: 0 additions & 1 deletion src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
<Reference Include="System.IO.Pipelines" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<Reference Include="System.IO.Pipelines" />
<Reference Include="System.Reflection.Metadata" />
<Reference Include="System.Runtime.CompilerServices.Unsafe" />
<Reference Include="System.Security.Principal.Windows" />
<Reference Include="System.Threading.Tasks.Extensions" />
<Reference Include="Microsoft.AspNetCore.Http.Features" />
<Reference Include="Microsoft.AspNetCore.Http" />
Expand Down
1 change: 0 additions & 1 deletion src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<Reference Include="Microsoft.AspNetCore.Http" />
<Reference Include="Microsoft.AspNetCore.Routing" />
<Reference Include="Microsoft.AspNetCore.WebSockets" />
<Reference Include="System.Security.Principal.Windows" />

<Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
</ItemGroup>
Expand Down
7 changes: 6 additions & 1 deletion src/Testing/src/Microsoft.AspNetCore.Testing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<Reference Include="Microsoft.Extensions.DependencyInjection" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Win32.Registry" />
<Reference Include="Serilog.Extensions.Logging" />
<Reference Include="Serilog.Sinks.File" />
<Reference Include="System.ValueTuple" />
Expand All @@ -45,6 +44,12 @@
<Reference Include="xunit.extensibility.execution" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR
'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR
'$(MSBuildRestoreSessionId)' == '' ">
<Reference Include="Microsoft.Win32.Registry" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''">
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
Expand Down
2 changes: 0 additions & 2 deletions src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
<ItemGroup>
<Reference Include="Microsoft.Build" ExcludeAssets="runtime" />
<Reference Include="Microsoft.Build.Locator" />
<Reference Include="Microsoft.Win32.Registry" />
<Reference Include="System.Security.Principal.Windows" />
</ItemGroup>

<ItemGroup>
Expand Down