-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[release/6.0] React to dotnet/runtime#57816 #36155
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.
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
Conversation
dougbu
commented
Sep 3, 2021
- see [release/6.0] Bring back System.Security.AccessControl package runtime#57816 (comment)
- undo much of 18a61fb
- see dotnet/runtime#57816 (comment) - undo much of 18a61fb
|
For now at least, I'm not restoring 18a61fb#diff-b7dd9b03307f5fc91be1ae85ffaf732fc154fcd633efa7c597db5e2a3534bd25L92-L101. The CI should confirm whether or not that workaround is needed again. |
wtgodbe
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, LGTM assuming the sharedFx/targeting pack contents are the same
|
/fyi @ericstj /btw @dotnet/aspnet-build, I'm doing this in release/6.0 first because 'main' apparently doesn't have the fix yet. |
We don't have the S.S.Acls package there, so we need to wait until we can upgrade our packages (eg: Crypto.Xml) to consume stable externals from the 6.0 build |
| <Reference Include="System.Drawing.Common" ExcludeAssets="All" /> | ||
| <Reference Include="System.Security.Permissions" ExcludeAssets="All" /> | ||
| <Reference Include="System.Windows.Extensions" ExcludeAssets="All" /> | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if you can remove some of the stuff in _DisallowedReferenceAssemblies now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, _maybe_❔ I'll look at a binlog once the CI wraps up.
ericstj
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM modulo one comment about further cleanup
|
Looks like we need the change @ericstj mentioned to @ViktorHofer in dotnet/runtime#57816 (comment) The following unexpected assemblies are present in Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Runtime, and our various targeting pack and shared framework bundles:
Will retry the build after dotnet/runtime#58666 is in and reflected in our release/6.0 dependencies |
|
The fix just got merged and should reach you via dependency flow soon. |
|
Looks like this is passing validation builds now. paging @dougbu |
|
/fyi if I can clean up more of Microsoft.AspNetCore.App.Runtime.csprpoj, I'll file a follow-up issue |
- `cherry-pick` e58a6c2 - see dotnet/runtime#57816 (comment) - also reacting to dotnet/runtime#58731 - undo much of 18a61fb
- `cherry-pick` e58a6c2 - see dotnet/runtime#57816 (comment) - also reacting to dotnet/runtime#58731 - undo much of 18a61fb
* [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 * [main] Cleanup remaining SSP references (#36248) - `cherry-pick` 888e03a - remove references to System.Security.Permissions and its closure - only mentions are in eng/PackageOverrides.txt and eng/PlatformManifest.txt - those files will remain unused until we update them in the run-up to 6.0.1 - may see some package refs for SSP and its closure elsewhere but this does not impact targeting pack content - also remove duplication between `@(AspNetCoreReferenceAssemblyPath)` additions (for efficiency) nit: Only need to exclude System.Net.Quic from `@(_AvailableRuntimeRefAssemblies)` - Crypto.Pkcs is **not** present in the transport package - other disallowed entries aren't present in the transport package or our dependency closure