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.

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

Allow users to supply their own SDK for bootstrapping #1455

Merged
merged 3 commits into from
Feb 7, 2020
Merged

Allow users to supply their own SDK for bootstrapping #1455

merged 3 commits into from
Feb 7, 2020

Conversation

crummel
Copy link
Contributor

@crummel crummel commented Jan 22, 2020 •
edited
Loading

Fixes #1435.

omajid
omajid approved these changes Jan 23, 2020
View reviewed changes
Copy link
Member

@omajid omajid left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good! Thanks!

I wonder, though, if all this duplication will/can be reduced in the long term.

@crummel
Copy link
Contributor Author

crummel commented Jan 23, 2020

We're quite close to where we could generate the tarball without building at all (#831), so that would help get rid of some of this. I was planning on trying the straightforward version of that and seeing if it works soon.

dseefeld
dseefeld reviewed Jan 24, 2020
View reviewed changes
build-source-tarball.sh Outdated Show resolved Hide resolved
dseefeld
dseefeld approved these changes Jan 24, 2020
View reviewed changes
Copy link
Contributor

@dseefeld dseefeld left a comment

Choose a reason for hiding this comment

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

One comment. Otherwise, LGTM.

omajid added a commit to omajid/source-build-reference-packages that referenced this pull request Jan 30, 2020
@omajid
Allow users to supply a custom SDK and source-built artifacts
14ce71b 
This change tries to implement something analogous to
dotnet/source-build#1455 for
source-build-reference-packages.

With this change, I can build source-build-reference-packages completely
offline on linux-x64 against a source-built SDK by running:

    ./build.sh --with-sdk /usr/lib64/dotnet \
               --with-packages /usr/lib64/dotnet/source-built-artifacts/*.tar.gz
@omajid omajid mentioned this pull request Jan 30, 2020
Merged
omajid added a commit to omajid/source-build-reference-packages that referenced this pull request Feb 4, 2020
@omajid
Allow users to supply a custom SDK and source-built artifacts
93e4ef4 
This change tries to implement something analogous to
dotnet/source-build#1455 for
source-build-reference-packages.

With this change, I can build source-build-reference-packages completely
offline on linux-x64 against a source-built SDK by running:

    ./build.sh --with-sdk /usr/lib64/dotnet \
               --with-packages /usr/lib64/dotnet/source-built-artifacts/*.tar.gz
dseefeld pushed a commit to dotnet/source-build-reference-packages that referenced this pull request Feb 4, 2020
@omajid
Allow users to supply a custom SDK and source-built artifacts (#100)
125b8d6 
This change tries to implement something analogous to
dotnet/source-build#1455 for
source-build-reference-packages.

With this change, I can build source-build-reference-packages completely
offline on linux-x64 against a source-built SDK by running:

    ./build.sh --with-sdk /usr/lib64/dotnet \
               --with-packages /usr/lib64/dotnet/source-built-artifacts/*.tar.gz
@crummel crummel merged commit 22cdae5 into dotnet:release/3.1 Feb 7, 2020
dseefeld added a commit that referenced this pull request Feb 24, 2020
@dseefeld @tmds
@crummel @dotnet-maestro @adaggarwal @dagood @mmitche
Merge release/3.1 => master (#1496)
f06f32e 
* 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>
@omajid omajid mentioned this pull request Mar 11, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adaggarwal adaggarwal adaggarwal approved these changes

@dseefeld dseefeld dseefeld approved these changes

@omajid omajid omajid approved these changes

@NikolaMilosavljevic NikolaMilosavljevic Awaiting requested review from NikolaMilosavljevic

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Allow user to bring their own SDK
4 participants
@crummel @omajid @dseefeld @adaggarwal