Skip to content

[release/3.0] Update dependencies from dotnet/arcade aspnet/Extensions #1350

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
Closed
dotnet-maestro wants to merge 3 commits into from
Closed

[release/3.0] Update dependencies from dotnet/arcade aspnet/Extensions #1350

dotnet-maestro wants to merge 3 commits into from

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 20, 2019 •
edited
Loading

This pull request updates the following dependencies

From https://github.com/dotnet/arcade

  • Build: 20191119.2
  • Date Produced: 11/19/2019 6:14 PM
  • Commit: e34d933e18ba1cd393bbafcb6018e0f858d3e89e
  • Branch: refs/heads/release/3.x
  • Updates:
    • Microsoft.DotNet.Arcade.Sdk -> 1.0.0-beta.19569.2

From https://github.com/aspnet/Extensions

  • Build: 20191120.2
  • Date Produced: 11/21/2019 12:47 AM
  • Commit: acc00225eb90777af7d962ac97352cfdac350b4e
  • Branch: refs/heads/release/3.0
  • Updates:
    • Microsoft.AspNetCore.BenchmarkRunner.Sources -> 3.0.2-servicing.19570.2
    • Microsoft.AspNetCore.Testing -> 3.0.2-servicing.19570.2
    • Microsoft.Extensions.CommandLineUtils.Sources -> 3.0.2-servicing.19570.2
    • Microsoft.Extensions.NonCapturingTimer.Sources -> 3.0.2-servicing.19570.2
    • Microsoft.Extensions.HashCodeCombiner.Sources -> 3.0.2-servicing.19570.2
    • Microsoft.Extensions.Logging -> 3.0.2-servicing.19570.2

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20191…
ae84439 
…119.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2
@dotnet-maestro dotnet-maestro bot requested review from a team and dougbu as code owners November 20, 2019 19:44
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 20, 2019 •
edited
Loading

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • ❓ Waiting on checks: AspNetCore-Tooling-ci, AspNetCore-Tooling-ci (Build macOS release), AspNetCore-Tooling-ci (Build Linux release), AspNetCore-Tooling-ci (Build Windows release), AspNetCore-Tooling-ci (Build Windows debug), AspNetCore-Tooling-ci (Build Code check)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.

@dotnet-maestro
Update dependencies from https://github.com/aspnet/Extensions build 2…
af7fdbe 
…0191120.1

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.2-servicing.19570.1
- Microsoft.AspNetCore.Testing - 3.0.2-servicing.19570.1
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.2-servicing.19570.1
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.2-servicing.19570.1
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.2-servicing.19570.1
- Microsoft.Extensions.Logging - 3.0.2-servicing.19570.1
@dotnet-maestro dotnet-maestro bot changed the title [release/3.0] Update dependencies from dotnet/arcade [release/3.0] Update dependencies from dotnet/arcade aspnet/Extensions Nov 20, 2019
dougbu
dougbu reviewed Nov 21, 2019
View reviewed changes
Copy link
Contributor

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

Again, not merging 'til @mmitche confirms the file deletions are correct

@dotnet-maestro
Update dependencies from https://github.com/aspnet/Extensions build 2…
989450d 
…0191120.2

- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.2-servicing.19570.2
- Microsoft.AspNetCore.Testing - 3.0.2-servicing.19570.2
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.2-servicing.19570.2
- Microsoft.Extensions.NonCapturingTimer.Sources - 3.0.2-servicing.19570.2
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.2-servicing.19570.2
- Microsoft.Extensions.Logging - 3.0.2-servicing.19570.2
@mmitche
Copy link
Member

mmitche commented Nov 21, 2019

Deletions are correct. Those got replaced by a generic template.

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 21, 2019 •
edited
Loading

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • ❌ Standard Merge Policies Unsuccessful checks: AspNetCore-Tooling-ci, AspNetCore-Tooling-ci (Build Windows release), AspNetCore-Tooling-ci (Build Windows debug)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.

@ajaybhargavb
Copy link
Contributor

ajaybhargavb commented Nov 21, 2019

The windows builds are failing with,

F:\workspace\_work\1\s\.dotnet\sdk\3.0.100\Sdks\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets(198,5): error : Element 'http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd:icon' cannot appear more than once if content model type is "all". This validation error occurred in a 'icon' element. [F:\workspace\_work\1\s\src\Razor\src\Microsoft.NET.Sdk.Razor\Microsoft.NET.Sdk.Razor.csproj]
##[error].dotnet\sdk\3.0.100\Sdks\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets(198,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) Element 'http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd:icon' cannot appear more than once if content model type is "all". This validation error occurred in a 'icon' element.

Not sure if this is known. @wtgodbe are you the right person to look at this?

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 21, 2019 •
edited
Loading

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • ❌ Standard Merge Policies Unsuccessful checks: AspNetCore-Tooling-ci, AspNetCore-Tooling-ci (Build Windows release), AspNetCore-Tooling-ci (Build Windows debug)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.

@dougbu
Copy link
Contributor

dougbu commented Nov 21, 2019

@ajaybhargavb this is kind-of known. I just merged @wtgodbe's #1164 to address those issues. Unfortunately GitHub dislikes the new conflicts and you'll need to resolve the merge conflicts on the command line.

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Nov 21, 2019 •
edited
Loading

Auto-Merge Status

This pull request has not been merged because Maestro++ is waiting on the following merge policies.

  • ❌ Standard Merge Policies Unsuccessful checks: AspNetCore-Tooling-ci, AspNetCore-Tooling-ci (Build Windows release), AspNetCore-Tooling-ci (Build Windows debug)
  • ✔️ Standard Merge Policies Succeeded - No reviews have requested changes.

@dougbu
Copy link
Contributor

dougbu commented Nov 21, 2019

Also easiest to clean up these merge conflicts by re-triggering the subscriptions…

@dougbu dougbu closed this Nov 21, 2019
@dougbu dougbu deleted the darc-release/3.0-3bc480be-7d68-460f-b948-17963cdb17b8 branch January 8, 2020 03:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@dougbu dougbu dougbu left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-infrastructure

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mmitche @ajaybhargavb @dougbu