Skip to content

Bump the SDK back up again#33018

Merged
dougbu merged 4 commits into
mainfrom
dougbu/revert.revert.sdk
May 26, 2021
Merged

Bump the SDK back up again#33018
dougbu merged 4 commits into
mainfrom
dougbu/revert.revert.sdk

Conversation

@dougbu
Copy link
Copy Markdown
Contributor

@dougbu dougbu commented May 25, 2021

Publish in a separate step

  • Publishing.props executes the _GetPackageVersionInfo target in Microsoft.AspNetCore.App.Runtime.csproj
  • that target currently fails when using a new SDK and desktop msbuild

Revert "Revert SDK update (#32785)"

  • take us back to the 6.0.100-preview.5.21264.3 SDK

This reverts commit 57b9c13.

Reword a comment

dougbu added 3 commits May 25, 2021 16:01
- Publishing.props executes the `_GetPackageVersionInfo` target in Microsoft.AspNetCore.App.Runtime.csproj
- that target currently fails when using a new SDK and desktop `msbuild`
- take us back to the 6.0.100-preview.5.21264.3 SDK

This reverts commit 57b9c13.
@dougbu dougbu requested review from a team, captainsafia and pranavkm May 25, 2021 23:10
@dougbu dougbu requested a review from a team as a code owner May 25, 2021 23:10
@dougbu dougbu requested a review from HaoK May 25, 2021 23:10
@dougbu
Copy link
Copy Markdown
Contributor Author

dougbu commented May 25, 2021

PR does a few things but first commit won't matter that much after next CI agent rollout. That said, isolation from desktop msbuild is always a Good Thing™️.

}

[Fact]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/32788")]
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm least sure about the changes in this file. @wtgodbe were these quarantined simply due to problems w/ the test app combined w/ the older SDK❔

Mostly wondering: Should we leave these quarantined for 30 days after this gets in i.e. don't un-quarantine as part of this PR❔

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thoughts on this❔ I feel like I'm violating @BrennanConroy's new process😉

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Our new process. There are always exceptions to the rule, this wasn't flaky before the SDK issues right?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm struggling to remember.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

These should be unquarantined, the flakiness was due to the SDK

Comment thread eng/Build.props
@dougbu
Copy link
Copy Markdown
Contributor Author

dougbu commented May 25, 2021

@dotnet/aspnet-blazor-eng my lower-level questions were mostly for you

- used in Components.slnf and ComponentsNoDeps.slnf but hidden because it wasn't here
@dougbu dougbu requested a review from Pilchie as a code owner May 26, 2021 00:57
@dougbu
Copy link
Copy Markdown
Contributor Author

dougbu commented May 26, 2021

Needs #33019 (thx @BrennanConroy)

@BrennanConroy
Copy link
Copy Markdown
Member

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 2 pipeline(s).

@BrennanConroy
Copy link
Copy Markdown
Member

Merge when ready. Idk if you want to preserve commits/messages etc.

@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label May 26, 2021
@dougbu dougbu enabled auto-merge May 26, 2021 18:48
@dougbu dougbu merged commit 2c8fdd8 into main May 26, 2021
@dougbu dougbu deleted the dougbu/revert.revert.sdk branch May 26, 2021 19:11
@ghost ghost added this to the 6.0-preview6 milestone May 26, 2021
@captainsafia
Copy link
Copy Markdown
Contributor

YAY!

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.

6 participants