Skip to content

Merging internal commits for release/5.0 #36516

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 11 commits into from
Sep 15, 2021
Merged

Merging internal commits for release/5.0 #36516

merged 11 commits into from
Sep 15, 2021

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

dougbu
dougbu reviewed Sep 15, 2021
View reviewed changes
eng/Versions.props Outdated
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.9-servicing.21359.8</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.10-servicing.21403.8</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
Copy link
Contributor

Choose a reason for hiding this comment

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

.\restore.cmd attempts in this branch aren't working. Is the productVersion.txt file in place at the expected location @mmitche @vseanreesermsft @lukas-lansky @wtgodbe❔

Copy link
Member

@mmitche mmitche Sep 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

It turns out the product was incoherent via aspnetcore in 5.0. Make the runtime dependencies 5.0.10-servicing.21412.14

Copy link
Contributor

Choose a reason for hiding this comment

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

Should I change the runtime SHAs as well❔ I suspect not (because the build doesn't use them and the next dependency update will overwrite them) but am double-checking.

Separately, how did we get incoherent❔

@mkArtakMSFT mkArtakMSFT added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 15, 2021
@dougbu
Copy link
Contributor

dougbu commented Sep 15, 2021 •
edited
Loading

This remains blocked. Just confirming the build can work while I update baselines et cetera…

@vseanreesermsft vseanreesermsft requested a review from a team as a code owner September 15, 2021 18:10
@dougbu
Copy link
Contributor

dougbu commented Sep 15, 2021

Ready to go. I enabled auto-merge 🤞

@dougbu dougbu enabled auto-merge September 15, 2021 18:17
@dougbu
Copy link
Contributor

dougbu commented Sep 15, 2021

Hit a new and different infrastructure issue in two build jobs. Retrying them…

@dougbu dougbu merged commit f5b309d into dotnet:release/5.0 Sep 15, 2021
@dougbu dougbu added the tell-mode Indicates a PR which is being merged during tell-mode label Oct 5, 2021
@dougbu dougbu added this to the 5.0.11 milestone Oct 5, 2021
Elanis pushed a commit to Elanis/portfolio that referenced this pull request Dec 13, 2022
Bump Microsoft.AspNetCore.TestHost from 5.0.10 to 5.0.11 (#14)
7414c41 
Bumps [Microsoft.AspNetCore.TestHost](https://github.com/dotnet/aspnetcore) from 5.0.10 to 5.0.11.
<details>
<summary>Commits</summary>

- [`2924ca2`](dotnet/aspnetcore@2924ca2) Merged PR 18513: [internal/release/5.0] Update dependencies from dnceng/inter...
- [`eeb31f6`](dotnet/aspnetcore@eeb31f6) Merged PR 18423: [internal/release/5.0] Update dependencies from dnceng/inter...
- [`9035164`](dotnet/aspnetcore@9035164) Merged PR 18406: Merge from github
- [`1a95562`](dotnet/aspnetcore@1a95562) Merge from github
- [`60819f7`](dotnet/aspnetcore@60819f7) [release/5.0] Include SharedFx bundle in Hosting Bundle, instead of SharedFx ...
- [`d5ae64d`](dotnet/aspnetcore@d5ae64d) [release/5.0] Use ArrayPool as default pool fallback ([#36559](dotnet/aspnetcore#36559))
- [`cf7a1d4`](dotnet/aspnetcore@cf7a1d4) Fix feeds ([#36587](dotnet/aspnetcore#36587))
- [`f5b309d`](dotnet/aspnetcore@f5b309d) Merge pull request [#36516](dotnet/aspnetcore#36516) from vseanreesermsft/internal-merge-5.0-2021-09-14-...
- [`0366ec0`](dotnet/aspnetcore@0366ec0) Update SiteExtension package to 3.1.19-servicing-21417-13
- [`63e6c4e`](dotnet/aspnetcore@63e6c4e) Update to 5.0.207 SDK and 2.1.30 & 3.1.19 runtimes
- Additional commits viewable in [compare view](dotnet/aspnetcore@v5.0.10...v5.0.11)
</details>

<br />

Reviewed-on: https://gitea.dysnomia.studio/elanis/portfolio/pulls/14
Co-authored-by: elanis <elanis@noreply.example.org>
Co-committed-by: elanis <elanis@noreply.example.org>
Elanis pushed a commit to Dysnomia-Studio/dehash-me that referenced this pull request Mar 12, 2023
Bump Microsoft.AspNetCore.TestHost from 5.0.10 to 5.0.11 (#21)
9edd408 
Bumps [Microsoft.AspNetCore.TestHost](https://github.com/dotnet/aspnetcore) from 5.0.10 to 5.0.11.
<details>
<summary>Commits</summary>

- [`2924ca2`](dotnet/aspnetcore@2924ca2) Merged PR 18513: [internal/release/5.0] Update dependencies from dnceng/inter...
- [`eeb31f6`](dotnet/aspnetcore@eeb31f6) Merged PR 18423: [internal/release/5.0] Update dependencies from dnceng/inter...
- [`9035164`](dotnet/aspnetcore@9035164) Merged PR 18406: Merge from github
- [`1a95562`](dotnet/aspnetcore@1a95562) Merge from github
- [`60819f7`](dotnet/aspnetcore@60819f7) [release/5.0] Include SharedFx bundle in Hosting Bundle, instead of SharedFx ...
- [`d5ae64d`](dotnet/aspnetcore@d5ae64d) [release/5.0] Use ArrayPool as default pool fallback ([#36559](dotnet/aspnetcore#36559))
- [`cf7a1d4`](dotnet/aspnetcore@cf7a1d4) Fix feeds ([#36587](dotnet/aspnetcore#36587))
- [`f5b309d`](dotnet/aspnetcore@f5b309d) Merge pull request [#36516](dotnet/aspnetcore#36516) from vseanreesermsft/internal-merge-5.0-2021-09-14-...
- [`0366ec0`](dotnet/aspnetcore@0366ec0) Update SiteExtension package to 3.1.19-servicing-21417-13
- [`63e6c4e`](dotnet/aspnetcore@63e6c4e) Update to 5.0.207 SDK and 2.1.30 & 3.1.19 runtimes
- Additional commits viewable in [compare view](dotnet/aspnetcore@v5.0.10...v5.0.11)
</details>

<br />

Reviewed-on: https://gitea.dysnomia.studio/elanis/dehash-me/pulls/21
Co-authored-by: elanis <elanis@noreply.example.org>
Co-committed-by: elanis <elanis@noreply.example.org>
Elanis added a commit to Dysnomia-Studio/dysnomia-website that referenced this pull request Jul 14, 2023
@Elanis
Bump Microsoft.AspNetCore.TestHost from 5.0.10 to 5.0.11 (#17)
eec5d6a 
Bumps [Microsoft.AspNetCore.TestHost](https://github.com/dotnet/aspnetcore) from 5.0.10 to 5.0.11.
<details>
<summary>Commits</summary>

- [`2924ca2`](dotnet/aspnetcore@2924ca2) Merged PR 18513: [internal/release/5.0] Update dependencies from dnceng/inter...
- [`eeb31f6`](dotnet/aspnetcore@eeb31f6) Merged PR 18423: [internal/release/5.0] Update dependencies from dnceng/inter...
- [`9035164`](dotnet/aspnetcore@9035164) Merged PR 18406: Merge from github
- [`1a95562`](dotnet/aspnetcore@1a95562) Merge from github
- [`60819f7`](dotnet/aspnetcore@60819f7) [release/5.0] Include SharedFx bundle in Hosting Bundle, instead of SharedFx ...
- [`d5ae64d`](dotnet/aspnetcore@d5ae64d) [release/5.0] Use ArrayPool as default pool fallback ([#36559](dotnet/aspnetcore#36559))
- [`cf7a1d4`](dotnet/aspnetcore@cf7a1d4) Fix feeds ([#36587](dotnet/aspnetcore#36587))
- [`f5b309d`](dotnet/aspnetcore@f5b309d) Merge pull request [#36516](dotnet/aspnetcore#36516) from vseanreesermsft/internal-merge-5.0-2021-09-14-...
- [`0366ec0`](dotnet/aspnetcore@0366ec0) Update SiteExtension package to 3.1.19-servicing-21417-13
- [`63e6c4e`](dotnet/aspnetcore@63e6c4e) Update to 5.0.207 SDK and 2.1.30 & 3.1.19 runtimes
- Additional commits viewable in [compare view](dotnet/aspnetcore@v5.0.10...v5.0.11)
</details>

<br />

Co-authored-by: Elanis <elanis@hotmail.com>
Reviewed-on: https://gitea.dysnomia.studio/elanis/dysnomia-website/pulls/17
Co-authored-by: elanis <elanis@noreply.example.org>
Co-committed-by: elanis <elanis@noreply.example.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmitche mmitche mmitche left review comments

@dougbu dougbu dougbu approved these changes

@Pilchie Pilchie Awaiting requested review from Pilchie Pilchie is a code owner

Assignees
No one assigned
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
Milestone
5.0.11
Development

Successfully merging this pull request may close these issues.
5 participants
@vseanreesermsft @dougbu @mmitche @mkArtakMSFT @dotnet-bot