Port -nobl and net5.0 changes from 'master'#21885
Merged
Merged
Conversation
* 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 <wigodbe@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
dougbu
requested review from
BrennanConroy,
SteveSandersonMS,
Tratcher,
halter73 and
jkotalik
as code owners
May 15, 2020 18:04
Contributor
Author
|
@Pilchie if we're 🆗 with the occasional |
Member
|
I'd rather just take it as is. It seems silly to do a bunch of work to make our builds less reliable... |
JunTaoLuo
approved these changes
May 15, 2020
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
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.
Update dependencies from https://github.com/dotnet/arcade build 20200511.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
-binaryLogand-excludeCIBinaryLoghandling to eng/common/tools.ps1|sh-bl /bl:{some name}worked fine, ignoring OOMsnit: document
-excludeCIBinaryloga bit moreDo not pass unknown options into CodeCheck.ps1
Pass
-ci -noblinto remaining CI build jobsSwitch default TFM to
net5.0Update missing project templates tfms
Add more
-ci -nobl-ciwhen script wasn't explicitDefault 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.0or later$(TargetFramework)in .targets files''or$(DefaultNetCoreTargetFramework)!fixup! Undo a couple of earlier fixes
$()setting#ifdefine#if NETCOREAPPbecause benchmarks test numerous .NET Core TFMsDisable binary logs in CodeCheck.ps1
Specify
-ci -nobljust once when usingparameters.buildArgsRestore
$binaryLogdefault logicThis cherry-picks most of d5849f3 into this branch
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Will Godbe wigodbe@microsoft.com
Co-authored-by: Viktor Hofer viktor.hofer@microsoft.com