Merge branch 'release/2.1' into dev
This commit is contained in:
commit
4c01f4d20f
|
|
@ -45,6 +45,12 @@ namespace Microsoft.AspNetCore.Razor.Tasks
|
||||||
|
|
||||||
protected override bool ValidateParameters()
|
protected override bool ValidateParameters()
|
||||||
{
|
{
|
||||||
|
if (!Directory.Exists(ProjectRoot))
|
||||||
|
{
|
||||||
|
Log.LogError("The specified project root directory {0} doesn't exist.", ProjectRoot);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (Configuration.Length == 0)
|
if (Configuration.Length == 0)
|
||||||
{
|
{
|
||||||
Log.LogError("The project {0} must provide a value for {1}.", ProjectRoot, nameof(Configuration));
|
Log.LogError("The project {0} must provide a value for {1}.", ProjectRoot, nameof(Configuration));
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,42 @@ namespace Microsoft.AspNetCore.Razor.Tasks
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override bool ValidateParameters()
|
||||||
|
{
|
||||||
|
if (!Directory.Exists(ProjectRoot))
|
||||||
|
{
|
||||||
|
Log.LogError("The specified project root directory {0} doesn't exist.", ProjectRoot);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Configuration.Length == 0)
|
||||||
|
{
|
||||||
|
Log.LogError("The project {0} must provide a value for {1}.", ProjectRoot, nameof(Configuration));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < Assemblies.Length; i++)
|
||||||
|
{
|
||||||
|
if (!Path.IsPathRooted(Assemblies[i]))
|
||||||
|
{
|
||||||
|
Log.LogError("The assembly path {0} is invalid. Assembly paths must be rooted.", Assemblies[i]);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < Extensions.Length; i++)
|
||||||
|
{
|
||||||
|
if (!EnsureRequiredMetadata(Extensions[i], Identity) ||
|
||||||
|
!EnsureRequiredMetadata(Extensions[i], AssemblyName) ||
|
||||||
|
!EnsureRequiredMetadata(Extensions[i], AssemblyFilePath))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return base.ValidateParameters();
|
||||||
|
}
|
||||||
|
|
||||||
protected override string GenerateResponseFileCommands()
|
protected override string GenerateResponseFileCommands()
|
||||||
{
|
{
|
||||||
var builder = new StringBuilder();
|
var builder = new StringBuilder();
|
||||||
|
|
@ -81,5 +117,17 @@ namespace Microsoft.AspNetCore.Razor.Tasks
|
||||||
|
|
||||||
return builder.ToString();
|
return builder.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool EnsureRequiredMetadata(ITaskItem item, string metadataName)
|
||||||
|
{
|
||||||
|
var value = item.GetMetadata(metadataName);
|
||||||
|
if (string.IsNullOrEmpty(value))
|
||||||
|
{
|
||||||
|
Log.LogError($"Missing required metadata '{metadataName}' for '{item.ItemSpec}.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue