mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Added missed warnings for deprecated schema

Browse source
This commit is contained in:
Ajay Bhargav Baaskaran 2016-04-30 19:09:43 -07:00
parent c907d52451
commit a4487db949
2 changed files with 84 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/Microsoft.DotNet.ProjectModel/ProjectReader.cs
View file

@ -157,6 +157,7 @@ namespace Microsoft.DotNet.ProjectModel
// Project files // Project files
project.Files = new ProjectFilesCollection(rawProject, project.ProjectDirectory, project.ProjectFilePath); project.Files = new ProjectFilesCollection(rawProject, project.ProjectDirectory, project.ProjectFilePath);
AddProjectFilesCollectionDiagnostics(rawProject, project);
var commands = rawProject.Value<JToken>("commands") as JObject; var commands = rawProject.Value<JToken>("commands") as JObject;
if (commands != null) if (commands != null)
@ -410,7 +411,7 @@ namespace Microsoft.DotNet.ProjectModel
if (!success) if (!success)
{ {
var lineInfo = (IJsonLineInfo)framework.Value; var lineInfo = (IJsonLineInfo)framework.Value;
project.Diagnostics?.Add( project.Diagnostics.Add(
new DiagnosticMessage( new DiagnosticMessage(
ErrorCodes.NU1008, ErrorCodes.NU1008,
$"\"{framework.Key}\" is an unsupported framework.", $"\"{framework.Key}\" is an unsupported framework.",
@ -509,7 +510,7 @@ namespace Microsoft.DotNet.ProjectModel
if (compilerName != null) if (compilerName != null)
{ {
var lineInfo = rawObject.Value<IJsonLineInfo>("compilerName"); var lineInfo = rawObject.Value<IJsonLineInfo>("compilerName");
project.Diagnostics?.Add( project.Diagnostics.Add(
new DiagnosticMessage( new DiagnosticMessage(
ErrorCodes.DOTNET1016, ErrorCodes.DOTNET1016,
$"The 'compilerName' option in the root is deprecated. Use it in 'buildOptions' instead.", $"The 'compilerName' option in the root is deprecated. Use it in 'buildOptions' instead.",
@ -533,7 +534,7 @@ namespace Microsoft.DotNet.ProjectModel
var lineInfo = (IJsonLineInfo)rawOptions; var lineInfo = (IJsonLineInfo)rawOptions;
project.Diagnostics?.Add( project.Diagnostics.Add(
new DiagnosticMessage( new DiagnosticMessage(
ErrorCodes.DOTNET1015, ErrorCodes.DOTNET1015,
$"The 'compilationOptions' option is deprecated. Use 'buildOptions' instead.", $"The 'compilationOptions' option is deprecated. Use 'buildOptions' instead.",
@ -678,7 +679,7 @@ namespace Microsoft.DotNet.ProjectModel
if (rawProject.GetValue(option) != null) if (rawProject.GetValue(option) != null)
{ {
var lineInfo = rawProject.Value<IJsonLineInfo>(option); var lineInfo = rawProject.Value<IJsonLineInfo>(option);
project.Diagnostics?.Add( project.Diagnostics.Add(
new DiagnosticMessage( new DiagnosticMessage(
ErrorCodes.DOTNET1016, ErrorCodes.DOTNET1016,
$"The '{option}' option in the root is deprecated. Use it in 'packOptions' instead.", $"The '{option}' option in the root is deprecated. Use it in 'packOptions' instead.",
@ -766,5 +767,53 @@ namespace Microsoft.DotNet.ProjectModel
return File.Exists(projectPath); return File.Exists(projectPath);
} }
private static void AddProjectFilesCollectionDiagnostics(JObject rawProject, Project project)
{
var compileWarning = "'compile' in 'buildOptions'";
AddDiagnosticMesage(rawProject, project, "compile", compileWarning);
AddDiagnosticMesage(rawProject, project, "compileExclude", compileWarning);
AddDiagnosticMesage(rawProject, project, "compileFiles", compileWarning);
AddDiagnosticMesage(rawProject, project, "compileBuiltIn", compileWarning);
var resourceWarning = "'embed' in 'buildOptions'";
AddDiagnosticMesage(rawProject, project, "resource", resourceWarning);
AddDiagnosticMesage(rawProject, project, "resourceExclude", resourceWarning);
AddDiagnosticMesage(rawProject, project, "resourceFiles", resourceWarning);
AddDiagnosticMesage(rawProject, project, "resourceBuiltIn", resourceWarning);
AddDiagnosticMesage(rawProject, project, "namedResource", resourceWarning);
var contentWarning = "'publishOptions' to publish or 'copyToOutput' in 'buildOptions' to copy to build output";
AddDiagnosticMesage(rawProject, project, "content", contentWarning);
AddDiagnosticMesage(rawProject, project, "contentExclude", contentWarning);
AddDiagnosticMesage(rawProject, project, "contentFiles", contentWarning);
AddDiagnosticMesage(rawProject, project, "contentBuiltIn", contentWarning);
AddDiagnosticMesage(rawProject, project, "packInclude", "'files' in 'packOptions'");
AddDiagnosticMesage(rawProject, project, "publishExclude", "'publishOptions'");
AddDiagnosticMesage(rawProject, project, "exclude", "'exclude' within 'compile' or 'embed'");
}
private static void AddDiagnosticMesage(
JObject rawProject,
Project project,
string option,
string message)
{
var lineInfo = rawProject.Value<IJsonLineInfo>(option);
if (lineInfo == null)
{
return;
}
project.Diagnostics.Add(
new DiagnosticMessage(
ErrorCodes.DOTNET1015,
$"The '{option}' option is deprecated. Use {message} instead.",
project.ProjectFilePath,
DiagnosticMessageSeverity.Warning,
lineInfo.LineNumber,
lineInfo.LinePosition));
}
} }
} }

32
test/Microsoft.DotNet.ProjectModel.Tests/GivenThatIWantToLoadAProjectJsonFile.cs
View file

@ -293,10 +293,15 @@ namespace Microsoft.DotNet.ProjectModel.Tests
json.Add("compilerName", "some compiler"); json.Add("compilerName", "some compiler");
json.Add("compilationOptions", new JObject()); json.Add("compilationOptions", new JObject());
json.Add("projectUrl", "some project url"); json.Add("projectUrl", "some project url");
json.Add("compile", "something");
json.Add("resource", "something");
json.Add("content", "something");
json.Add("packInclude", "something");
json.Add("publishExclude", "something");
var project = GetProject(json); var project = GetProject(json);
project.Diagnostics.Should().HaveCount(3); project.Diagnostics.Should().HaveCount(8);
project.Diagnostics.Should().Contain(m => project.Diagnostics.Should().Contain(m =>
m.ErrorCode == ErrorCodes.DOTNET1015 && m.ErrorCode == ErrorCodes.DOTNET1015 &&
@ -312,6 +317,31 @@ namespace Microsoft.DotNet.ProjectModel.Tests
m.ErrorCode == ErrorCodes.DOTNET1016 && m.ErrorCode == ErrorCodes.DOTNET1016 &&
m.Severity == DiagnosticMessageSeverity.Warning && m.Severity == DiagnosticMessageSeverity.Warning &&
m.Message == "The 'compilerName' option in the root is deprecated. Use it in 'buildOptions' instead."); m.Message == "The 'compilerName' option in the root is deprecated. Use it in 'buildOptions' instead.");
project.Diagnostics.Should().Contain(m =>
m.ErrorCode == ErrorCodes.DOTNET1015 &&
m.Severity == DiagnosticMessageSeverity.Warning &&
m.Message == "The 'compile' option is deprecated. Use 'compile' in 'buildOptions' instead.");
project.Diagnostics.Should().Contain(m =>
m.ErrorCode == ErrorCodes.DOTNET1015 &&
m.Severity == DiagnosticMessageSeverity.Warning &&
m.Message == "The 'resource' option is deprecated. Use 'embed' in 'buildOptions' instead.");
project.Diagnostics.Should().Contain(m =>
m.ErrorCode == ErrorCodes.DOTNET1015 &&
m.Severity == DiagnosticMessageSeverity.Warning &&
m.Message == "The 'content' option is deprecated. Use 'publishOptions' to publish or 'copyToOutput' in 'buildOptions' to copy to build output instead.");
project.Diagnostics.Should().Contain(m =>
m.ErrorCode == ErrorCodes.DOTNET1015 &&
m.Severity == DiagnosticMessageSeverity.Warning &&
m.Message == "The 'packInclude' option is deprecated. Use 'files' in 'packOptions' instead.");
project.Diagnostics.Should().Contain(m =>
m.ErrorCode == ErrorCodes.DOTNET1015 &&
m.Severity == DiagnosticMessageSeverity.Warning &&
m.Message == "The 'publishExclude' option is deprecated. Use 'publishOptions' instead.");
} }
[Fact] [Fact]