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

Use default version for unresolved MSBuild reference

Browse source
This commit is contained in:
Troy Dai 2016-04-03 22:03:06 -07:00
parent c6eb0fa59a
commit e63c0f82c9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dotnet/commands/dotnet-projectmodel-server/Models/DependencyDescription.cs
View file

@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Microsoft.DotNet.ProjectModel.Compilation; using Microsoft.DotNet.ProjectModel.Compilation;
using Microsoft.DotNet.ProjectModel.Graph; using Microsoft.DotNet.ProjectModel.Graph;
using NuGet.Versioning;
namespace Microsoft.DotNet.ProjectModel.Server.Models namespace Microsoft.DotNet.ProjectModel.Server.Models
{ {
@ -23,7 +24,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Models
public string Type { get; private set; } public string Type { get; private set; }
public bool Resolved { get; private set; } public bool Resolved { get; private set; }
public IEnumerable<DependencyItem> Dependencies { get; private set; } public IEnumerable<DependencyItem> Dependencies { get; private set; }
public IEnumerable<DiagnosticMessageView> Errors { get; private set; } public IEnumerable<DiagnosticMessageView> Errors { get; private set; }
@ -60,7 +61,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Models
{ {
Name = library.Identity.Name, Name = library.Identity.Name,
DisplayName = library.Identity.Name, DisplayName = library.Identity.Name,
Version = library.Identity.Version?.ToNormalizedString(), Version = (library.Identity.Version ?? new NuGetVersion("1.0.0")).ToNormalizedString(),
Type = library.Identity.Type.Value, Type = library.Identity.Type.Value,
Resolved = library.Resolved, Resolved = library.Resolved,
Path = library.Path, Path = library.Path,

3
test/dotnet-projectmodel-server.Tests/DthTests.cs
View file

@ -438,12 +438,13 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
client.Initialize(projectPath); client.Initialize(projectPath);
var messages = client.DrainAllMessages(); var messages = client.DrainAllMessages();
messages.AssertDoesNotContain(MessageTypes.Error); messages.AssertDoesNotContain(MessageTypes.Error);
// PrintAllMessages(new[] { messages.RetrieveSingleMessage(MessageTypes.Dependencies) });
messages.RetrieveSingleMessage(MessageTypes.Dependencies) messages.RetrieveSingleMessage(MessageTypes.Dependencies)
.RetrieveDependency("ClassLibrary4") .RetrieveDependency("ClassLibrary4")
.AssertProperty<object>( .AssertProperty<object>(
"Version", "Version",
v => !string.IsNullOrEmpty(v.ToString()), v => !string.IsNullOrEmpty(v.ToString()),
v => "Version string shouldn't be empty."); v => $"Version string shouldn't be empty. Value [{v.ToString()}]");
} }
} }