Skip to content

Backport PR#4224 onto v3.13.x (Add .NET7 as a build target for the test suite) - #4302

Merged
stevenaw merged 2 commits into
v3.13-devfrom
backport-4170
Mar 23, 2023
Merged

Backport PR#4224 onto v3.13.x (Add .NET7 as a build target for the test suite)#4302
stevenaw merged 2 commits into
v3.13-devfrom
backport-4170

Conversation

@stevenaw

Copy link
Copy Markdown
Member

Fixes #4170
Backports the fix from PR #4224 onto the v3.13 branch

BUILDING.md was omitted as the file in the 3.13 branch doesn't contain the directory output. The Github Actions yaml file had a few minor updates applied by me in a subsequent commit to make it consistent with other recent changes in that file (setup emoji and targeting @3 of the setup-dotnet action)

KonH and others added 2 commits February 26, 2023 14:06
* Initial changes to support .NET 7 RC - #4170

Mostly based on 6cbe01e

* NuGet packaging changes to support .NET 7 RC - #4170

Based on 6cbe01e

* Continuous integration changes to support .NET 7 RC - #4170

Based on 6cbe01e

* Try to fix .NET 7.0 lookup on Azure Pipelines - #4170

* It looks like we need both .NET 6.0 and .NET 7.0 to run tests on Azure Pipelines - #4170

* Use valid version for .NET 6.0 on Azure Pipelines - #4170

* Use different test settings for .NET 7 to cover corner-case - #4170

* Add potential workaround for flaky test behaviour on .NET 7 - #4170

* On MacOS test behaviour is different on .NET 7 - #4170

* Change setup-dotnet action version (for new lines only)

#4224 (comment)

* Use release version of .NET 7.0

* Refactor: do not copy collections, use single method

* Temporary increase test timeout

* Temporary increase test timeout #2

@OsirisTerje OsirisTerje left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@OsirisTerje

Copy link
Copy Markdown
Member

@stevenaw Merge at will :-)

@stevenaw
stevenaw merged commit a1fef50 into v3.13-dev Mar 23, 2023
@stevenaw
stevenaw deleted the backport-4170 branch March 23, 2023 00:14
@stevenaw

Copy link
Copy Markdown
Member Author

Thanks for the review @OsirisTerje , appreciate it :)

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