-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Migrates unit tests to use RoslynCodeTaskFactory to enable running tests under .NET Core #13500
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.
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
Open
jankratochvilcz
wants to merge
1
commit into
main
Choose a base branch
from
jankratochvilcz/codetaskfactory-fixtures-to-roslyn
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+91
−180
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -690,16 +690,15 @@ public void MSBuildLoadContext_AcceptsNewerAssemblyVersions() | |
| #endif | ||
|
|
||
|
|
||
| #if FEATURE_CODETASKFACTORY | ||
| /// <summary> | ||
| /// If an item being output from a task has null metadata, we shouldn't crash. | ||
| /// If an item being output from an inline task has null metadata, we shouldn't crash. | ||
| /// </summary> | ||
| [Fact] | ||
| public void NullMetadataOnOutputItems_InlineTask() | ||
| { | ||
| string projectContents = @" | ||
| <Project xmlns='msbuildnamespace' ToolsVersion='msbuilddefaulttoolsversion'> | ||
| <UsingTask TaskName=`NullMetadataTask_v12` TaskFactory=`CodeTaskFactory` AssemblyFile=`$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll`> | ||
| <Project> | ||
| <UsingTask TaskName=`NullMetadataTask_Roslyn` TaskFactory=`RoslynCodeTaskFactory` AssemblyFile=`$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll`> | ||
| <ParameterGroup> | ||
| <OutputItems ParameterType=`Microsoft.Build.Framework.ITaskItem[]` Output=`true` /> | ||
| </ParameterGroup> | ||
|
|
@@ -719,9 +718,9 @@ public void NullMetadataOnOutputItems_InlineTask() | |
| </Task> | ||
| </UsingTask> | ||
| <Target Name=`Build`> | ||
| <NullMetadataTask_v12> | ||
| <NullMetadataTask_Roslyn> | ||
| <Output TaskParameter=`OutputItems` ItemName=`Outputs` /> | ||
| </NullMetadataTask_v12> | ||
| </NullMetadataTask_Roslyn> | ||
|
|
||
| <Message Text=`[%(Outputs.Identity): %(Outputs.a)]` Importance=`High` /> | ||
| </Target> | ||
|
|
@@ -731,88 +730,6 @@ public void NullMetadataOnOutputItems_InlineTask() | |
| logger.AssertLogContains("[foo: ]"); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// If an item being output from a task has null metadata, we shouldn't crash. | ||
| /// </summary> | ||
| [Fact(Skip = "This test fails when diagnostic logging is available, as deprecated EscapingUtilities.UnescapeAll method cannot handle null value. This is not relevant to non-deprecated version of this method.")] | ||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Happy to discuss this, I deleted this mostly since I don't see a ticket to bring this back online, let me know what would be a good other action here |
||
| public void NullMetadataOnLegacyOutputItems_InlineTask() | ||
| { | ||
| string projectContents = @" | ||
| <Project xmlns='msbuildnamespace' ToolsVersion='msbuilddefaulttoolsversion'> | ||
| <UsingTask TaskName=`NullMetadataTask_v4` TaskFactory=`CodeTaskFactory` AssemblyFile=`$(MSBuildFrameworkToolsPath)\Microsoft.Build.Tasks.v4.0.dll`> | ||
| <ParameterGroup> | ||
| <OutputItems ParameterType=`Microsoft.Build.Framework.ITaskItem[]` Output=`true` /> | ||
| </ParameterGroup> | ||
| <Task> | ||
| <Code> | ||
| <![CDATA[ | ||
| OutputItems = new ITaskItem[1]; | ||
|
|
||
| IDictionary<string, string> metadata = new Dictionary<string, string>(); | ||
| metadata.Add(`a`, null); | ||
|
|
||
| OutputItems[0] = new TaskItem(`foo`, (IDictionary)metadata); | ||
|
|
||
| return true; | ||
| ]]> | ||
| </Code> | ||
| </Task> | ||
| </UsingTask> | ||
| <Target Name=`Build`> | ||
| <NullMetadataTask_v4> | ||
| <Output TaskParameter=`OutputItems` ItemName=`Outputs` /> | ||
| </NullMetadataTask_v4> | ||
|
|
||
| <Message Text=`[%(Outputs.Identity): %(Outputs.a)]` Importance=`High` /> | ||
| </Target> | ||
| </Project>"; | ||
|
|
||
| MockLogger logger = ObjectModelHelpers.BuildProjectExpectSuccess(projectContents, _testOutput); | ||
| logger.AssertLogContains("[foo: ]"); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// If an item being output from a task has null metadata, we shouldn't crash. | ||
| /// </summary> | ||
| [Fact(Skip = "This test fails when diagnostic logging is available, as deprecated EscapingUtilities.UnescapeAll method cannot handle null value. This is not relevant to non-deprecated version of this method.")] | ||
| [Trait("Category", "non-mono-tests")] | ||
| public void NullMetadataOnLegacyOutputItems_InlineTask_Diagnostic() | ||
| { | ||
| string projectContents = @" | ||
| <Project xmlns='msbuildnamespace' ToolsVersion='msbuilddefaulttoolsversion'> | ||
| <UsingTask TaskName=`NullMetadataTask_v4` TaskFactory=`CodeTaskFactory` AssemblyFile=`$(MSBuildFrameworkToolsPath)\Microsoft.Build.Tasks.v4.0.dll`> | ||
| <ParameterGroup> | ||
| <OutputItems ParameterType=`Microsoft.Build.Framework.ITaskItem[]` Output=`true` /> | ||
| </ParameterGroup> | ||
| <Task> | ||
| <Code> | ||
| <![CDATA[ | ||
| OutputItems = new ITaskItem[1]; | ||
|
|
||
| IDictionary<string, string> metadata = new Dictionary<string, string>(); | ||
| metadata.Add(`a`, null); | ||
|
|
||
| OutputItems[0] = new TaskItem(`foo`, (IDictionary)metadata); | ||
|
|
||
| return true; | ||
| ]]> | ||
| </Code> | ||
| </Task> | ||
| </UsingTask> | ||
| <Target Name=`Build`> | ||
| <NullMetadataTask_v4> | ||
| <Output TaskParameter=`OutputItems` ItemName=`Outputs` /> | ||
| </NullMetadataTask_v4> | ||
|
|
||
| <Message Text=`[%(Outputs.Identity): %(Outputs.a)]` Importance=`High` /> | ||
| </Target> | ||
| </Project>"; | ||
|
|
||
| MockLogger logger = ObjectModelHelpers.BuildProjectExpectSuccess(projectContents, _testOutput, loggerVerbosity: LoggerVerbosity.Diagnostic); | ||
| logger.AssertLogContains("[foo: ]"); | ||
| } | ||
| #endif | ||
|
|
||
| /// <summary> | ||
| /// Validates that the defining project metadata is set (or not set) as expected in | ||
| /// various task output-related operations, using a task built against the current | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be curious about the meaning of "v12" here, it seems a bit arbitrary but there could be some reason I'm not catching.