Skip to content

Conversation

@dougbu
Copy link
Contributor

@dougbu dougbu commented Sep 3, 2021

@dougbu dougbu added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 3, 2021
@dougbu dougbu requested a review from a team September 3, 2021 19:49
@dougbu dougbu requested a review from Pilchie as a code owner September 3, 2021 19:49
@dougbu
Copy link
Contributor Author

dougbu commented Sep 3, 2021

For now at least, I'm not restoring 18a61fb#diff-b7dd9b03307f5fc91be1ae85ffaf732fc154fcd633efa7c597db5e2a3534bd25L92-L101. The CI should confirm whether or not that workaround is needed again.

Copy link
Member

@wtgodbe wtgodbe left a 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

@dougbu
Copy link
Contributor Author

dougbu commented Sep 3, 2021

/fyi @ericstj

/btw @dotnet/aspnet-build, I'm doing this in release/6.0 first because 'main' apparently doesn't have the fix yet.

@ericstj
Copy link
Member

ericstj commented Sep 3, 2021

'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" />

Copy link
Member

@ericstj ericstj Sep 3, 2021

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?

Copy link
Contributor Author

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.

Copy link
Member

@ericstj ericstj left a 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

@dougbu
Copy link
Contributor Author

dougbu commented Sep 3, 2021

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:

  • Microsoft.Win32.SystemEvents.dll
  • System.Drawing.Common.dll
  • System.Security.Permissions.dll
  • System.Windows.Extensions.dll

Will retry the build after dotnet/runtime#58666 is in and reflected in our release/6.0 dependencies

@ViktorHofer
Copy link
Member

The fix just got merged and should reach you via dependency flow soon.

@ericstj
Copy link
Member

ericstj commented Sep 7, 2021

Looks like this is passing validation builds now. paging @dougbu

@dougbu dougbu merged commit e58a6c2 into release/6.0 Sep 7, 2021
@dougbu dougbu deleted the dougbu/permissions.closure branch September 7, 2021 17:38
@ghost ghost added this to the 6.0-rc2 milestone Sep 7, 2021
@dougbu
Copy link
Contributor Author

dougbu commented Sep 7, 2021

/fyi if I can clean up more of Microsoft.AspNetCore.App.Runtime.csprpoj, I'll file a follow-up issue

dougbu added a commit that referenced this pull request Sep 10, 2021
dougbu added a commit that referenced this pull request Sep 22, 2021
dougbu added a commit that referenced this pull request Sep 23, 2021
* [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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants