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] Update dependencies from dotnet/core-sdk #1451

Merged

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 18, 2020

This pull request updates the following dependencies

From https://github.com/dotnet/core-sdk

  • Subscription: 51fc597d-fca2-4642-0a3a-08d7476b05e1
  • Build: 20200120.6
  • Date Produced: 1/21/2020 12:50 AM
  • Commit: 85827cd7db52b09a94fda0a39e41ccc8134a0b51
  • Branch: refs/heads/release/3.1.1xx
  • Updates:
    • Microsoft.Dotnet.Sdk.Internal -> 1.0.0-preview.20070.6

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

  • Microsoft.Dotnet.Toolset.Internal -> 3.1.102-servicing.20070.8 (parent: Microsoft.Dotnet.Sdk.Internal)
  • Microsoft.NETCore.Runtime.CoreCLR -> 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp)
  • Microsoft.NETCore.App -> 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal)
  • Microsoft.DotNet.Common.ItemTemplates -> 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
  • Microsoft.NETCore.Compilers -> 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal)
  • Microsoft.Extensions.Logging -> 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions)
  • Microsoft.AspNetCore.Mvc.Razor.Extensions -> 3.1.2 (parent: Microsoft.AspNetCore.App.Ref)
  • Microsoft.AspNetCore.App.Ref -> 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
  • Microsoft.NET.Sdk -> 3.1.102-servicing.20068.5 (parent: Microsoft.Dotnet.Toolset.Internal)
  • Microsoft.DotNet.Cli.Runtime -> 3.1.102-servicing.20069.1 (parent: Microsoft.Dotnet.Toolset.Internal)
  • Microsoft.FSharp.Compiler -> 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal)
  • Microsoft.NET.Sdk.Web -> 3.1.102-servicing.20068.3 (parent: Microsoft.Dotnet.Toolset.Internal)

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Jan 18, 2020

Auto-Merge Status

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

  • All Checks Successful Unsuccessful checks: source-build-CI (centos71_BootStrap Offline), source-build-CI
  • No Extra Commits Merge Policy Not Yet Implemented.
  • ✔️ No Requested Changes Succeeded - No reviews have requested changes.

@crummel crummel force-pushed the darc-release/3.1-8486046d-e49c-45bd-80ec-1058f0b93721 branch from 7927cda to 4023740 Compare January 21, 2020 21:41
…00118.6

- Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20068.6

Dependency coherency updates

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20067.13 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Runtime.CoreCLR - 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp)
- Microsoft.NETCore.App - 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions)
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref)
- Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20067.4 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk.Web - 3.1.101-servicing.19616.2 (parent: Microsoft.Dotnet.Toolset.Internal)
…00119.5

- Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20069.5

Dependency coherency updates

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20069.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Runtime.CoreCLR - 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp)
- Microsoft.NETCore.App - 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions)
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref)
- Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NET.Sdk - 3.1.102-servicing.20068.5 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20069.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk.Web - 3.1.101-servicing.19616.2 (parent: Microsoft.Dotnet.Toolset.Internal)
…00120.6

- Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20070.6

Dependency coherency updates

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20070.8 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Runtime.CoreCLR - 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp)
- Microsoft.NETCore.App - 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions)
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref)
- Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NET.Sdk - 3.1.102-servicing.20068.5 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20069.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk.Web - 3.1.102-servicing.20068.3 (parent: Microsoft.Dotnet.Toolset.Internal)
@crummel crummel force-pushed the darc-release/3.1-8486046d-e49c-45bd-80ec-1058f0b93721 branch from 4023740 to a11d34c Compare January 21, 2020 21:51
@crummel crummel force-pushed the darc-release/3.1-8486046d-e49c-45bd-80ec-1058f0b93721 branch from a11d34c to 17320ea Compare January 21, 2020 22:08
@crummel crummel force-pushed the darc-release/3.1-8486046d-e49c-45bd-80ec-1058f0b93721 branch from 8d222b9 to c6564bc Compare January 21, 2020 22:59
@adaggarwal adaggarwal force-pushed the darc-release/3.1-8486046d-e49c-45bd-80ec-1058f0b93721 branch from a835576 to 3fe3b0a Compare February 4, 2020 21:03
@adaggarwal adaggarwal self-assigned this Feb 7, 2020
@adaggarwal adaggarwal force-pushed the darc-release/3.1-8486046d-e49c-45bd-80ec-1058f0b93721 branch from c1901b0 to ca40794 Compare February 10, 2020 22:23
@adaggarwal
Copy link
Member

Bootstrap issue - requires online access in step 2 to build ref-packages. Ok to merge. (Reverting the last commit)
Last build - where all legs passed other than Bootstrap.

@dotnet-maestro
Copy link
Contributor Author

Auto-Merge Status

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

  • All Checks Successful Unsuccessful checks: source-build-CI (centos71_BootStrap Offline)
  • No Extra Commits Merge Policy Not Yet Implemented.
  • ✔️ No Requested Changes Succeeded - No reviews have requested changes.

@adaggarwal adaggarwal merged commit 7973d2e into release/3.1 Feb 10, 2020
@adaggarwal adaggarwal deleted the darc-release/3.1-8486046d-e49c-45bd-80ec-1058f0b93721 branch February 10, 2020 22:27
@dagood
Copy link
Member

dagood commented Feb 10, 2020

