Skip to content

[Dependencies] Updating FunFair.Test.Common (Test Infrastructure) to 6.3.1.2342#382

Merged
dnyw4l3n13 merged 2 commits into
mainfrom
depends/update-funfair.test.common/6.3.1.2342
Jun 23, 2026
Merged

[Dependencies] Updating FunFair.Test.Common (Test Infrastructure) to 6.3.1.2342#382
dnyw4l3n13 merged 2 commits into
mainfrom
depends/update-funfair.test.common/6.3.1.2342

Conversation

@github-actions

Copy link
Copy Markdown

Description

How Has This Been Tested

  • All unit tests pass.
  • All integration tests pass.
  • Manual Testing:

Types of changes

  • Docs change
  • Refactoring
  • Dependency upgrade
  • Additional Unit Tests\Integration Tests
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing
    functionality to change)
  • Removed no-longer used code

Deployment Configuration Changes

  • Requires deployment configuration changes as specified below and in CHANGELOG.md

Checklist

  • I have added tests to cover my changes.
  • Unreleased section of CHANGELOG.md has been updated with details of this PR.

@github-actions github-actions Bot added the auto-pr Pull request created automatically label Jun 22, 2026
@dnyw4l3n13 dnyw4l3n13 self-assigned this Jun 23, 2026
dnyw4l3n13 added a commit that referenced this pull request Jun 23, 2026
…DateTimeSources and AddMockedService

MockDateTimeSources and AddMockedService moved from FunFair.Test.Common to
FunFair.Test.Infrastructure in version 6.3.x. Add the FunFair.Test.Infrastructure
package reference to affected test projects and update using directives accordingly.

Prompt: Work on pull request #382 in funfair-tech/BuildBot.
@dnyw4l3n13 dnyw4l3n13 marked this pull request as ready for review June 23, 2026 12:20
@dnyw4l3n13 dnyw4l3n13 requested a review from a team as a code owner June 23, 2026 12:20
@dnyw4l3n13 dnyw4l3n13 enabled auto-merge June 23, 2026 12:20
@dnyw4l3n13

Copy link
Copy Markdown
Collaborator

Fixed in 241979aFunFair.Test.Common 6.3.x moved MockDateTimeSources and AddMockedService to FunFair.Test.Infrastructure. Added FunFair.Test.Infrastructure 6.3.1.2342 as a package reference to BuildBot.ServiceModel.Tests, BuildBot.GitHub.Tests, BuildBot.CloudFormation.Tests, and BuildBot.Watchtower.Tests, and updated all using directives from FunFair.Test.Common.Mocks to FunFair.Test.Infrastructure.Mocks / added using FunFair.Test.Infrastructure where needed.

Auto-merge has been enabled — will merge once CI passes.

dnyw4l3n13 added a commit that referenced this pull request Jun 23, 2026
…DateTimeSources and AddMockedService

MockDateTimeSources and AddMockedService moved from FunFair.Test.Common to
FunFair.Test.Infrastructure in version 6.3.x. Add the FunFair.Test.Infrastructure
package reference to affected test projects and update using directives accordingly.

Prompt: Work on pull request #382 in funfair-tech/BuildBot.
@dnyw4l3n13 dnyw4l3n13 force-pushed the depends/update-funfair.test.common/6.3.1.2342 branch from 241979a to 8fae142 Compare June 23, 2026 12:25
@dnyw4l3n13

Copy link
Copy Markdown
Collaborator

Rebased onto origin/main. Conflicts resolved:

  • CHANGELOG.md: kept entries from both sides.
  • .csproj version conflicts: took FunFair.Test.Common 6.3.1.2342 (PR target) and Microsoft.NET.Test.Sdk 18.7.0 (latest from main).
  • BuildBot.GitHub.Tests.csproj: kept new FunFair.Test.Infrastructure 6.3.1.2342 reference from second commit alongside updated SDK version.

Branch force-pushed. CI checks are now pending — will proceed once they pass.

@credfeto

credfeto commented Jun 23, 2026

Copy link
Copy Markdown
Member

Super-linter summary

Language Validation result

All files and directories linted successfully

For more information, see the GitHub Actions workflow run

Powered by Super-linter

credfeto and others added 2 commits June 23, 2026 13:07
…DateTimeSources and AddMockedService

MockDateTimeSources and AddMockedService moved from FunFair.Test.Common to
FunFair.Test.Infrastructure in version 6.3.x. Add the FunFair.Test.Infrastructure
package reference to affected test projects and update using directives accordingly.

Prompt: Work on pull request #382 in funfair-tech/BuildBot.
@dnyw4l3n13 dnyw4l3n13 force-pushed the depends/update-funfair.test.common/6.3.1.2342 branch from 8fae142 to f8d814f Compare June 23, 2026 13:07
@dnyw4l3n13

Copy link
Copy Markdown
Collaborator

Rebased onto origin/main again — new commits (726c8e47 fix: use CancellationToken in BotService, 22a7edd3 Meziantou.Analyzer 3.0.109) had landed on main since the previous rebase.

Conflict resolved:

  • CHANGELOG.md: kept entries from both sides (Meziantou.Analyzer to 3.0.109 from main, FunFair.Test.Common to 6.3.1.2342 from this branch).

Branch force-pushed. CI checks are now pending — auto-merge is already enabled and will merge once they pass.

@dnyw4l3n13

Copy link
Copy Markdown
Collaborator

CI checks are currently pending — all required code changes are in place (FunFair.Test.Common 6.3.1.2342 update, FunFair.Test.Infrastructure package references added to test projects, branch rebased onto latest main). Auto-merge is enabled and the PR will merge automatically once all checks pass.

@dnyw4l3n13

Copy link
Copy Markdown
Collaborator

All CI checks have passed. Auto-merge is enabled and waiting for a required review approval before merging automatically.

Summary of changes on this PR:

  • Updated FunFair.Test.Common to 6.3.1.2342
  • Added FunFair.Test.Infrastructure 6.3.1.2342 to all affected test projects (BuildBot.ServiceModel.Tests, BuildBot.GitHub.Tests, BuildBot.CloudFormation.Tests, BuildBot.Watchtower.Tests) since MockDateTimeSources and AddMockedService moved there in 6.3.x
  • Updated using directives accordingly

@dnyw4l3n13 dnyw4l3n13 merged commit 05b8d2a into main Jun 23, 2026
20 checks passed
@dnyw4l3n13 dnyw4l3n13 deleted the depends/update-funfair.test.common/6.3.1.2342 branch June 23, 2026 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-pr Pull request created automatically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants