Skip to content
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

Update branding to 3.1.2 #18151

Merged
merged 19 commits into from
Jan 15, 2020
Merged

Update branding to 3.1.2 #18151

merged 19 commits into from
Jan 15, 2020

Conversation

JunTaoLuo
Copy link
Contributor

Waiting until branches open.

BrennanConroy and others added 15 commits November 25, 2019 19:37
Fixed a merge conflict in the code mirror from github into 'internal/release/3.1'
…ositories

This pull request updates the following dependencies

[marker]: <> (Begin:48752c90-f78c-49ee-575f-08d76e1d56cb)
## From https://github.com/aspnet/EntityFrameworkCore
- **Build**: 20191210.7
- **Date Produced**: 12/10/2019 8:25 PM
- **Commit**: 813358a5fb4e1f35e5d82463d2bad6616ca6f594
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.EntityFrameworkCore.Tools** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.SqlServer** -> 3.1.1-servicing.19610.7
  - **dotnet-ef** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.InMemory** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.Relational** -> 3.1.1-servicing.19610.7
  - **Microsoft.EntityFrameworkCore.Sqlite** -> 3.1.1-servicing.19610.7

[marker]: <> (End:48752c90-f78c-49ee-575f-08d76e1d56cb)
…ositories

This pull request updates the following dependencies

[marker]: <> (Begin:facfaf30-1c25-4166-575d-08d76e1d56cb)
## From https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling
- **Build**: 20191214.11
- **Date Produced**: 12/15/2019 3:03 AM
- **Commit**: 07f16c89db55ab6f9f773cc3db6eb5a52908065e
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.AspNetCore.Mvc.Razor.Extensions** -> 3.1.1
  - **Microsoft.AspNetCore.Razor.Language** -> 3.1.1
  - **Microsoft.CodeAnalysis.Razor** -> 3.1.1
  - **Microsoft.NET.Sdk.Razor** -> 3.1.1

[marker]: <> (End:facfaf30-1c25-4166-575d-08d76e1d56cb)
@JunTaoLuo JunTaoLuo added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jan 6, 2020
@JunTaoLuo JunTaoLuo requested a review from a team January 6, 2020 21:33
Copy link
Member

@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.

With the "wait" caveat, looks good

@Pilchie should we also prep for 2.1.16 and perhaps 3.0.3?

@JunTaoLuo JunTaoLuo force-pushed the johluo/feb-branding branch from 70116d8 to b9ad6b3 Compare January 9, 2020 00:25
@dougbu
Copy link
Member

dougbu commented Jan 15, 2020

This doesn't seem to be building and the baseline changes look incomplete. Are we waiting for dotnet/extensions publication as in 3.0?

@JunTaoLuo JunTaoLuo force-pushed the johluo/feb-branding branch from 51de541 to 6712203 Compare January 15, 2020 01:45
@JunTaoLuo JunTaoLuo marked this pull request as ready for review January 15, 2020 01:46
@JunTaoLuo
Copy link
Contributor Author

Ready to go @dougbu @wtgodbe

@dougbu
Copy link
Member

dougbu commented Jan 15, 2020

Does this PR need a CodeCheck fix too?

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