Skip to content

Conversation

@wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented Sep 24, 2021

spa-templates' main branch is going to net7.0, so we've created a release/6.0 branch which our 6.0 branches need to reference. Doing this in rc2 so subsequent builds of that branch don't break (there are still incoming changes). Commit isn't changing for the submodule because it's currently the same commit as in main. CC @Pilchie since this goes into rc2

@wtgodbe wtgodbe added the tell-mode Indicates a PR which is being merged during tell-mode label Sep 24, 2021
@wtgodbe wtgodbe requested review from a team and javiercn September 24, 2021 16:36
@wtgodbe wtgodbe requested a review from Pilchie as a code owner September 24, 2021 16:36
@Pilchie
Copy link
Member

Pilchie commented Sep 24, 2021

Any of those changes to the spa-templates repo that we need for RC2 should be Tactics approved at this point. We're locking down RC2 rapidly now.

@wtgodbe
Copy link
Member Author

wtgodbe commented Sep 24, 2021

There are no changes in spa-templates in 6.0 coming in, we're just creating the branch for release/6.0 so that the TFM update in main doesn't break the 6.0 branches. We could also wait to do that until rc2 is done so that this branch is unaffected, and only update the submodule reference in release/6.0

@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 24, 2021
@Pilchie
Copy link
Member

Pilchie commented Sep 24, 2021

Ok, sounds good to me.

@dougbu
Copy link
Contributor

dougbu commented Sep 24, 2021

Looks good but you hit a flaky test ☹️ Please quarantine ShadowCopyCleansUpOlderFolders here or in another PR. If not done here, retry the failed job.

@BrennanConroy
Copy link
Member

BrennanConroy commented Sep 24, 2021

Please quarantine ShadowCopyCleansUpOlderFolders here or in another PR

Done yesterday #36887, not in 6.0 though

@wtgodbe wtgodbe changed the base branch from release/6.0-rc2 to release/6.0 September 24, 2021 20:07
@wtgodbe
Copy link
Member Author

wtgodbe commented Sep 24, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@wtgodbe
Copy link
Member Author

wtgodbe commented Sep 24, 2021

Changed the base to 6.0. I'll merge the TFM update PR to spa-templates' main branch once rc2 is officially done.

@wtgodbe wtgodbe merged commit 013df57 into release/6.0 Sep 24, 2021
@wtgodbe wtgodbe deleted the wtgodbe/rc2Submods branch September 24, 2021 23:13
@ghost ghost added this to the 6.0.0 milestone Sep 24, 2021
@github-actions github-actions bot locked and limited conversation to collaborators Dec 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants