WIP
This commit is contained in:
Justin Goshi
parent
82d80f0da0
commit
e17c44eddd
2 changed files with 234 additions and 38 deletions
|
|
@ -809,50 +809,243 @@ namespace Microsoft.DotNet.Internal.ProjectModel
|
||||||
|
|
||||||
private static void AddProjectFilesCollectionDiagnostics(JObject rawProject, Project project)
|
private static void AddProjectFilesCollectionDiagnostics(JObject rawProject, Project project)
|
||||||
{
|
{
|
||||||
var compileWarning = "'compile' in 'buildOptions'";
|
ConvertDeprecatedCompileOptions(rawProject, project);
|
||||||
AddDiagnosticMesage(rawProject, project, "compile", compileWarning);
|
ConvertDeprecatedContentOptions(rawProject, project);
|
||||||
AddDiagnosticMesage(rawProject, project, "compileExclude", compileWarning);
|
ConvertDeprecatedResourceOptions(rawProject, project);
|
||||||
AddDiagnosticMesage(rawProject, project, "compileFiles", compileWarning);
|
|
||||||
AddDiagnosticMesage(rawProject, project, "compileBuiltIn", compileWarning);
|
|
||||||
|
|
||||||
var resourceWarning = "'embed' in 'buildOptions'";
|
ConvertFromDeprecatedFormat(
|
||||||
AddDiagnosticMesage(rawProject, project, "resource", resourceWarning);
|
rawProject,
|
||||||
AddDiagnosticMesage(rawProject, project, "resourceExclude", resourceWarning);
|
project,
|
||||||
AddDiagnosticMesage(rawProject, project, "resourceFiles", resourceWarning);
|
"'files' in 'packOptions'",
|
||||||
AddDiagnosticMesage(rawProject, project, "resourceBuiltIn", resourceWarning);
|
"packInclude",
|
||||||
AddDiagnosticMesage(rawProject, project, "namedResource", resourceWarning);
|
new string[] { "packOptions" },
|
||||||
|
"files");
|
||||||
|
|
||||||
var contentWarning = "'publishOptions' to publish or 'copyToOutput' in 'buildOptions' to copy to build output";
|
ConvertFromDeprecatedFormat(
|
||||||
AddDiagnosticMesage(rawProject, project, "content", contentWarning);
|
rawProject,
|
||||||
AddDiagnosticMesage(rawProject, project, "contentExclude", contentWarning);
|
project,
|
||||||
AddDiagnosticMesage(rawProject, project, "contentFiles", contentWarning);
|
"'publishOptions'",
|
||||||
AddDiagnosticMesage(rawProject, project, "contentBuiltIn", contentWarning);
|
"publishExclude",
|
||||||
|
new string[] { "publishOptions" },
|
||||||
AddDiagnosticMesage(rawProject, project, "packInclude", "'files' in 'packOptions'");
|
"excludeFiles");
|
||||||
AddDiagnosticMesage(rawProject, project, "publishExclude", "'publishOptions'");
|
|
||||||
AddDiagnosticMesage(rawProject, project, "exclude", "'exclude' within 'compile' or 'embed'");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void AddDiagnosticMesage(
|
private static void ConvertDeprecatedCompileOptions(JObject rawProject, Project project)
|
||||||
|
{
|
||||||
|
var compileWarning = "'compile' in 'buildOptions'";
|
||||||
|
var compileObjectHierarchy = new string[] { "buildOptions", "compile" };
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
compileWarning,
|
||||||
|
"compile",
|
||||||
|
compileObjectHierarchy,
|
||||||
|
"includeFiles");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
compileWarning,
|
||||||
|
"compileExclude",
|
||||||
|
compileObjectHierarchy,
|
||||||
|
"excludeFiles");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
compileWarning,
|
||||||
|
"compileFiles",
|
||||||
|
compileObjectHierarchy,
|
||||||
|
"includeFiles");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
compileWarning,
|
||||||
|
"compileBuiltIn",
|
||||||
|
compileObjectHierarchy,
|
||||||
|
"builtIns");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
compileWarning,
|
||||||
|
"exclude",
|
||||||
|
compileObjectHierarchy,
|
||||||
|
"exclude");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ConvertDeprecatedContentOptions(JObject rawProject, Project project)
|
||||||
|
{
|
||||||
|
var contentWarning = "'publishOptions' to publish or 'copyToOutput' in 'buildOptions' to copy to build output";
|
||||||
|
var copyToOutputObjectHierarchy = new string[] { "buildOptions", "copyToOutput" };
|
||||||
|
var publishObjectHierarchy = new string[] { "publishOptions" };
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
contentWarning,
|
||||||
|
"content",
|
||||||
|
copyToOutputObjectHierarchy,
|
||||||
|
"includeFiles");
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
contentWarning,
|
||||||
|
"content",
|
||||||
|
publishObjectHierarchy,
|
||||||
|
"includeFiles");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
contentWarning,
|
||||||
|
"contentExclude",
|
||||||
|
copyToOutputObjectHierarchy,
|
||||||
|
"excludeFiles");
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
contentWarning,
|
||||||
|
"contentExclude",
|
||||||
|
publishObjectHierarchy,
|
||||||
|
"excludeFiles");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
contentWarning,
|
||||||
|
"contentFiles",
|
||||||
|
copyToOutputObjectHierarchy,
|
||||||
|
"includeFiles");
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
contentWarning,
|
||||||
|
"contentFiles",
|
||||||
|
publishObjectHierarchy,
|
||||||
|
"includeFiles");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
contentWarning,
|
||||||
|
"contentFiles",
|
||||||
|
copyToOutputObjectHierarchy,
|
||||||
|
"contentBuiltIn");
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
contentWarning,
|
||||||
|
"contentBuiltIn",
|
||||||
|
publishObjectHierarchy,
|
||||||
|
"builtIns");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ConvertDeprecatedResourceOptions(JObject rawProject, Project project)
|
||||||
|
{
|
||||||
|
var resourceWarning = "'embed' in 'buildOptions'";
|
||||||
|
var embedObjectHierarchy = new string[] { "buildOptions", "embed" };
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
resourceWarning,
|
||||||
|
"resource",
|
||||||
|
embedObjectHierarchy,
|
||||||
|
"includeFiles");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
resourceWarning,
|
||||||
|
"resourceExclude",
|
||||||
|
embedObjectHierarchy,
|
||||||
|
"excludeFiles");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
resourceWarning,
|
||||||
|
"resourceFiles",
|
||||||
|
embedObjectHierarchy,
|
||||||
|
"includeFiles");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
resourceWarning,
|
||||||
|
"resourceBuiltIn",
|
||||||
|
embedObjectHierarchy,
|
||||||
|
"builtIns");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
resourceWarning,
|
||||||
|
"namedResource",
|
||||||
|
embedObjectHierarchy,
|
||||||
|
"mappings");
|
||||||
|
|
||||||
|
ConvertFromDeprecatedFormat(
|
||||||
|
rawProject,
|
||||||
|
project,
|
||||||
|
resourceWarning,
|
||||||
|
"exclude",
|
||||||
|
embedObjectHierarchy,
|
||||||
|
"exclude");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ConvertFromDeprecatedFormat(
|
||||||
JObject rawProject,
|
JObject rawProject,
|
||||||
Project project,
|
Project project,
|
||||||
string option,
|
string message,
|
||||||
string message)
|
string deprecatedKey,
|
||||||
|
string[] newKeyObjectHierarchy,
|
||||||
|
string newKey
|
||||||
|
)
|
||||||
{
|
{
|
||||||
var lineInfo = rawProject.Value<IJsonLineInfo>(option);
|
var deprecatedValue = rawProject.Value<IJsonLineInfo>(deprecatedKey);
|
||||||
if (lineInfo == null)
|
if (deprecatedValue != null)
|
||||||
{
|
{
|
||||||
return;
|
var currentObject = rawProject;
|
||||||
}
|
foreach (var key in newKeyObjectHierarchy)
|
||||||
|
{
|
||||||
|
var childObject = currentObject.Value<JToken>(key) as JObject;
|
||||||
|
if (childObject == null)
|
||||||
|
{
|
||||||
|
childObject = new JObject();
|
||||||
|
currentObject[key] = childObject;
|
||||||
|
}
|
||||||
|
|
||||||
project.Diagnostics.Add(
|
currentObject = childObject;
|
||||||
new DiagnosticMessage(
|
}
|
||||||
ErrorCodes.DOTNET1015,
|
|
||||||
$"The '{option}' option is deprecated. Use {message} instead.",
|
if (deprecatedValue is JObject)
|
||||||
project.ProjectFilePath,
|
{
|
||||||
DiagnosticMessageSeverity.Warning,
|
currentObject[newKey] = (deprecatedValue as JObject).DeepClone();
|
||||||
lineInfo.LineNumber,
|
//(currentObject[newKey] as JObject).Merge((deprecatedValue as JObject).DeepClone(), new JsonMergeSettings
|
||||||
lineInfo.LinePosition));
|
//{
|
||||||
|
// // union array values together to avoid duplicates
|
||||||
|
// MergeArrayHandling = MergeArrayHandling.Union
|
||||||
|
//});
|
||||||
|
}
|
||||||
|
else if (deprecatedValue is JToken)
|
||||||
|
{
|
||||||
|
currentObject[newKey] = (deprecatedValue as JToken).DeepClone();
|
||||||
|
//JToken.FromObject(x.Concat(x))
|
||||||
|
}
|
||||||
|
|
||||||
|
project.Diagnostics.Add(
|
||||||
|
new DiagnosticMessage(
|
||||||
|
ErrorCodes.DOTNET1015,
|
||||||
|
$"The '{deprecatedKey}' option is deprecated. Use {message} instead.",
|
||||||
|
project.ProjectFilePath,
|
||||||
|
DiagnosticMessageSeverity.Warning,
|
||||||
|
deprecatedValue.LineNumber,
|
||||||
|
deprecatedValue.LinePosition));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool TryGetStringEnumerable(JToken token, out IEnumerable<string> result)
|
private static bool TryGetStringEnumerable(JToken token, out IEnumerable<string> result)
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ using Microsoft.Build.Construction;
|
||||||
using Microsoft.DotNet.Internal.ProjectModel;
|
using Microsoft.DotNet.Internal.ProjectModel;
|
||||||
using Microsoft.DotNet.Internal.ProjectModel.Graph;
|
using Microsoft.DotNet.Internal.ProjectModel.Graph;
|
||||||
using Microsoft.DotNet.Cli;
|
using Microsoft.DotNet.Cli;
|
||||||
|
using Microsoft.DotNet.Cli.Utils;
|
||||||
using Microsoft.DotNet.Cli.Utils.ExceptionExtensions;
|
using Microsoft.DotNet.Cli.Utils.ExceptionExtensions;
|
||||||
using Microsoft.DotNet.Cli.Sln.Internal;
|
using Microsoft.DotNet.Cli.Sln.Internal;
|
||||||
using Microsoft.DotNet.ProjectJsonMigration.Rules;
|
using Microsoft.DotNet.ProjectJsonMigration.Rules;
|
||||||
|
|
@ -251,9 +252,11 @@ namespace Microsoft.DotNet.ProjectJsonMigration
|
||||||
var diagnostics = defaultProjectContext.ProjectFile.Diagnostics;
|
var diagnostics = defaultProjectContext.ProjectFile.Diagnostics;
|
||||||
if (diagnostics.Any())
|
if (diagnostics.Any())
|
||||||
{
|
{
|
||||||
MigrationErrorCodes.MIGRATE1011(
|
var deprecatedProjectJsonWarnings = string.Join(
|
||||||
String.Format("{0}{1}{2}", projectDirectory, Environment.NewLine, string.Join(Environment.NewLine, diagnostics.Select(d => FormatDiagnosticMessage(d)))))
|
Environment.NewLine,
|
||||||
.Throw();
|
diagnostics.Select(d => FormatDiagnosticMessage(d)));
|
||||||
|
var warnings = $"{projectDirectory}{Environment.NewLine}{deprecatedProjectJsonWarnings}";
|
||||||
|
Reporter.Output.WriteLine(warnings.Yellow());
|
||||||
}
|
}
|
||||||
|
|
||||||
var compilerName =
|
var compilerName =
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue