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

Update message sequences of ProjectModel server

Browse source 
Send References ahead of Dependencies
This commit is contained in:
Troy Dai 2016-01-14 16:24:59 -08:00
parent cc54048e74
commit 479a81a576
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Microsoft.DotNet.ProjectModel.Server/ProjectManager.cs
View file

@ -55,9 +55,9 @@ namespace Microsoft.DotNet.ProjectModel.Server
_messengers = new List<Messenger<ProjectContextSnapshot>> _messengers = new List<Messenger<ProjectContextSnapshot>>
{ {
new DependencyDiagnosticsMessenger(Transmit), new DependencyDiagnosticsMessenger(Transmit),
new ReferencesMessenger(Transmit),
new DependenciesMessenger(Transmit), new DependenciesMessenger(Transmit),
new CompilerOptionsMessenger(Transmit), new CompilerOptionsMessenger(Transmit),
new ReferencesMessenger(Transmit),
new SourcesMessenger(Transmit) new SourcesMessenger(Transmit)
}; };

42
test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTests.cs
View file

@ -100,27 +100,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
{ {
client.Initialize(projectPath); client.Initialize(projectPath);
var unresolveDependency = client.DrainTillFirst("Dependencies") var referencesMessage = client.DrainTillFirst(MessageTypes.References, TimeSpan.FromDays(1))
.EnsureSource(server, client)
.RetrieveDependency(expectedUnresolvedDependency);
unresolveDependency.AssertProperty("Name", expectedUnresolvedDependency)
.AssertProperty("DisplayName", expectedUnresolvedDependency)
.AssertProperty("Resolved", false)
.AssertProperty("Type", expectedUnresolvedType);
if (expectedUnresolvedType == "Project")
{
unresolveDependency.AssertProperty("Path", Path.Combine(Path.GetDirectoryName(projectPath),
expectedUnresolvedDependency,
Project.FileName));
}
else
{
Assert.False(unresolveDependency["Path"].HasValues);
}
var referencesMessage = client.DrainTillFirst("References", TimeSpan.FromDays(1))
.EnsureSource(server, client); .EnsureSource(server, client);
if (referenceType == "Project") if (referenceType == "Project")
@ -143,6 +123,26 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
.RetrievePropertyAs<JArray>("ProjectReferences") .RetrievePropertyAs<JArray>("ProjectReferences")
.AssertJArrayCount(0); .AssertJArrayCount(0);
} }
var unresolveDependency = client.DrainTillFirst(MessageTypes.Dependencies)
.EnsureSource(server, client)
.RetrieveDependency(expectedUnresolvedDependency);
unresolveDependency.AssertProperty("Name", expectedUnresolvedDependency)
.AssertProperty("DisplayName", expectedUnresolvedDependency)
.AssertProperty("Resolved", false)
.AssertProperty("Type", expectedUnresolvedType);
if (expectedUnresolvedType == "Project")
{
unresolveDependency.AssertProperty("Path", Path.Combine(Path.GetDirectoryName(projectPath),
expectedUnresolvedDependency,
Project.FileName));
}
else
{
Assert.False(unresolveDependency["Path"].HasValues);
}
} }
} }