@adaggarwal does this mean the bootstrap flow won't work in 3.1? Is there an issue tracking this?

@adaggarwal
Copy link
Member

@adaggarwal does this mean the bootstrap flow won't work? Is there an issue tracking this?

Filed - #1475

dseefeld added a commit that referenced this pull request Feb 24, 2020
* core-sdk: Add target rid to AppHostRuntimeIdentifiers

* Add *.cache to excluded files when copying ref packages. (#1432)

* Add *.cache to excluded files when copying ref packages.

* Allow user to skip downloading the previously-source-built packages and supply their own. (#1434)

* Allow user to skip downloading the previously-source-built packages and supply their own.

* Need list of packages while creating tarball

* Also add custom ref package path

* Don't try to copy externals tarballs if they're not there

* Correct help for some options

* Some fixups from trying local builds.

* Separate out arguments to skip ref packages and previously-source-built.

* Always build portable runtime in addition to non-portable. (#1433)

* Make portable build before non-portable.

* Use conditions on portable dependencies

* Add portable versions to Version.Details.xml so we get git commit info for them.

* Move GatherBuiltPackages after targets import so we override it, and clean up repos after WriteVersionsFile instead of CopyPackage.

* ILAsm/ILDasm aren't produced in the always-portable proj.

* Try not to break things for ARM.

* Add an override for people who don't want to spend the extra time to build portable.

* Exclude symbol packages to cut down on space requirements.

* Up some timeouts for additional builds

* More disk space logging

* Try shallow clone and more agressive deletions

* Allow users to supply their own SDK for bootstrapping (#1455)

* Remove copy of coreclr-tools to tarball (#1467)

* Remove copy of coreclr-tools to tarball.  These should come from
previously source built archive instead.

* Update version of private source-built artifacts

* [release/3.1] Update dependencies from dotnet/core-sdk (#1451)

* Update dependencies from https://github.com/dotnet/core-sdk build 20200118.6

- Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20068.6

Dependency coherency updates

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20067.13 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Runtime.CoreCLR - 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp)
- Microsoft.NETCore.App - 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions)
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref)
- Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20067.4 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk.Web - 3.1.101-servicing.19616.2 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/core-sdk build 20200119.5

- Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20069.5

Dependency coherency updates

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20069.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Runtime.CoreCLR - 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp)
- Microsoft.NETCore.App - 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions)
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref)
- Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NET.Sdk - 3.1.102-servicing.20068.5 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20069.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk.Web - 3.1.101-servicing.19616.2 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/core-sdk build 20200120.6

- Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20070.6

Dependency coherency updates

- Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20070.8 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Runtime.CoreCLR - 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp)
- Microsoft.NETCore.App - 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions)
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref)
- Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)
- Microsoft.NET.Sdk - 3.1.102-servicing.20068.5 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20069.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.NET.Sdk.Web - 3.1.102-servicing.20068.3 (parent: Microsoft.Dotnet.Toolset.Internal)

* Try not removing netstandard from project

* Remove some obsolete ASP.NET extensions patches

* Fix ASP verbosity flag

* Only build ASP for netcoreapp

* Update ProdConFeed

* Add core-setup patch to pick up correct libhostpolicy

* Production Prebuilts(online): update versions

* patch: aspnetcore: change RID to sb-rid

* Patch: coreClr: Remove Helix prebuilt

* Patch: aspnet-extensions: build ms internal ext refs for aspnetcore

* aspnetcore: patch: Resolve to using sb-rid for clrjit path only

* Don't overwrite ASP.NET version if we already have it

* Revert "Don't overwrite ASP.NET version if we already have it"

This reverts commit d452ef9.

* Need to override RID for ASP.NET on OSX as well

Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Aditya Aggarwal <aditya.aggarwal@microsoft.com>

* Update tarball urls (#1474)

* Feb 3.1 Update coreFX (#1481)

* update corefx

* prebuilts: update versions: online baseline

* pipelines: dont continue on error for corefx tests, increase timeout

* Update bootstrap scripts to use params for source-build  and s-b-r-p build.sh (#1476)

* Update bootstrap scripts to use params for source-build build.sh and
source-build-reference-packages build.sh

* Update CI to work with updated bootstrap script

* Fix cleanup of reference packages

* Enable smoke-test-prereqs in bootstrapping final SDK smoke tests.

* Add GraphViz dependency graph generator project (#1486)

* Add GraphViz dependency graph generator project

* Move generate-graphviz.proj to subdir

Something relies on tools-local/init-build.proj being the only project in the directory, causing PR validation to fail.

* [release/3.1] Update dependencies from dotnet/source-build-reference-packages (#1430)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20200106.1

- Private.SourceBuild.ReferencePackages - 1.0.0-beta.20056.1

* Update dependencies

* Use the Artifacts packages version with coreclr tools

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20200207.1

- Private.SourceBuild.ReferencePackages - 1.0.0-beta.20107.1

Dependency coherency updates

- Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions)
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref)
- Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal)

* fix: Rectify the repo clone directory names

Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: Aditya Aggarwal <aditya.aggarwal@microsoft.com>

Co-authored-by: Tom Deseyn <tom.deseyn@gmail.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Aditya Aggarwal <aditya.aggarwal@microsoft.com>
Co-authored-by: Davis Goodin <dagood@users.noreply.github.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants