Skip to content

Resolve merge conflicts after main branch package metadata refactoring#1038

Merged
304NotModified merged 97 commits intopackage-readmesfrom
copilot/sub-pr-844-again
Feb 18, 2026
Merged

Resolve merge conflicts after main branch package metadata refactoring#1038
304NotModified merged 97 commits intopackage-readmesfrom
copilot/sub-pr-844-again

Conversation

Copy link
Contributor

Copilot AI commented Feb 17, 2026

Main branch refactored NuGet package configuration, moving metadata from .nuspec files into .csproj files. This created conflicts with the documentation PR that added XML docs and READMEs.

Merge Resolution

  • 17 .csproj files: Combined XML documentation settings (GenerateDocumentationFile, NoWarn CS1591) with new inline package metadata from main
  • 15 .nuspec files: Removed obsolete files (metadata now in .csproj)
  • CHANGELOG.md: Preserved both PR improvements and main release history
  • Reqnroll package: Added missing PackageReadme.md file

Corrections

  • Fixed incorrect PackageTags in Microsoft.Extensions.DependencyInjection plugin (verify xunitmicrosoft extensions di dependency injection)
  • Fixed copy-paste error in NUnit plugin comment referencing wrong framework

Build verified successful across all packages.


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

gasparnagy and others added 30 commits September 21, 2025 14:31
Added note about xUnit v3 support and MsTest v4 preview.
* Upgraded Gherkin, Messages, and HtmlFormatter to latest Cucumber releases.
Compiles.
Tests Pass.

* Updated Formatters.Tests to use latest CCK samples. Some tests broken related to new Suggestion message type, how StepMatchArgumentsLists and StepMatchArguments are handled. Need to add support for multiple feature files per scenario.

* Added support for Suggestion and Snippet message types.

* Modified how actual results are sequenced for analysis in preparation of supporting multiple features per test.

* Modified CCK Scenario testing to be driven from a single paramter (name of the CCK scenario)

* Adding Multiple Feature scenarios to test suite
Modified validator to partition envelopes by feature to allow for feature by feature comparison.

* Refactored test validation to account for CCK changes to how StepMatchArguments groups are rendered.

* Added support for rendering multiple StepMatchArgumentsLists when a step is ambiguous. The argument lists for each possible binding are rendered.

* Minor fixup of tests.

* Updated Formatter Acceptance Tests to CCK release R23 (dated 15 Sept 2025)

* Updated Changelog.md

* small code cleanup

* Updates based upon review comments.

Eliminated confusing IdGenerator parameter from IStepTrackerFactory interface definitions (and impl).

---------

Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
* Improved available plugins page with dynamic tag based filter

* remove custom code from page, make it a "plugin"

* remove need for "<span>"
* Update available-plugins.md

Adding LivingDoc project to available reqnroll plugins

* Fix badge

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fix casing

* Fix casing of 'formatter' in available plugins list

---------

Co-authored-by: Julian Verdurmen <5808377+304NotModified@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
* link available formatter plugins from reporting docs pages

* fix build
* Switch licence file out for SPDX identifier in NuGet packages

* Switch MSBuild.Generation project to using csproj for package composition

* Clean up self-test capability

* Simplification of direct MSBuild generation integration in tests

* Remove diagnostic messages

* Clean up direct build imports

* Set up deffered task loading for tests

* Simplified code-generation tasks to run late as possible: just before compile.

* Add line breaks for clarity

* Correct issue with analyzer being transiently added to projects

* Clean up DLL selection for packing

* Fix resource embedding happening too late in the build process

* Updated link to documentation

* Standardised package icon inclusion across all csproj-based packages

* Update xUnit3 plugin to parity with other plugin projects

* Add missing reference to Verify plugin in tests

* Normalize Reqnroll property and item names

* Clean up generation imprort property

* Added CHANGELOG entry

---------

Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
* feat(generator): add support for scenario-level non-parallelizable tags

* Update contributors list in CHANGELOG.md

---------

Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
* Initial plan

* Add TUnit integration documentation

Co-authored-by: 304NotModified <5808377+304NotModified@users.noreply.github.com>

* Enhance TUnit documentation with TestContext in hooks and comprehensive parallel execution guide

Co-authored-by: 304NotModified <5808377+304NotModified@users.noreply.github.com>

* Remove SpecFlow migration notes from tunit.md

Removed migration notes from SpecFlow section.

* Revise TUnit documentation for TestContext and parallel execution

Updated the TUnit documentation to clarify the TestContext usage and parallel execution controls.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: 304NotModified <5808377+304NotModified@users.noreply.github.com>
Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
* Documentation on Custom StepDefinition Attributes

* Modifications per review comments

* fix relative link

---------

Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
…#857)

* Fix: Exceptions from before scenario plugin hook events (RuntimePluginTestExecutionLifecycleEvents.BeforeScenario) are not shown

* Fix: Before scenario hooks are not raised immediately when `runtime/stopAtFirstError` is true, but handled delayed

* handle case when both user and plugin hooks fail

* test was pushed half-finished
…t name attributes (#854) (#859)

* Squash and reimplement using feedback for TestClassGenerationContext

* Remove unused namespace from MsTestGeneratorProvider

Removed unused namespace 'Reqnroll.Configuration'.

* Remove unused namespace from MsTestV2GeneratorProvider

Removed unused 'Reqnroll.Configuration' namespace.

* Remove unused namespace import

Removed unused 'Reqnroll.Configuration' namespace import.

---------

Co-authored-by: Steven Ryland <stevenryland@microsoft.com>
Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
* Reqnroll.Verify: Support for Verify v29+

* small improvement in test

* Update Tests/Reqnroll.SystemTests/Plugins/Resources/VerifyPlugin/StepDefinitions.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…-run fix to occur within TestExecutionEngine (#860)

Co-authored-by: Steven Ryland <stevenryland@microsoft.com>
Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
* refactor generator task to get the code-behind and messages files to be generated from MsBuild

* Fix: Formatters: Test execution fails when formatters were disabled due to a generation error

* add more diag logging

* fix mixed path separators provided by MsBuild

* remove initializer to default

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* rename method to explain intent

* Change property name of msbuild task to LaunchDebugger

* Added comment to GenerationSettings

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Fix: nuspec referencing incorrect Cucumber.HtmlFormatter version

* fix CHANGELOG

Updated CHANGELOG to include issue number and contributor handle.

---------

Co-authored-by: Jorg de Bont <j.bont@ellips.com>
Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
…es (#831)

* Initial plan

* Fix issue #808: Update 3rd party licenses to match current dependencies

Co-authored-by: 304NotModified <5808377+304NotModified@users.noreply.github.com>

* Add License for React-Components

* Update Reqnroll.sln

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: 304NotModified <5808377+304NotModified@users.noreply.github.com>
Co-authored-by: Chris Rudolphi <1702962+clrudolphi@users.noreply.github.com>
…at provided by Reqnroll v2. This causes problems with test filtering in CI jobs. (#871)

This PR honors the DisableFriendlyTestNames configuration setting to omit the DisplayName property when that config value is true.
…s" option (#881)

Co-authored-by: Steven Ryland <stevenryland@microsoft.com>
* Performance: Cache the value of IsDryRun environment variable as it is evaluated frequently.

* PR suggestion (#878)

Co-authored-by: Steven Ryland <stevenryland@microsoft.com>

---------

Co-authored-by: Steven Ryland <stevenry@outlook.com>
Co-authored-by: Steven Ryland <stevenryland@microsoft.com>
…877)

* Add integration tests for ReportPortal.Reqnroll plugin compatibility

* Update ReportPortalPluginTest.cs
gasparnagy and others added 16 commits January 8, 2026 15:36
* Add tests to demonstrate the bug

* fix test

* fix test 2

* Apply fix

* Update CHANGELOG

* fix test that requires explicit reqnroll dep

* Ensure that NUnit and MSTest.TestFramework build assets are included to the Reqnroll projects even if these packages are not referenced explicitly (compatibility with v2 and v3.2)

* fix test that requires explicit reqnroll dep
Removed the 'Improvements' section from the changelog.
* Modified the BuildMetadataProvider such that partially defined CI environments result in a default value of "UNKNOWN" for any field that cannot be determined (rather than null). This avoids causing the contructor of the Meta message to throw an exception.

* Update CHANGELOG.md

* made method private

* update CHANGELOG

---------

Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
…t source line for MsTest v4 and TUnit tests (#999)
Removed the 'Improvements' section from the changelog.
* add dummy change

* try fix

* replace .NET infor with dotnet --info in CI

* better fix

* Add null check for SDK before version comparison

* Remove empty lines in CHANGELOG.md

* Fix condition to check SDK version for solution format

* Fix logical operator in NewSolutionCommandBuilder
* Add error code to the list of codes to be ignored.

* CHANGELOG
* Fix 1013: DisablefriendlyNames doesn't work in Reqnroll 3.3.2
v3.3.2 generates a callerLineNumber attribute into the constructor call of the TestMethod attribute. This caused an interaction bug with the V2 base class which assumed that the first item in the list of arguments was the display name.
Fixed by specifically searching the argument list for the item that is the DisplayName property.
This further exposed that the V2/V3 generator assumed that the display name was constructor argument, not a Property.
The V4 generator had no unit tests, so refactored the V2 tests to run the same suite for both versions.

* Refactoring to isolate, by MsTest version, how to obtain the DisplayName from the TestMethod attribute declaration.
* Add docco warning against resolving ScenarioContext here

A cautionary tale - if you attempt to resolve the `ScenarioContext`
from this event, then it won't have been created/initialised by the
`ContextManager` yet.  That means that the DI container attempts
to create it during resolution.

If that happens, you'll encounter an object container exception,
because the container in-turn tries to resolve a `RuleInfo`
instance, which also has yet to be added to the container.
Because `RuleInfo` has ctor params which include primitives
(strings), this throws because the container doesn't permit the
resolution of primitives (for good reason).

I suspect that this came about because of the changes made
here:
* This PR: #454
* Particularly this comment:  #454 (review)

I think it's most likely that it was never intended for a plugin to
attempt to resolve `ScenarioContext` from this position; the fact
that it had worked before the addition of `RuleInfo` is likely a
coincidence.  So, I think that this docco is a useful addition, to
warn future plugin-authors away from doing something naughty,
which could take a while to diagnose.

* Fix typo in end-tag

* Update Reqnroll/Plugins/RuntimePluginEvents.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Reqnroll/Plugins/RuntimePluginEvents.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…1006)

* Wrap calls to .GetCustomAttributes in try/catch in order to resiliently handle loading errors while reflecting during binding discovery.

* Add comment about the error handling way

Handle exceptions during type attribute loading and return false to prevent further error reporting.

* Update CHANGELOG

Added improvement to binding discovery and updated contributors.

---------

Co-authored-by: Gáspár Nagy <gaspar.nagy@gmail.com>
Updated sponsor name from 'LambdaTest' to 'TestMu AI (formerly LambdaTest)' and adjusted copyright year.
Copilot AI and others added 4 commits February 17, 2026 21:58
Co-authored-by: 304NotModified <5808377+304NotModified@users.noreply.github.com>
…n plugin

Co-authored-by: 304NotModified <5808377+304NotModified@users.noreply.github.com>
Co-authored-by: 304NotModified <5808377+304NotModified@users.noreply.github.com>
Copilot AI changed the title [WIP] Add READMEs and XML documentation to all NuGet packages Resolve merge conflicts after main branch package metadata refactoring Feb 17, 2026
Copilot AI requested a review from 304NotModified February 17, 2026 22:08
@304NotModified 304NotModified marked this pull request as ready for review February 18, 2026 02:56
@304NotModified 304NotModified merged commit 7898c90 into package-readmes Feb 18, 2026
@304NotModified 304NotModified deleted the copilot/sub-pr-844-again branch February 18, 2026 02:56
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.