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

[main] Update dependencies from dotnet/runtime dotnet/efcore #30968

Merged
merged 4 commits into from
Mar 17, 2021
Merged

[main] Update dependencies from dotnet/runtime dotnet/efcore #30968

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f65708
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Mar 16, 2021
994a698
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Mar 16, 2021
706a8ec
Remove assemblies from the ref and runtime pack
pranavkm Mar 16, 2021
51e8ae4
Remove more references
pranavkm Mar 16, 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
8 changes: 2 additions & 6 deletions eng/SharedFramework.External.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,12 @@

If these are needed as direct dependencies, it is okay to change them to ExternalAspNetCoreAppReference and move up into sections above.
-->
<_TransitiveExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsVersion)" />
<_TransitiveExternalAspNetCoreAppReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
<_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" />
<!--
Seems arbitrary that the following packages have their ref/ assemblies in our targeting pack but the above
three do not. This is likely about our public APIs i.e. external compilation requirements.
Seems arbitrary that the following packages have their ref/ assemblies in our targeting pack but the above assemblies
do not. This is likely about our public APIs i.e. external compilation requirements.
-->
<_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogVersion)" />
<_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
<_TransitiveExternalAspNetCoreAppReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />
Comment on lines -55 to -64
Copy link
Member

Choose a reason for hiding this comment

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

Please perform similar removals in eng/Dependencies.props, eng/Version.Details.xml and eng/Versions.props. End result should be the repo only mentioning these assemblies / packages / versions in eng/PackageOverrides.txt and eng/PlatformManifest.txt (because those files describe our 5.0 release).

That said, leave eng/Version.Details.xml and eng/Versions.props alone if we must flow those versions to other repos in the dependency graph. @mmitche and @wtgodbe is there a strict coherence requirement here❔

Copy link
Member

Choose a reason for hiding this comment

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

I don't think we need to worry about these strict coherency entries for the repos above us (SDK/installer) since they wouldn't depend on CoreFx OOB packages, but Matt might have different info

Copy link
Contributor

Choose a reason for hiding this comment

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

Deleted it from more places.

</ItemGroup>

<ItemGroup Condition=" '$(IsServicingBuild)' == 'true' ">
Expand Down
8 changes: 6 additions & 2 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 @@ -118,7 +118,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<_DisallowedReferenceAssemblies Include="
Microsoft.Win32.SystemEvents.dll;
System.Drawing.Common.dll;
System.Security.Cryptography.Pkcs.dll" />
System.Security.Cryptography.Pkcs.dll;
System.Security.Permissions.dll;
System.Windows.Extensions.dll" />
<_AvailableRuntimeRefAssemblies Include="$(RuntimeTransportReferenceDirectory)*.dll"
Exclude="@(_DisallowedReferenceAssemblies->'$(RuntimeTransportReferenceDirectory)%(Filename)%(Extension)')" />
</ItemGroup>
Expand All @@ -136,7 +138,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'Microsoft.Win32.SystemEvents'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Drawing.Common'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Cryptography.Pkcs'));" />
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Cryptography.Pkcs'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Security.Permissions'));
@(ReferencePathWithRefAssemblies->WithMetadataValue('Filename', 'System.Windows.Extensions'));" />

<AspNetCoreReferenceAssemblyPath
Include="@(_ReferencedRuntimeRefAssemblies->'$(RuntimeTransportReferenceDirectory)%(FileName)%(Extension)')" />
Expand Down
6 changes: 0 additions & 6 deletions src/Framework/test/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,11 @@ static TestData()
"Microsoft.Extensions.WebEncoders",
"Microsoft.JSInterop",
"Microsoft.Net.Http.Headers",
"Microsoft.Win32.SystemEvents",
"System.Diagnostics.EventLog",
"System.Diagnostics.EventLog.Messages",
"System.Drawing.Common",
"System.IO.Pipelines",
"System.Security.Cryptography.Pkcs",
"System.Security.Cryptography.Xml",
"System.Security.Permissions",
"System.Windows.Extensions"
};

ListedTargetingPackAssemblies = new SortedDictionary<string, string>
Expand Down Expand Up @@ -282,9 +278,7 @@ static TestData()
{ "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.Permissions", "6.0.0.0" },
{ "System.Security.Principal.Windows", "6.0.0.0" },
{ "System.Windows.Extensions", "6.0.0.0" }
};

if (!VerifyAncmBinary())
Expand Down