Skip to content

Update branding to 3.1.6 #22731

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 7 commits into from
Jun 9, 2020
Merged

Update branding to 3.1.6 #22731

merged 7 commits into from
Jun 9, 2020

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented Jun 9, 2020

No description provided.

dotnet-bot and others added 5 commits May 21, 2020 03:33
@dotnet-bot @wtgodbe
Merged PR 8052: [internal/release/3.1] Update dependencies from dncen…
4cf4dd8 
…g/internal/dotnet-aspnetcore-tooling

This pull request updates the following dependencies

[marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling
- **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d
- **Build**: 20200520.4
- **Date Produced**: 5/20/2020 7:15 PM
- **Commit**: 7b992cb8b4ec55b2b3888db28d7ab105eeaaa5f7
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.4 to 3.1.5
  - **Microsoft.AspNetCore.Razor.Language**: from 3.1.4 to 3.1.5
  - **Microsoft.CodeAnalysis.Razor**: from 3.1.4 to 3.1.5
  - **Microsoft.NET.Sdk.Razor**: from 3.1.4 to 3.1.5

[marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)
@dotnet-bot @wtgodbe
Merged PR 8109: [internal/release/3.1] Update dependencies from dncen…
1f637e7 
…g/internal/dotnet-aspnetcore-tooling

This pull request updates the following dependencies

[marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling
- **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d
- **Build**: 20200520.13
- **Date Produced**: 5/21/2020 3:42 AM
- **Commit**: 0e01666509ce785750e66cb5e2d2da219867c4fb
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.5 to 3.1.5
  - **Microsoft.AspNetCore.Razor.Language**: from 3.1.5 to 3.1.5
  - **Microsoft.CodeAnalysis.Razor**: from 3.1.5 to 3.1.5
  - **Microsoft.NET.Sdk.Razor**: from 3.1.5 to 3.1.5

[marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)
@dotnet-bot @wtgodbe
Merged PR 8040: [internal/release/3.1] Update dependencies from dncen…
844a82e 
…g/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:e908e90a-0c22-4c54-b254-08d79557a113)
## From https://github.com/dotnet/efcore
- **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113
- **Build**: 20200520.1
- **Date Produced**: 5/20/2020 5:36 PM
- **Commit**: 85b57af827aa71b77d673e813e046d081c8027ed
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.EntityFrameworkCore.Tools**: from 3.1.4 to 3.1.5
  - **Microsoft.EntityFrameworkCore.InMemory**: from 3.1.4 to 3.1.5
  - **Microsoft.EntityFrameworkCore**: from 3.1.4 to 3.1.5
  - **Microsoft.EntityFrameworkCore.Relational**: from 3.1.4 to 3.1.5
  - **Microsoft.EntityFrameworkCore.Sqlite**: from 3.1.4 to 3.1.5
  - **dotnet-ef**: from 3.1.4 to 3.1.5
  - **Microsoft.EntityFrameworkCore.SqlServer**: from 3.1.4 to 3.1.5

[marker]: <> (End:e908e90a-0c22-4c54-b254-08d79557a113)
@wtgodbe
Remove darc-int feeds
8e3da95
@wtgodbe
Update branding to 3.1.6
626bf3d
@wtgodbe wtgodbe requested a review from a team June 9, 2020 19:57
JunTaoLuo
JunTaoLuo reviewed Jun 9, 2020
View reviewed changes
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.json
@@ -10,9 +10,9 @@
////#endif
"Logging": {
"LogLevel": {
"Default": "Information",
Copy link
Contributor

Choose a reason for hiding this comment

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

Huh what changed here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure - something weird in the merge, I guess. I can push a commit undoing this

Copy link
Member Author

Choose a reason for hiding this comment

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

Replacing the file locally doesn't change anything in git, but I think this is a no-op anyways

dougbu
dougbu approved these changes Jun 9, 2020
View reviewed changes
eng/Baseline.xml Outdated
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Blazor" Version="3.2.0-preview1.20073.1" />
<Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.2.0-preview1.20073.1" />
<Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.2.0-preview1.20073.1" />
<Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
Copy link
Contributor

Choose a reason for hiding this comment

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

NuGet thinks the latest version of this is 3.2.0-preview3.20168.3. Where is the newer version coming from ❔

Copy link
Member Author

Choose a reason for hiding this comment

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

The version you mentioned is newer than the preview1 version currently in the file

eng/Baseline.xml Outdated
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.5" />
<Package Id="Microsoft.AspNetCore.Blazor" Version="3.2.0-preview1.20073.1" />
<Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.2.0-preview1.20073.1" />
<Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.2.0-preview1.20073.1" />
<Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
<Package Id="Microsoft.AspNetCore.Blazor.Server" Version="3.2.0-preview1.20073.1" />
<Package Id="Microsoft.AspNetCore.Blazor.Templates" Version="3.2.0-preview1.20073.1" />
Copy link
Contributor

Choose a reason for hiding this comment

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

All but Microsoft.AspNetCore.Blazor.HttpClient are marked as deprecated on NuGet.org. Should these names be changed now or after the next release❔

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll remove these - @pranavkm is adding the new ones in https://github.com/dotnet/aspnetcore/pull/21921/files

@wtgodbe wtgodbe merged commit 24b9e84 into release/3.1 Jun 9, 2020
@wtgodbe wtgodbe deleted the wtgodbe/316 branch June 9, 2020 23:16
@Pilchie Pilchie added tell-mode Indicates a PR which is being merged during tell-mode area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework labels Jul 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JunTaoLuo JunTaoLuo JunTaoLuo approved these changes

@dougbu dougbu dougbu approved these changes

@ryanbrandenburg ryanbrandenburg ryanbrandenburg approved these changes

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
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@wtgodbe @JunTaoLuo @dougbu @ryanbrandenburg @Pilchie @dotnet-bot