Merge release/3.1 => master #1496
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add *.cache to excluded files when copying ref packages.
core-sdk: Add target rid to AppHostRuntimeIdentifiers
…nd supply their own. (dotnet#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.
* 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
* Remove copy of coreclr-tools to tarball. These should come from previously source built archive instead. * Update version of private source-built artifacts
* 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 corefx * prebuilts: update versions: online baseline * pipelines: dont continue on error for corefx tests, increase timeout
…uild.sh (dotnet#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 * 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.
…packages (dotnet#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>
crummel
approved these changes
Feb 20, 2020
adaggarwal
approved these changes
Feb 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.