Skip to content

Revert bad changes from merge forward PR #21848

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

Closed
wants to merge 2 commits into from

Conversation

jkotalik
Copy link
Contributor

@jkotalik jkotalik requested a review from dougbu as a code owner May 14, 2020 21:22
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label May 14, 2020
Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

Narrow this two just eng/Version*.* and you're done.

@jkotalik
Copy link
Contributor Author

@dougbu if you are in a hurry, feel free to merge this before validation to get #21630 moving.

@dougbu
Copy link
Contributor

dougbu commented May 14, 2020

I'm really starting to hate desktop msbuild ☹️

@dougbu
Copy link
Contributor

dougbu commented May 14, 2020

If the Helix build succeeds, I'm going to ignore that OOM. But, I'm going to let the current build finish. (FYI Helix jobs don't get canceled when the pipeline that submitted them is canceled. So, canceling a build doesn't clean up as much as you'd like.)

@dougbu
Copy link
Contributor

dougbu commented May 14, 2020

A fix we made to src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj in d99e7fe broke this build. Suggest we just leave things alone since #21630 is validating 🆗 and we can undo the src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj change only after that goes in. #21630 also overwrites some of the versions in this PR and the next dependency update will make everything coherent again.

That is, if I'm correct, let's get #21630 in and close this PR.

@jkotalik
Copy link
Contributor Author

I'm a little uncertain about the action plan then. So what you are saying is:

  1. Close this PR.
  2. Merge [master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling #21630
  3. Reopen another PR to revert the Microsoft.AspNetCore.App.Ref.csproj

Is that correct?

@dougbu
Copy link
Contributor

dougbu commented May 15, 2020

@jkotalik yes you've got the plan down. #21630 is in (hurray 🚀) and the last bullet can happen whenever

Reopen another PR to revert the Microsoft.AspNetCore.App.Ref.csproj

/fyi that change worked around an inconsistency between the incoming packages from dotnet/runtime that goes away now that we're targeting net5.0 too.

@jkotalik jkotalik closed this May 15, 2020
@jkotalik jkotalik deleted the jkotalik/revertPropsChange branch May 15, 2020 16:01
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.

2 participants