Skip to content

Port -nobl and net5.0 changes from 'master' #21885

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.

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

Merged
merged 1 commit into from
May 15, 2020

Conversation

dougbu
Copy link
Contributor

@dougbu dougbu commented 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

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]

* 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
Copy link
Contributor Author

dougbu commented May 15, 2020

@Pilchie if we're 🆗 with the occasional msbuild OOM in this branch, I could undo the Arcade and -nobl part of this PR. Let me know…

@Pilchie
Copy link
Member

Pilchie commented May 15, 2020

I'd rather just take it as is. It seems silly to do a bunch of work to make our builds less reliable...

@dougbu dougbu merged commit 0f80048 into release/5.0-preview5 May 15, 2020
@dougbu dougbu deleted the dougbu/port.net50 branch May 15, 2020 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants