Skip to content

Return false if there are no sources #9208

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 27, 2023
Merged

Return false if there are no sources #9208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60c10f6
return false if there are sources
JaynieBai Sep 7, 2023
c47f029
Remove uncessary blank line
JaynieBai Sep 7, 2023
8ccb4f6
Update the test ouput
JaynieBai Sep 7, 2023
11ef5b9
Update the comment
JaynieBai Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions src/Tasks.UnitTests/ResourceHandling/GenerateResource_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
using Microsoft.Build.Tasks;
using Microsoft.Build.UnitTests.Shared;
using Microsoft.Build.Utilities;
using Shouldly;
using Xunit;
Expand Down Expand Up @@ -338,7 +339,7 @@ public void ForceOutOfDate()
/* Unmerged change from project 'Microsoft.Build.Tasks.UnitTests (net7.0)'
Before:
Utilities.AssertLogContainsResource(t, "GenerateResource.OutputDoesntExist", t.OutputResources[0].ItemSpec);

Utilities.AssertStateFileWasWritten(t);
After:
Utilities.AssertLogContainsResource(t, "GenerateResource.OutputDoesntExist", t.OutputResources[0].ItemSpec);
Expand Down Expand Up @@ -1718,7 +1719,7 @@ public void FailedResXReader()
/* Unmerged change from project 'Microsoft.Build.Tasks.UnitTests (net7.0)'
Before:
Assert.False(success);

Utilities.AssertStateFileWasWritten(t);
After:
Assert.False(success);
Expand Down Expand Up @@ -1797,7 +1798,7 @@ public void FailedResXReaderWithAllOutputResourcesSpecified()
/* Unmerged change from project 'Microsoft.Build.Tasks.UnitTests (net7.0)'
Before:
Assert.False(success);

Utilities.AssertStateFileWasWritten(t);
After:
Assert.False(success);
Expand Down Expand Up @@ -2317,7 +2318,7 @@ public void OutputFilesPartialInputs()
/* Unmerged change from project 'Microsoft.Build.Tasks.UnitTests (net7.0)'
Before:
Assert.Equal(t.FilesWritten[2].ItemSpec, Path.ChangeExtension(t.Sources[3].ItemSpec, ".resources"));

Utilities.AssertStateFileWasWritten(t);
After:
Assert.Equal(t.FilesWritten[2].ItemSpec, Path.ChangeExtension(t.Sources[3].ItemSpec, ".resources"));
Expand Down Expand Up @@ -3653,6 +3654,20 @@ GenerateResource ExecuteTask()
Utilities.FileUpdated(resourcesFile, initialWriteTime).ShouldBeFalse();
}
}

/// <summary>
/// https://github.com/dotnet/msbuild/issues/9199
/// </summary>
[Fact]
public void NotValidSources()
{
GenerateResource t = new GenerateResource { BuildEngine = new MockEngine(_output) };
t.Sources = new ITaskItem[] { new TaskItem("non-existent") };
t.OutputResources = new ITaskItem[] { new TaskItem("out") };
Assert.False(t.Execute());
((MockEngine)t.BuildEngine).AssertLogContains("MSB3552");
Assert.Equal(1, ((MockEngine)t.BuildEngine).Errors);
}
}
}

Expand Down
18 changes: 13 additions & 5 deletions src/Tasks/GenerateResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,14 +714,22 @@ public override bool Execute()

GetResourcesToProcess(out inputsToProcess, out outputsToProcess, out cachedOutputFiles);

if (inputsToProcess.Count == 0 && !Log.HasLoggedErrors)
if (inputsToProcess.Count == 0)
{
if (cachedOutputFiles.Count > 0)
if (!Log.HasLoggedErrors)
{
OutputResources = cachedOutputFiles.ToArray();
}
if (cachedOutputFiles.Count > 0)
{
OutputResources = cachedOutputFiles.ToArray();
}

Log.LogMessageFromResources("GenerateResource.NothingOutOfDate");
Log.LogMessageFromResources("GenerateResource.NothingOutOfDate");
}
else
{
// No valid sources found--failures should have been logged in GetResourcesToProcess
return false;
}
}
else if (FailIfNotIncremental)
{
Expand Down