Skip to content

Fixed typo #931

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
JakeGinnivan merged 1 commit into from
Jul 10, 2016
Merged

Fixed typo #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/GitVersionTask.Tests/InvalidFileCheckerTests.cs
View file
Open in desktop
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 All @@ -76,7 +76,7 @@ public void VerifyUnformattedAttributeFoundCSharp([Values("AssemblyVersion", "As
}

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 Expand Up @@ -146,7 +146,7 @@ Imports System.Reflection
}

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

[Test]
Expand All @@ -164,7 +164,7 @@ Imports System.Reflection
}

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

[Test]
Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionTask/InvalidFileChecker.cs
View file
Open in desktop
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 All @@ -33,7 +33,7 @@ static bool FileContainsVersionAttribute(string compileFile, string projectFile)
return languageSpecificFileContainsVersionAttribute(compileFile, projectFile);
}

throw new WarningException("File with name containing AssemblyInfo could not be checked for assembly version attributes with conflict with the attributes generated by GitVersion " + compileFile);
throw new WarningException("File with name containing AssemblyInfo could not be checked for assembly version attributes which conflict with the attributes generated by GitVersion " + compileFile);
}

static bool CSharpFileContainsVersionAttribute(string compileFile, string projectFile)
Expand Down