Skip to content

Commit ffd3e45

Browse files
SimaTianCopilot
andcommitted
Add TaskEnvironment to ProduceContentAssets tests
ProduceContentAssets now uses TaskEnvironment.GetAbsolutePath() in ProduceContentAsset(). All 4 behavioral tests must provide TaskEnvironment. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 9e0fc69 commit ffd3e45

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAttributeOnlyTasksGroup6.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ public void ProduceContentAssets_WithCompileAsset_ProducesContentItem()
336336
var task = new ProduceContentAssets
337337
{
338338
BuildEngine = new MockBuildEngine(),
339+
TaskEnvironment = TaskEnvironmentHelper.CreateForTest(),
339340
ContentFileDependencies = new ITaskItem[] { contentFile },
340341
ProjectLanguage = "C#"
341342
};
@@ -364,6 +365,7 @@ public void ProduceContentAssets_WithNoneBuildAction_ProducesNoContentItem()
364365
var task = new ProduceContentAssets
365366
{
366367
BuildEngine = new MockBuildEngine(),
368+
TaskEnvironment = TaskEnvironmentHelper.CreateForTest(),
367369
ContentFileDependencies = new ITaskItem[] { contentFile },
368370
ProjectLanguage = "C#"
369371
};
@@ -392,6 +394,7 @@ public void ProduceContentAssets_WithCopyToOutput_ProducesCopyLocalItem()
392394
var task = new ProduceContentAssets
393395
{
394396
BuildEngine = new MockBuildEngine(),
397+
TaskEnvironment = TaskEnvironmentHelper.CreateForTest(),
395398
ContentFileDependencies = new ITaskItem[] { contentFile },
396399
ProjectLanguage = "C#"
397400
};
@@ -431,6 +434,7 @@ public void ProduceContentAssets_FiltersLanguageSpecificAssets()
431434
var task = new ProduceContentAssets
432435
{
433436
BuildEngine = new MockBuildEngine(),
437+
TaskEnvironment = TaskEnvironmentHelper.CreateForTest(),
434438
ContentFileDependencies = new ITaskItem[] { csharpFile, vbFile },
435439
ProjectLanguage = "C#"
436440
};

src/Tasks/Microsoft.NET.Build.Tasks/RunCsWinRTGenerator.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,7 @@ protected override string GenerateResponseFileCommands()
211211
{
212212
StringBuilder args = new();
213213

214-
<<<<<<< Updated upstream
215214
IEnumerable<string> referenceAssemblyPaths = ReferenceAssemblyPaths!.Select(static path => path.ItemSpec);
216-
=======
217-
IEnumerable<string> referenceAssemblyPaths = ReferenceAssemblyPaths!.Select(path => (string)TaskEnvironment.GetAbsolutePath(path.ItemSpec));
218-
>>>>>>> Stashed changes
219215
string referenceAssemblyPathsArg = string.Join(",", referenceAssemblyPaths);
220216

221217
AppendResponseFileCommand(args, "--reference-assembly-paths", referenceAssemblyPathsArg);

0 commit comments

Comments
 (0)