Skip to content

Merging internal commits for release/5.0 #37500

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

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

dotnet-bot and others added 14 commits August 13, 2021 01:01
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:d7d10d70-26ab-4663-2902-08d89c6af29b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: d7d10d70-26ab-4663-2902-08d89c6af29b
- **Build**: 20210923.8
- **Date Produced**: September 23, 2021 7:04:36 PM UTC
- **Commit**: f431858f8b1f1510723ace6343786c9194dbd7fc
- **Branch**: refs/heads/internal/release/5.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **System.DirectoryServices.Protocols**: [from 5.0.0 to 5.0.1][1]
  - **Microsoft.NETCore.App.Internal**: [from 5.0.10-servicing.21412.14 to 5.0.11-servicing.21473.8][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.10 to 5.0.11][2]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 5.0.10-servicing.21412.14 to 5.0.11-servicing.21473.8][2]
  - **Microsoft.NETCore.Platforms**: [from 5.0.3 to 5.0.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCcf258a1&targetVersion=GCf431858&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe1825b4&targetVersion=GCf431858&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:d7d10d70-26ab-4663-2902-08d89c6af29b)
…ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:5283c4a7-f944-4af6-f8bd-08d89c6afc9d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: 5283c4a7-f944-4af6-f8bd-08d89c6afc9d
- **Build**: 20210922.2
- **Date Produced**: September 22, 2021 3:52:13 PM UTC
- **Commit**: 1103fc01ad2b1d1d3e4312cc406c836e1745fb6f
- **Branch**: refs/heads/internal/release/5.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.EntityFrameworkCore.Tools**: [from 5.0.10 to 5.0.11][1]
  - **dotnet-ef**: [from 5.0.10 to 5.0.11][1]
  - **Microsoft.EntityFrameworkCore**: [from 5.0.10 to 5.0.11][1]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 5.0.10 to 5.0.11][1]
  - **Microsoft.EntityFrameworkCore.Design**: [from 5.0.10 to 5.0.11][1]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 5.0.10 to 5.0.11][1]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 5.0.10 to 5.0.11][1]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 5.0.10 to 5.0.11][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC4953039&targetVersion=GC1103fc0&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:5283c4a7-f944-4af6-f8bd-08d89c6afc9d)
@vseanreesermsft vseanreesermsft requested a review from a team as a code owner October 13, 2021 01:01
@BrennanConroy BrennanConroy added the tell-mode Indicates a PR which is being merged during tell-mode label Oct 13, 2021
@BrennanConroy BrennanConroy added this to the 5.0.x milestone Oct 13, 2021
@BrennanConroy
Copy link
Member

@dougbu
Copy link
Contributor

dougbu commented Oct 13, 2021

@BrennanConroy BrennanConroy force-pushed the internal-merge-5.0-2021-10-12-1521 branch from 661533e to 2c5f2dc Compare October 13, 2021 03:30
@dougbu
Copy link
Contributor

dougbu commented Oct 13, 2021

We also have blanket suppressions of NETSDK1138 in 'release/6.0' and 'main': https://github.com/dotnet/aspnetcore/blob/release/6.0/eng/Workarounds.props#L28-L31
Not sure which approach is better.

@BrennanConroy BrennanConroy force-pushed the internal-merge-5.0-2021-10-12-1521 branch from 2c5f2dc to 5800712 Compare October 13, 2021 04:06
@dougbu dougbu modified the milestones: 5.0.x, 5.0.12 Oct 13, 2021
@BrennanConroy BrennanConroy force-pushed the internal-merge-5.0-2021-10-12-1521 branch from 5800712 to 58cec21 Compare October 13, 2021 04:27
@BrennanConroy BrennanConroy merged commit 2a46eb8 into dotnet:release/5.0 Oct 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants