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

[release/2.1] Update branding to 2.1.28 #3855

Merged
merged 4 commits into from
Apr 7, 2021
Merged

[release/2.1] Update branding to 2.1.28 #3855

merged 4 commits into from
Apr 7, 2021

Conversation

dougbu
Copy link
Member

@dougbu dougbu commented Apr 5, 2021

  • update branding to 2.1.28
  • bump incoming package patch versions
    • e.g. $(MicrosoftNETCoreAppPackageVersion)
    • updated xunit.assert and xunit.extensibility.execution minor versions
      • align with xunit package version
  • use Ubuntu 18.04 build agents

dougbu added 2 commits April 5, 2021 16:31
@dougbu
Update branding to 2.1.28
694b2d7
@dougbu
Bump incoming package patch versions
d2e342a 
- e.g. `$(MicrosoftNETCoreAppPackageVersion)`
- updated xunit.assert and xunit.extensibility.execution minor versions
    - align with xunit package version
@dougbu dougbu requested a review from a team April 5, 2021 23:42
@dougbu dougbu added this to the 2.1.28 milestone Apr 5, 2021
TanayParikh
TanayParikh approved these changes Apr 6, 2021
View reviewed changes
Copy link

@TanayParikh TanayParikh left a comment

Choose a reason for hiding this comment

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

LGTM, though some tests are failing in the CI.

@dougbu dougbu mentioned this pull request Apr 6, 2021
Closed
7 tasks
@dougbu
Use Ubuntu 18.04 build agents
06e47db 
- set locale consistently on all platforms
    - default locale on newer agents is unloved `C.UTF-8`
@dougbu dougbu force-pushed the dougbu/branding.2.1.28 branch from 4475e56 to 06e47db Compare April 7, 2021 20:58
dougbu
dougbu commented Apr 7, 2021
View reviewed changes
src/Caching/Memory/test/CapacityTests.cs
@@ -137,7 +137,7 @@ public async Task DoNotAddIfSizeOverflows()
Assert.Null(cache.Get("key1"));

// Wait for compaction to complete
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(10)));
Assert.True(await sem.WaitAsync(TimeSpan.FromSeconds(20)));
Copy link
Member Author

Choose a reason for hiding this comment

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

@BrennanConroy is this a reasonable fix for flakiness in this test class❔ If not you, who should agree or disagree❔

Copy link
Member

Choose a reason for hiding this comment

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

Seems fine, we've moved to 30 seconds in a lot of places in 3.1 and 5.0.

Personally, I would change the SemaphoreSlime to a CancellationTokenSource.

Copy link
Member Author

Choose a reason for hiding this comment

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

Let's get this in to unblock any 2.1.28 fixes. Feel free to improve the tests further in another PR.

@dougbu dougbu merged commit c5360b7 into release/2.1 Apr 7, 2021
@dougbu dougbu deleted the dougbu/branding.2.1.28 branch April 7, 2021 22:51
ghost pushed a commit that referenced this pull request Apr 8, 2021
@dotnet-maestro-bot @wtgodbe
@dougbu @sebastienros
[automated] Merge branch 'release/2.1' => 'release/3.1' (#3858)
4d2e714 
* Update branding to 2.1.27 (#3842)

* Update branding to 2.1.27

* Fix patchconfig, baseline val

* Update SDK and baseline

* [release/2.1] Update branding to 2.1.28 (#3855)

* Update branding to 2.1.28

* Bump incoming package patch versions
- e.g. `$(MicrosoftNETCoreAppPackageVersion)`
- updated xunit.assert and xunit.extensibility.execution minor versions
    - align with xunit package version

* Use Ubuntu 18.04 build agents
- set locale consistently on all platforms
    - default locale on newer agents is unloved `C.UTF-8`

* !flaky fix! Double compaction timeouts

Co-authored-by: William Godbe <[email protected]>
Co-authored-by: John Luo <[email protected]>
Co-authored-by: Doug Bunting <[email protected]>
Co-authored-by: Sebastien Ros <[email protected]>
@dougbu dougbu mentioned this pull request Apr 14, 2021
Merged
ghost pushed a commit that referenced this pull request Apr 21, 2021
@dotnet-maestro-bot @wtgodbe
@dougbu @sebastienros
[automated] Merge branch 'release/2.1' => 'release/3.1' (#3867)
3986a3d 
* Update branding to 2.1.27 (#3842)

* Update branding to 2.1.27

* Fix patchconfig, baseline val

* Update SDK and baseline

* [release/2.1] Update branding to 2.1.28 (#3855)

* Update branding to 2.1.28

* Bump incoming package patch versions
- e.g. `$(MicrosoftNETCoreAppPackageVersion)`
- updated xunit.assert and xunit.extensibility.execution minor versions
    - align with xunit package version

* Use Ubuntu 18.04 build agents
- set locale consistently on all platforms
    - default locale on newer agents is unloved `C.UTF-8`

* !flaky fix! Double compaction timeouts

* [release/2.1] Credentials fix (#3859)

- inspired by dotnet/runtime#50230
- cherry-picked from 1594096

* [release/2.1] Bump some versions (#3866)

* Move to latest KoreBuild / .NET SDK

* Update baselines
- did not ship any C# packages in 2.1.27
- re-enable baseline validation

* Bump Microsoft.NETCore.App package version

Co-authored-by: William Godbe <[email protected]>
Co-authored-by: John Luo <[email protected]>
Co-authored-by: Doug Bunting <[email protected]>
Co-authored-by: Sebastien Ros <[email protected]>
ghost pushed a commit that referenced this pull request May 5, 2021
@dotnet-maestro-bot @wtgodbe @dougbu
[automated] Merge branch 'release/2.1' => 'release/3.1' (#3871)
fd89259 
* Update branding to 2.1.27 (#3842)

* Update branding to 2.1.27

* Fix patchconfig, baseline val

* Update SDK and baseline

* [release/2.1] Update branding to 2.1.28 (#3855)

* Update branding to 2.1.28

* Bump incoming package patch versions
- e.g. `$(MicrosoftNETCoreAppPackageVersion)`
- updated xunit.assert and xunit.extensibility.execution minor versions
    - align with xunit package version

* Use Ubuntu 18.04 build agents
- set locale consistently on all platforms
    - default locale on newer agents is unloved `C.UTF-8`

* !flaky fix! Double compaction timeouts

* [release/2.1] Credentials fix (#3859)

- inspired by dotnet/runtime#50230
- cherry-picked from 1594096

* [release/2.1] Bump some versions (#3866)

* Move to latest KoreBuild / .NET SDK

* Update baselines
- did not ship any C# packages in 2.1.27
- re-enable baseline validation

* Bump Microsoft.NETCore.App package version

* Update branding to 2.1.29 (#3870)

Co-authored-by: William Godbe <[email protected]>
Co-authored-by: John Luo <[email protected]>
Co-authored-by: Doug Bunting <[email protected]>
ghost pushed a commit that referenced this pull request May 18, 2021
@dotnet-maestro-bot @wtgodbe
@dougbu @pranavkm
[automated] Merge branch 'release/2.1' => 'release/3.1' (#3875)
0ce1f16 
* Update branding to 2.1.27 (#3842)

* Update branding to 2.1.27

* Fix patchconfig, baseline val

* Update SDK and baseline

* [release/2.1] Update branding to 2.1.28 (#3855)

* Update branding to 2.1.28

* Bump incoming package patch versions
- e.g. `$(MicrosoftNETCoreAppPackageVersion)`
- updated xunit.assert and xunit.extensibility.execution minor versions
    - align with xunit package version

* Use Ubuntu 18.04 build agents
- set locale consistently on all platforms
    - default locale on newer agents is unloved `C.UTF-8`

* !flaky fix! Double compaction timeouts

* [release/2.1] Credentials fix (#3859)

- inspired by dotnet/runtime#50230
- cherry-picked from 1594096

* [release/2.1] Bump some versions (#3866)

* Move to latest KoreBuild / .NET SDK

* Update baselines
- did not ship any C# packages in 2.1.27
- re-enable baseline validation

* Bump Microsoft.NETCore.App package version

* Update branding to 2.1.29 (#3870)

* Update baselines

* Update SDK

Co-authored-by: William Godbe <[email protected]>
Co-authored-by: John Luo <[email protected]>
Co-authored-by: Doug Bunting <[email protected]>
Co-authored-by: Pranav K <[email protected]>
@ghost ghost locked as resolved and limited conversation to collaborators May 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@BrennanConroy BrennanConroy BrennanConroy left review comments

@wtgodbe wtgodbe wtgodbe approved these changes

@TanayParikh TanayParikh TanayParikh approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@dougbu @BrennanConroy @wtgodbe @TanayParikh