Expose all references when not restoring by dougbu · Pull Request #32718 · dotnet/aspnetcore

dougbu · 2021-05-15T00:21:15Z

use empty $(MSBuildRestoreSessionId) to determine when contributing to dependency graph
remove extra direct references
- should now be part of the dependency graph automatically

dougbu · 2021-05-16T05:19:03Z

Remove CS1705 workarounds #31075

- use empty `$(MSBuildRestoreSessionId)` to determine when contributing to dependency graph

- should now be part of the dependency graph automatically

- not a problem unless executing `restore` target

dougbu · 2021-05-22T00:48:11Z

/backport to release/3.1

github-actions · 2021-05-22T00:48:24Z

Started backporting to release/3.1: https://github.com/dotnet/aspnetcore/actions/runs/865552637

ghost · 2021-05-22T00:48:26Z

Hi @github-actions[bot]. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context.

dougbu · 2021-05-22T00:48:38Z

/backport to release/5.0

github-actions · 2021-05-22T00:48:49Z

Started backporting to release/5.0: https://github.com/dotnet/aspnetcore/actions/runs/865553258

ghost · 2021-05-22T00:48:52Z

Hi @github-actions[bot]. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context.

github-actions · 2021-05-22T00:48:56Z

@dougbu an error occurred while backporting to release/3.1, please check the run log for details!

Cannot read property 'createComment' of undefined

ghost · 2021-05-22T00:48:58Z

Hi @github-actions[bot]. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context.

github-actions · 2021-05-22T00:49:16Z

@dougbu an error occurred while backporting to release/5.0, please check the run log for details!

Cannot read property 'createComment' of undefined

ghost · 2021-05-22T00:49:17Z

Hi @github-actions[bot]. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context.

github-actions · 2021-05-22T01:11:34Z

Started backporting to release/3.1: https://github.com/dotnet/aspnetcore/actions/runs/865552637

ghost · 2021-05-22T01:11:37Z

Hi @github-actions[bot]. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context.

github-actions · 2021-05-22T01:12:04Z

@dougbu an error occurred while backporting to release/3.1, please check the run log for details!

Cannot read property 'createComment' of undefined

ghost · 2021-05-22T01:12:06Z

Hi @github-actions[bot]. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context.

dougbu · 2021-05-22T01:18:17Z

@akoeplinger something strange is going on. The action is failing even after removing differences between this repo and dotnet/runtime in .github/workflows/backport.yml and eng/actions/backport/*, See #32777 then #32927.

I also verified https://octokit.github.io/rest.js/v18#issues-create-comment still matches what we're doing in this action.

Any ideas why either the issues property is undefined or GitHub's JS parser is interpreting createComment(...) as a property reference❔

dougbu · 2021-05-22T05:42:40Z

@akoeplinger I figured it out. Need to use the rest object in one more place. See #32930. I'll put up a similar dotnet/runtime PR on Monday.

The other part of the issue here was conflicts when the action attempted to apply the patch. ~~Anyone know if git am --3way would help create a PR containing the conflicts❔~~

dougbu · 2021-05-22T05:49:09Z

Anyone know if git am --3way would help create a PR containing the conflicts❔

Oops, index.js already uses --3way. Probably need more complicated git hacks to create a PR despite the conflicts.

dougbu · 2021-05-24T18:38:02Z

Let's try this again…

dougbu · 2021-05-24T18:38:16Z

/backport to release/5.0

github-actions · 2021-05-24T18:38:30Z

Started backporting to release/5.0: https://github.com/dotnet/aspnetcore/actions/runs/872340045

ghost · 2021-05-24T18:38:32Z

Hi @github-actions[bot]. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context.

github-actions · 2021-05-24T18:39:01Z

@dougbu backporting to release/5.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Expose all references when not restoring - use empty `$(MSBuildRestoreSessionId)` to determine when contributing to dependency graph
Using index info to reconstruct a base tree...
M	src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
M	src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
M	src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj
M	src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
M	src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
M	src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj
M	src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj
M	src/Testing/src/Microsoft.AspNetCore.Testing.csproj
M	src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj
Auto-merging src/Testing/src/Microsoft.AspNetCore.Testing.csproj
Auto-merging src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj
Auto-merging src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj
Auto-merging src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
Auto-merging src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
CONFLICT (content): Merge conflict in src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj
Auto-merging src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj
Auto-merging src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj
Auto-merging src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Expose all references when not restoring - use empty `$(MSBuildRestoreSessionId)` to determine when contributing to dependency graph
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

ghost · 2021-05-24T18:39:03Z

Hi @github-actions[bot]. It looks like you just commented on a closed PR. The team will most probably miss it. If you'd like to bring something important up to their attention, consider filing a new issue and add enough details to build context.

Pilchie · 2021-05-24T18:42:57Z

FYI - I think I just changed @msftbot to not comment when @github-actions[bot] comments on a closed PR.

- backport of 0b0bed3 (#32718) * Expose all references when not restoring - use empty `$(MSBuildRestoreSessionId)` to determine when contributing to dependency graph * Remove extra direct references - should now be part of the dependency graph automatically * Avoid errors about non-shared Fx references - not a problem unless executing `restore` target * Special case source builds

* [release/5.0] Expose all references when not restoring - backport of 0b0bed3 (#32718) * Expose all references when not restoring - use empty `$(MSBuildRestoreSessionId)` to determine when contributing to dependency graph * Remove extra direct references - should now be part of the dependency graph automatically * Avoid errors about non-shared Fx references - not a problem unless executing `restore` target * Special case source builds

- backport of 0b0bed3 (#32718) * Expose all references when not restoring - use empty `$(MSBuildRestoreSessionId)` to determine when contributing to dependency graph * Remove extra direct references - should now be part of the dependency graph automatically * Avoid errors about non-shared Fx references - not a problem unless executing `restore` target * Special case source builds

* [release/3.1] Expose all references when not restoring - backport of 0b0bed3 (#32718) * Expose all references when not restoring - use empty `$(MSBuildRestoreSessionId)` to determine when contributing to dependency graph * Remove extra direct references - should now be part of the dependency graph automatically * Avoid errors about non-shared Fx references - not a problem unless executing `restore` target * Special case source builds * Add workaround for ref/ generation - use `$(CompileUsingReferenceAssemblies)` to avoid new references in generated projects * Limit `_CheckForReferenceBoundaries` to Core TFM - back-ports a very small part of 5266918 - avoid incorrect errors about extra references in shared framework - safe because every `$(IsAspNetCoreApp)` project targets (or multi-targets) `netcoreapp3.1` * Add more `$(MSBuildRestoreSessionId)` checks - additional projects in this branch have TFM-specific references * nit: Remove a few duplicate references - no need to mention Microsoft.AspNetCore.DataProtection twice * Remove excess assemblies from shared Fx - brought in due to improved reference discovery

BrennanConroy reviewed May 15, 2021

View reviewed changes

Comment thread src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj Outdated

dougbu commented May 15, 2021

View reviewed changes

Comment thread src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj Outdated

dougbu force-pushed the dougbu/more.conditional.conditions branch from 1b7248d to ac705ab Compare May 17, 2021 00:06

dougbu commented May 17, 2021

View reviewed changes

Comment thread src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj Outdated

dougbu added 5 commits May 16, 2021 22:23

Expose all references when not restoring

13586d6

- use empty `$(MSBuildRestoreSessionId)` to determine when contributing to dependency graph

Remove extra direct references

d09e792

- should now be part of the dependency graph automatically

Avoid errors about non-shared Fx references

7dc3345

- not a problem unless executing `restore` target

Re-fix typos

36d95dd

Special case source builds

82a5289

dougbu force-pushed the dougbu/more.conditional.conditions branch from d09a27a to 82a5289 Compare May 17, 2021 05:23

Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label May 17, 2021

dougbu requested a review from a team May 19, 2021 22:59

dougbu marked this pull request as ready for review May 19, 2021 23:00

dougbu requested review from a team, Pilchie, Tratcher and halter73 as code owners May 19, 2021 23:00

wtgodbe approved these changes May 20, 2021

View reviewed changes

dougbu merged commit 0b0bed3 into main May 20, 2021

dougbu deleted the dougbu/more.conditional.conditions branch May 20, 2021 18:50

ghost added this to the 6.0-preview6 milestone May 20, 2021

dougbu mentioned this pull request Jun 1, 2021

[release/3.1] Expose all references when not restoring #33197

Merged

dougbu mentioned this pull request Jun 1, 2021

[release/5.0] Expose all references when not restoring #33201

Merged

Conversation

dougbu commented May 15, 2021

Uh oh!

Uh oh!

Uh oh!

dougbu commented May 16, 2021

Uh oh!

Uh oh!

dougbu commented May 22, 2021

Uh oh!

github-actions Bot commented May 22, 2021

Uh oh!

ghost commented May 22, 2021

Uh oh!

dougbu commented May 22, 2021

Uh oh!

github-actions Bot commented May 22, 2021

Uh oh!

ghost commented May 22, 2021

Uh oh!

github-actions Bot commented May 22, 2021

Uh oh!

ghost commented May 22, 2021

Uh oh!

github-actions Bot commented May 22, 2021

Uh oh!

ghost commented May 22, 2021

Uh oh!

github-actions Bot commented May 22, 2021

Uh oh!

ghost commented May 22, 2021

Uh oh!

github-actions Bot commented May 22, 2021

Uh oh!

ghost commented May 22, 2021

Uh oh!

dougbu commented May 22, 2021

Uh oh!

dougbu commented May 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dougbu commented May 22, 2021

Uh oh!

dougbu commented May 24, 2021

Uh oh!

dougbu commented May 24, 2021

Uh oh!

github-actions Bot commented May 24, 2021

Uh oh!

ghost commented May 24, 2021

Uh oh!

github-actions Bot commented May 24, 2021

Uh oh!

ghost commented May 24, 2021

Uh oh!

Pilchie commented May 24, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dougbu commented May 22, 2021 •

edited

Loading