This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
Remove buildtools #26108
Merged
Remove buildtools #26108
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
sbomer
added
the
* NO MERGE *
sbomer
force-pushed
the
removeBuildTools
branch
from
85bcebd
to
13878d7
Compare
hoyosjs
reviewed
Aug 12, 2019
| @@ -17,7 +17,6 @@ | |||
| <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> | |||
| <PropertyGroup> | |||
| <CoreClrCurrentRef>5d3c9a7c54c1c59b764de0e2dfb6bbb4ce29476c</CoreClrCurrentRef> | |||
There was a problem hiding this comment.
This was mostly used to update ILAsmVersion.txt. I see you are removing that file, should we just remove the MicrosoftNETCoreRuntimeCoreCLRPackageVersion update and make a DarcMaestro subscription for the CoreCLR packages? Also, if that happens, should we delete this file and move anything interesting left to Directory.Build.props? Are there scenarios that depend on this as it currently is?
There was a problem hiding this comment.
Eventual goal is to get rid of this file - I'll look into it and may work on that in this change if it makes sense.
sbomer
force-pushed
the
removeBuildTools
branch
2 times, most recently
from
a0d55f6
to
285f5de
Compare
sbomer
force-pushed
the
removeBuildTools
branch
2 times, most recently
from
03f4d2c
to
f069b2d
Compare
Instead we use the built-in SDK targets to restore packages. The new logic will not copy pdbs from package dependencies to CORE_ROOT.
This prevents issues with the old SDK trying to copy ilasm to the Tools directory for each build of an ilproj.
Use netcoreapp3.0 to ensure that package dependencies show up in the build output (bin/TargetingPack). This fixes a missing reference for CscBench, which depends on Microsoft.CodeAnalysis.CSharp. Also clean up some unnecessary properties.
This library needs to be restored for netcoreapp5.0, and built for netcoreapp3.0 to match the tests.
There were problems when trying to target 5.0 using the current SDK, which only supports targeting 3.0 out of the box. This required using a more recent SDK, as p6 restored framework references differently. p7 is able to restore a framework reference with the MicrosoftNETCoreApp version that we desire.
sbomer
force-pushed
the
removeBuildTools
branch
from
9f55268
to
a6d0e09
Compare
|
/azp run coreclr-outerloop |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run coreclr-outerloop |
|
Azure Pipelines successfully started running 1 pipeline(s). |
sbomer
removed
the
* NO MERGE *
hoyosjs
reviewed
Sep 17, 2019
|
|
||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> | ||
|
|
||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.versiontools.tasks\$(MicrosoftDotNetVersionToolsTasksPackageVersion)\build\Microsoft.DotNet.VersionTools.Tasks.targets" /> |
There was a problem hiding this comment.
Technically this is the only thing that we still have from buildtools?
There was a problem hiding this comment.
This now comes from arcade: https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.VersionTools :)
echesakov
approved these changes
Sep 17, 2019
| @@ -59,14 +31,6 @@ | |||
| <AltJitArch>$(__AltJitArch)</AltJitArch> | |||
| </AllResolvedRuntimeDependencies> | ||
| <RunTimeDependecyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)" Exclude="@(RunTimeDependecyExcludeFiles)"/> | ||
| <RunTimeDependecyCopyLocal Include="@(RunTimeDependecyCopyLocalFile -> '%(File)')" /> |
|
|
||
| <Copy | ||
| SourceFiles="@(RunTimeDependecyCopyLocal)" |
sbomer
added a commit
to sbomer/coreclr
that referenced
this pull request
Sep 18, 2019
After dotnet#26108, this was broken because the Tools.proj was never restored on the agent running the finalize-publish job. This fixes the script to do a restore, and adds a missing import.
sbomer
added a commit
to sbomer/coreclr
that referenced
this pull request
Sep 18, 2019
After dotnet#26108, this was broken because the Tools.proj was never restored on the agent running the finalize-publish job. This fixes the script to do a restore, and adds a missing import.
sbomer
added a commit
that referenced
this pull request
Sep 18, 2019
* Fix update versions logic After #26108, this was broken because the Tools.proj was never restored on the agent running the finalize-publish job. This fixes the script to do a restore, and adds a missing import. * Remove UpdatePublishedVersions.ps1 and add darc dependency
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I think this is finally ready to go. @dotnet/coreclr-infra this removes the dependency on buildtools. Please let me know if you think there's any additional testing I need to do.
This opens up the possibility of further simplifying some of our msbuild imports, but I don't want to do so in this PR as it's already a sizeable change.