Skip to content

[release/5.0] Merge, update baselines, SDK and runtimes #30781

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 29 commits into from
Mar 10, 2021
Merged

[release/5.0] Merge, update baselines, SDK and runtimes #30781

merged 29 commits into from
Mar 10, 2021

Conversation

@dougbu
Copy link
Contributor

@dougbu dougbu commented Mar 9, 2021 •
edited
Loading

  • dotnet/aspnetcore-internal#3783
  • Merge commit 'e882394a7bb38930da748291fe2c2ceaa6a80588' into 'release/5.0'
  • Update $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)
  • Update package baselines
  • Update SDK and runtime versions

dotnet-bot and others added 26 commits February 4, 2021 07:41
@dotnet-bot
[internal/release/5.0] Update dependencies from dnceng/internal/dotne…
4d86ae0 
…t-runtime
@dotnet-bot
Merge in 'release/5.0' changes
258eeed
@dotnet-bot
Merge in 'release/5.0' changes
f39b67b
@dotnet-bot
[internal/release/5.0] Update dependencies from dnceng/internal/dotne…
3da1f90 
…t-runtime
@dotnet-bot
[internal/release/5.0] Update dependencies from dnceng/internal/dotne…
f605914 
…t-runtime
@dougbu
Merge remote-tracking branch 'internal/release/5.0' into 'internal/re…
357a302 
…lease/5.0'
@dotnet-bot
[internal/release/5.0] Update dependencies from dnceng/internal/dotne…
0ebd814 
…t-runtime
@dotnet-bot
[internal/release/5.0] Update dependencies from dnceng/internal/dotne…
0b6dec7 
…t-runtime
@dotnet-bot
[internal/release/5.0] Update dependencies from dnceng/internal/dotne…
d1303d0 
…t-runtime
@dotnet-bot
Merge in 'release/5.0' changes
fc95610
@dotnet-bot
Merge in 'release/5.0' changes
0499ae3
@dotnet-bot
Merge in 'release/5.0' changes
1fe6369
@dotnet-bot
Merge in 'release/5.0' changes
c52be62
@dotnet-bot
Merge in 'release/5.0' changes
1ff21d0
@dotnet-bot
Merge in 'release/5.0' changes
61fc832
@dotnet-bot
[internal/release/5.0] Update dependencies from dnceng/internal/dotne…
1db035b 
…t-runtime
@wtgodbe
Resolve merge conflicts
050e7e2
@wtgodbe
Merged PR 12911: Merge from github
bb8f30b
@dotnet-bot
[internal/release/5.0] Update dependencies from dnceng/internal/dotne…
1df900e 
…t-runtime
@dotnet-bot @wtgodbe
Merged PR 12929: [internal/release/5.0] Update dependencies from dnce…
324cf99 
…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**: 20210216.14
- **Date Produced**: 2/16/2021 11:36 PM
- **Commit**: f27d33729518f5aa478aa818b7b4f54a4d50bef1
- **Branch**: refs/heads/internal/release/5.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **System.Drawing.Common**: [from 5.0.2 to 5.0.2][1]
  - **Microsoft.NETCore.App.Internal**: [from 5.0.4-servicing.21116.6 to 5.0.4-servicing.21116.14][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.4 to 5.0.4][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 5.0.4-servicing.21116.6 to 5.0.4-servicing.21116.14][1]
  - **System.Text.Encodings.Web**: [from 5.0.0 to 5.0.1][2]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:d7d10d70-26ab-4663-2902-08d89c6af29b)
@mmitche
Merged PR 13034: Fixup shas for 5.0.3 incrementally serviced packages
94ab46f 
Fixup shas for 5.0.3 incrementally serviced packages
@dotnet-bot
[internal/release/5.0] Update dependencies from dnceng/internal/dotne…
e882394 
…t-efcore
@dougbu
Merge commit 'e882394a7bb38930da748291fe2c2ceaa6a80588' into 'release…
5b8acef 
…/5.0'
@dougbu
Update `$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVe…
6704a01 
…rsion)`
@dougbu
Update package baselines
a522443
@dougbu
Update SDK and runtime versions
0332d9d
@dougbu dougbu requested a review from a team March 9, 2021 19:21
@dougbu dougbu added 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 labels Mar 9, 2021
@dougbu dougbu added this to the 5.0.5 milestone Mar 9, 2021
dougbu
dougbu commented Mar 9, 2021
View reviewed changes
@dougbu
Copy link
Contributor Author

dougbu commented Mar 9, 2021

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Mar 9, 2021

Azure Pipelines successfully started running 2 pipeline(s).

wtgodbe
wtgodbe requested changes Mar 9, 2021
View reviewed changes
Copy link
Member

@wtgodbe wtgodbe left a comment

Choose a reason for hiding this comment

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

Please change ValidateBasline to true

@wtgodbe
Copy link
Member

wtgodbe commented Mar 9, 2021

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Mar 9, 2021

Azure Pipelines successfully started running 2 pipeline(s).

@wtgodbe
Copy link
Member

wtgodbe commented Mar 9, 2021

##[error]src/Components/WebAssembly/Server/src/Microsoft.AspNetCore.Components.WebAssembly.Server.csproj(0,0): error NU1603: (NETCORE_ENGINEERING_TELEMETRY=Restore) Microsoft.AspNetCore.Components.WebAssembly.Server depends on Microsoft.NETCore.BrowserDebugHost.Transport (>= 5.0.4-servicing.21116.14) but Microsoft.NETCore.BrowserDebugHost.Transport 5.0.4-servicing.21116.14 was not found. An approximate best match of Microsoft.NETCore.BrowserDebugHost.Transport 5.0.5-servicing.21126.7 was resolved.

Thought I had already pushed everything. Looking

@wtgodbe
Copy link
Member

wtgodbe commented Mar 9, 2021

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Mar 9, 2021

Azure Pipelines successfully started running 2 pipeline(s).

dougbu added 3 commits March 9, 2021 15:21
@dougbu
Re-enable package baseline validation
dfad244
@dougbu
Update BaselineGenerator
f190980 
- handle `netcoreapp5.0` from `NuspecReader`
@dougbu
Update conditions in Baseline.Designer.props
f636f74 
- run fixed `BaselineGenerator`
@dougbu dougbu mentioned this pull request Mar 9, 2021
Merged
@dougbu dougbu requested a review from wtgodbe March 10, 2021 03:45
@dougbu dougbu merged commit 6b1c28e into release/5.0 Mar 10, 2021
@dougbu dougbu deleted the dougbu/rest.of.5.0.5.3783 branch March 10, 2021 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

5.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@dougbu @wtgodbe @dotnet-bot @mmitche