Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void VerifyAttributeFoundCSharp([Values("AssemblyVersion", "AssemblyFileV
}

var ex = Assert.Throws<WarningException>(() => InvalidFileChecker.CheckForInvalidFiles(new ITaskItem[] { new MockTaskItem { ItemSpec = "AssemblyInfo.cs" } }, projectFile), attribute);
Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes with conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
Assert.That(ex.Message, Is.EqualTo("File contains assembly version attributes which conflict with the attributes generated by GitVersion AssemblyInfo.cs"));
}

[Test]
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionTask/InvalidFileChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public static void CheckForInvalidFiles(IEnumerable<ITaskItem> compileFiles, str
{
foreach (var compileFile in GetInvalidFiles(compileFiles, projectFile))
{
throw new WarningException("File contains assembly version attributes with conflict with the attributes generated by GitVersion " + compileFile);
throw new WarningException("File contains assembly version attributes which conflict with the attributes generated by GitVersion " + compileFile);
}
}

Expand Down