Skip to content

Merge Roslyn.Test.Utilities.Traits with Microsoft.CodeAnalysis.Test.Utilities.Traits#25643

Merged
sharwell merged 1 commit intodotnet:dev15.7.xfrom
sharwell:merge-traits
Mar 21, 2018
Merged

Merge Roslyn.Test.Utilities.Traits with Microsoft.CodeAnalysis.Test.Utilities.Traits#25643
sharwell merged 1 commit intodotnet:dev15.7.xfrom
sharwell:merge-traits

Conversation

@sharwell
Copy link
Copy Markdown
Contributor

@sharwell sharwell commented Mar 21, 2018 •
edited
Loading

Merge the two Traits classes we use for test classification to avoid name resolution errors. All files are changes to using/Imports except the following:

  • src/EditorFeatures/Test2/EditorServicesTest2.vbproj (new namespace import to match old)
  • src/EditorFeatures/TestUtilities/Traits.cs (removed)
  • src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj (new namespace import to match old)
  • src/Test/Utilities/Portable/Traits/Traits.cs (merged)

Test only change.

@sharwell sharwell added this to the 15.7 milestone Mar 21, 2018
@sharwell sharwell requested review from a team as code owners March 21, 2018 03:17
@sharwell sharwell added the Test Test failures in roslyn-CI label Mar 21, 2018
ivanbasov
ivanbasov approved these changes Mar 21, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@ivanbasov ivanbasov left a comment

Choose a reason for hiding this comment

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

:shipit:

@sharwell sharwell self-assigned this Mar 21, 2018
@sharwell sharwell merged commit e8269dc into dotnet:dev15.7.x Mar 21, 2018
@sharwell sharwell deleted the merge-traits branch March 21, 2018 22:34
@sharwell
Copy link
Copy Markdown
Contributor Author

sharwell commented Mar 21, 2018

@Pilchie merging test only change

This was referenced Mar 23, 2018
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@ivanbasov ivanbasov ivanbasov approved these changes

@jinujoseph jinujoseph jinujoseph approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@sharwell sharwell

Labels

Test Test failures in roslyn-CI

Projects

None yet

Milestone

15.7

Development

Successfully merging this pull request may close these issues.

3 participants

@sharwell @ivanbasov @jinujoseph