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

[release/3.1] code-merge, baseline/SDK update #32583

Merged
merged 14 commits into from May 11, 2021
Merged

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented May 11, 2021

No description provided.

dotnet-bot and others added 14 commits April 7, 2021 16:48
…ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:e908e90a-0c22-4c54-b254-08d79557a113)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113
- **Build**: 20210407.7
- **Date Produced**: 4/7/2021 8:05 PM
- **Commit**: 316acfe22bc6d3834e135dc6b8053dc9f560ffc2
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.EntityFrameworkCore.Tools**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 3.1.14 to 3.1.15][1]
  - **dotnet-ef**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.Extensions.Logging**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.AspNetCore.Analyzer.Testing**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2]
  - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2]
  - **Microsoft.Extensions.ActivatorUtilities.Sources**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2]
  - **Microsoft.Extensions.Caching.Abstractions**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Caching.Memory**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Caching.SqlServer**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Caching.StackExchangeRedis**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.CommandLineUtils.Sources**: [from 3.1.14-servicing.21165.9 to 3.1.15-servicing.21207.1][2]
  - **Microsoft.Extensions.Configuration.Abstractions**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.AzureKeyVault**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.Binder**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.CommandLine**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.FileExtensions**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.Ini**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.Json**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.KeyPerFile**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.UserSecrets**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration.Xml**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.Configuration**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.DependencyInjection**: [from 3.1.14 to 3.1.15][2]
  - **Microsoft.Extensions.DiagnosticAdapter**: [fr...
…ng/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**: 20210407.8
- **Date Produced**: 4/7/2021 10:59 PM
- **Commit**: fd6e7516ef0f4d858b5fa2737791f1e208010a15
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.AspNetCore.Razor.Language**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.CodeAnalysis.Razor**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.NET.Sdk.Razor**: [from 3.1.14 to 3.1.15][1]
  - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 3.1.14 to 3.1.15][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling/branches?baseVersion=GCaec2954&targetVersion=GCfd6e751&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)
…ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:e908e90a-0c22-4c54-b254-08d79557a113)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113
- **Build**: 20210414.7
- **Date Produced**: 4/15/2021 2:53 AM
- **Commit**: f27020308547a24d2b78fad34307d1a4d502f355
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e908e90a-0c22-4c54-b254-08d79557a113)

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.Extensions.Logging**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.14 to 3.1.15 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.AspNetCore.Analyzer.Testing**: from 3.1.15-servicing.21207.1 to 3.1.15-servicing.21214.5 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.15-servicing.21207.1 to 3.1.15-servicing.21214.5 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.ActivatorUtilities.Sources**: from 3.1.15-servicing.21207.1 to 3.1.15-servicing.21214.5 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Caching.Abstractions**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Caching.Memory**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Caching.SqlServer**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Caching.StackExchangeRedis**: from 3.1.15 to 3.1.15 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.15-servicing.21207.1 to 3.1.15-servicing.21214.5 (parent: Microsoft.EntityFrameworkCore)
  - **Microsoft.Extensions.Configuration.Abstractions...
…t-aspnetcore-tooling

 - Fix tests

 - Fixup nuget config

 - Merge remote-tracking branch 'origin/internal/release/3.1' into darc-internal/release/3.1-abb7ce07-c2cf-48b4-83cf-58ca4dbabd3d
@wtgodbe wtgodbe requested a review from a team May 11, 2021 17:10
@msftbot msftbot bot added this to PR Open in Servicing Status May 11, 2021
@wtgodbe
Copy link
Member Author

wtgodbe commented May 11, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label May 11, 2021
@wtgodbe wtgodbe merged commit dbdec83 into release/3.1 May 11, 2021
@wtgodbe wtgodbe deleted the wtgodbe/3116Merge branch May 11, 2021 22:01
@dougbu dougbu added this to the 3.1.16 milestone Jun 10, 2021
@dougbu dougbu added the tell-mode Indicates a PR which is being merged during tell-mode label Jun 10, 2021
@msftbot msftbot bot moved this from PR Open to Tell Mode in Servicing Status Jun 10, 2021
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 tell-mode Indicates a PR which is being merged during tell-mode
Projects
No open projects
Servicing Status
  
Tell Mode
Development

Successfully merging this pull request may close these issues.

None yet

4 participants