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

Fixed a few issues with lock file check

Browse source 
- Normalize version for comparison
- Change dnu restore to dotnet restore in
error message
This commit is contained in:
David Fowler 2015-11-07 02:24:53 -08:00
parent 8ebc1bf9f5
commit b334c8f28c
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Microsoft.DotNet.ProjectModel/Graph/LockFile.cs
View file

@ -98,7 +98,7 @@ namespace Microsoft.Extensions.ProjectModel.Graph
if (range.MinVersion == range.MaxVersion && if (range.MinVersion == range.MaxVersion &&
(range.Float == null || range.Float.FloatBehavior == NuGetVersionFloatBehavior.None)) (range.Float == null || range.Float.FloatBehavior == NuGetVersionFloatBehavior.None))
{ {
return range.MinVersion.ToString(); return range.MinVersion.ToNormalizedString();
} }
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.Append(">= "); sb.Append(">= ");
@ -106,7 +106,7 @@ namespace Microsoft.Extensions.ProjectModel.Graph
{ {
case null: case null:
case NuGetVersionFloatBehavior.None: case NuGetVersionFloatBehavior.None:
sb.Append(range.MinVersion); sb.Append(range.MinVersion.ToNormalizedString());
break; break;
case NuGetVersionFloatBehavior.Prerelease: case NuGetVersionFloatBehavior.Prerelease:
// Work around nuget bug: https://github.com/NuGet/Home/issues/1598 // Work around nuget bug: https://github.com/NuGet/Home/issues/1598

4
src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs
View file

@ -157,7 +157,7 @@ namespace Microsoft.Extensions.ProjectModel
{ {
diagnostics.Add(new DiagnosticMessage( diagnostics.Add(new DiagnosticMessage(
ErrorCodes.NU1009, ErrorCodes.NU1009,
$"The expected lock file doesn't exist. Please run \"dnu restore\" to generate a new lock file.", $"The expected lock file doesn't exist. Please run \"dotnet restore\" to generate a new lock file.",
Path.Combine(Project.ProjectDirectory, LockFile.FileName), Path.Combine(Project.ProjectDirectory, LockFile.FileName),
DiagnosticMessageSeverity.Error)); DiagnosticMessageSeverity.Error));
} }
@ -166,7 +166,7 @@ namespace Microsoft.Extensions.ProjectModel
{ {
diagnostics.Add(new DiagnosticMessage( diagnostics.Add(new DiagnosticMessage(
ErrorCodes.NU1006, ErrorCodes.NU1006,
$"{lockFileValidationMessage}. Please run \"dnu restore\" to generate a new lock file.", $"{lockFileValidationMessage}. Please run \"dotnet restore\" to generate a new lock file.",
Path.Combine(Project.ProjectDirectory, LockFile.FileName), Path.Combine(Project.ProjectDirectory, LockFile.FileName),
DiagnosticMessageSeverity.Warning)); DiagnosticMessageSeverity.Warning));
} }