[master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling #21630
Conversation
This file contains hidden or 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
ghost
added
area-infrastructure
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
@dougbu I'm co-opting this PR to disable binlogs |
|
We'll need to re-enable binlogs once dotnet/msbuild#3577 is resolved. @mmitche note that AspNetCore's build times will probably improve substantially after this is merged, but it'll slow back down once we can re-enable binlogs in CI |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
wtgodbe
changed the title
dotnet-maestro
bot
changed the title
dotnet-maestro
bot
changed the title
dotnet-maestro
bot
changed the title
|
Here comes the TFM fun:
And on Linux, after building repotasks:
I'll fix the latter now |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
👀 |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
dougbu
reviewed
May 11, 2020
|
We are sure that this actually updates the template content? Can we do it in Preview 5 as well? |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
At least aspnetcore/Directory.Build.props Line 59 in 4b88074 |
|
You also need most of my changes from #20748. |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
|
True @ViktorHofer and this is on my plate. However, because the VS versions available in the BYOC pools don't use the latest .props and .targets from the .NET SDK, I expect it will be a while before this repo builds completely. Maybe a day or two… |
Auto-Merge StatusThis pull request has not been merged because Maestro++ is waiting on the following merge policies.
|
dotnet-maestro
bot
changed the title
dougbu
force-pushed
the
darc-master-7229078c-ba81-431b-a628-001d8ef80fed
branch
from
191f1cc to
fe8f237
Compare
|
FYI I pushed this mostly to get a feeling for how far I am from done. The near-immediate failures are mostly expected. |
- avoid comparisons involving `$(TargetFramework)` in .targets files - fine to compare it with `''` or `$(DefaultNetCoreTargetFramework)`
- remove a duplicate `$()` setting - correct the one remaining versioned `#if` define - did not make it `#if NETCOREAPP` because benchmarks test numerous .NET Core TFMs
dougbu
force-pushed
the
darc-master-7229078c-ba81-431b-a628-001d8ef80fed
branch
from
0f32041 to
5bd46f4
Compare
Auto-Merge StatusThis pull request will be merged because the following merge policies have succeeded.
|
dotnet-maestro
bot
deleted the
darc-master-7229078c-ba81-431b-a628-001d8ef80fed
branch
|
Hooray! This means we can do templates now, right? |
|
No, it means the templates and absolutely everything else are already done❕ 🚀 |
|
I'm going to trigger the aspnetcore-tooling subscription because I'm not 100% positive everything's coherent at this point. But, things look very good. |
|
Fantastic - thanks |
dougbu
added a commit
that referenced
this pull request
May 15, 2020
* Update dependencies from https://github.com/dotnet/arcade build 20200511.9 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20228.4 => 5.0.0-beta.20261.9 - Microsoft.DotNet.GenAPI: 5.0.0-beta.20228.4 => 5.0.0-beta.20261.9 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20228.4 => 5.0.0-beta.20261.9 * Pre-emptively take -nobl change * Disable binlogs in CI * Fix build.sh to know about -nobl * Align build.ps1|sh with latest Arcade parameters - do not enable binary logs by default in CI builds - leave `-binaryLog` and `-excludeCIBinaryLog` handling to eng/common/tools.ps1|sh - was unnecessary since `-bl /bl:{some name}` worked fine, ignoring OOMs nit: document `-excludeCIBinarylog` a bit more * Do not pass unknown options into CodeCheck.ps1 * Pass `-ci -nobl` into remaining CI build jobs * Switch default TFM to `net5.0` * Update missing project templates tfms * Add more `-ci -nobl` - needed because _all_ builds in the pipeline are implicitly CI builds - default-build.yml adds `-ci` when script wasn't explicit * Default templates to net5.0 * PR feedback * Update TFMs in explicit .nuspec files * Update TFMs in test projects * Update TFMs in test C# code * Update TFMs in infrastructure files * Future-proof a check for `net5.0` or later - avoid comparisons involving `$(TargetFramework)` in .targets files - fine to compare it with `''` or `$(DefaultNetCoreTargetFramework)` * !fixup! Undo a couple of earlier fixes - remove a duplicate `$()` setting - correct the one remaining versioned `#if` define - did not make it `#if NETCOREAPP` because benchmarks test numerous .NET Core TFMs * Disable binary logs in CodeCheck.ps1 * Specify `-ci -nobl` just once when using `parameters.buildArgs` * Restore `$binaryLog` default logic This cherry-picks most of d5849f3 into this branch - [master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling (#21630) - does not include dotnet/aspnetcore-tooling updates Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Will Godbe <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>
dougbu
added a commit
that referenced
this pull request
May 15, 2020
* Update dependencies from https://github.com/dotnet/arcade build 20200511.9 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20228.4 => 5.0.0-beta.20261.9 - Microsoft.DotNet.GenAPI: 5.0.0-beta.20228.4 => 5.0.0-beta.20261.9 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20228.4 => 5.0.0-beta.20261.9 * Pre-emptively take -nobl change * Disable binlogs in CI * Fix build.sh to know about -nobl * Align build.ps1|sh with latest Arcade parameters - do not enable binary logs by default in CI builds - leave `-binaryLog` and `-excludeCIBinaryLog` handling to eng/common/tools.ps1|sh - was unnecessary since `-bl /bl:{some name}` worked fine, ignoring OOMs nit: document `-excludeCIBinarylog` a bit more * Do not pass unknown options into CodeCheck.ps1 * Pass `-ci -nobl` into remaining CI build jobs * Switch default TFM to `net5.0` * Update missing project templates tfms * Add more `-ci -nobl` - needed because _all_ builds in the pipeline are implicitly CI builds - default-build.yml adds `-ci` when script wasn't explicit * Default templates to net5.0 * PR feedback * Update TFMs in explicit .nuspec files * Update TFMs in test projects * Update TFMs in test C# code * Update TFMs in infrastructure files * Future-proof a check for `net5.0` or later - avoid comparisons involving `$(TargetFramework)` in .targets files - fine to compare it with `''` or `$(DefaultNetCoreTargetFramework)` * !fixup! Undo a couple of earlier fixes - remove a duplicate `$()` setting - correct the one remaining versioned `#if` define - did not make it `#if NETCOREAPP` because benchmarks test numerous .NET Core TFMs * Disable binary logs in CodeCheck.ps1 * Specify `-ci -nobl` just once when using `parameters.buildArgs` * Restore `$binaryLog` default logic This cherry-picks most of d5849f3 into this branch - [master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling (#21630) - does not include dotnet/aspnetcore-tooling updates Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Will Godbe <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>
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.
This pull request updates the following dependencies
From https://github.com/dotnet/arcade
From https://github.com/dotnet/aspnetcore-tooling
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