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

Update parameter names

Browse source
This commit is contained in:
Troy Dai 2016-06-15 14:21:25 -07:00
parent fc370bee6d
commit b3f67b5bef
5 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/ProjectModelServer/DthUpdateSearchPathSample/ext/Newtonsoft.Json/project.json
View file

@ -1,5 +1,5 @@
{ {
"version": "8.0.3", "version": "9.0.1",
"dependencies": { "dependencies": {
}, },
"frameworks": { "frameworks": {

6
TestAssets/ProjectModelServer/DthUpdateSearchPathSample/home/src/MainProject/project.json
View file

@ -1,10 +1,8 @@
{ {
"dependencies": { "dependencies": {
"Newtonsoft.Json": "8.0.3" "Newtonsoft.Json": "9.0.1"
}, },
"frameworks": { "frameworks": {
"netstandard1.5": { "netstandard1.5": {}
"imports": "portable-net45+win8"
}
} }
} }

4
src/dotnet/commands/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs
View file

@ -9,13 +9,13 @@ namespace Microsoft.DotNet.ProjectModel.Server.Helpers
{ {
public static IEnumerable<DiagnosticMessage> Diagnose( public static IEnumerable<DiagnosticMessage> Diagnose(
ProjectContext context, ProjectContext context,
IEnumerable<string> currentSearchPaths) IEnumerable<string> previousSearchPaths)
{ {
var result = new List<DiagnosticMessage>(); var result = new List<DiagnosticMessage>();
var project = context.ProjectFile; var project = context.ProjectFile;
var libraries = context.LibraryManager.GetLibraries(); var libraries = context.LibraryManager.GetLibraries();
var updatedSearchPath = GetUpdatedSearchPaths(currentSearchPaths, project.ResolveSearchPaths()); var updatedSearchPath = GetUpdatedSearchPaths(previousSearchPaths, project.ResolveSearchPaths());
var projectCandiates = GetProjectCandidates(updatedSearchPath); var projectCandiates = GetProjectCandidates(updatedSearchPath);
var rootDependencies = libraries.FirstOrDefault(library => string.Equals(library.Identity.Name, project.Name)) var rootDependencies = libraries.FirstOrDefault(library => string.Equals(library.Identity.Name, project.Name))
?.Dependencies ?.Dependencies

4
src/dotnet/commands/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs
View file

@ -24,13 +24,13 @@ namespace Microsoft.DotNet.ProjectModel.Server
public IReadOnlyList<DiagnosticMessage> DependencyDiagnostics { get; set; } public IReadOnlyList<DiagnosticMessage> DependencyDiagnostics { get; set; }
public IDictionary<string, DependencyDescription> Dependencies { get; set; } public IDictionary<string, DependencyDescription> Dependencies { get; set; }
public static ProjectContextSnapshot Create(ProjectContext context, string configuration, IEnumerable<string> currentSearchPaths) public static ProjectContextSnapshot Create(ProjectContext context, string configuration, IEnumerable<string> previousSearchPaths)
{ {
var snapshot = new ProjectContextSnapshot(); var snapshot = new ProjectContextSnapshot();
var allDependencyDiagnostics = new List<DiagnosticMessage>(); var allDependencyDiagnostics = new List<DiagnosticMessage>();
allDependencyDiagnostics.AddRange(context.LibraryManager.GetAllDiagnostics()); allDependencyDiagnostics.AddRange(context.LibraryManager.GetAllDiagnostics());
allDependencyDiagnostics.AddRange(DependencyTypeChangeFinder.Diagnose(context, currentSearchPaths)); allDependencyDiagnostics.AddRange(DependencyTypeChangeFinder.Diagnose(context, previousSearchPaths));
var diagnosticsLookup = allDependencyDiagnostics.ToLookup(d => d.Source); var diagnosticsLookup = allDependencyDiagnostics.ToLookup(d => d.Source);

4
src/dotnet/commands/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs
View file

@ -22,7 +22,7 @@ namespace Microsoft.DotNet.ProjectModel.Server
public static ProjectSnapshot Create(string projectDirectory, public static ProjectSnapshot Create(string projectDirectory,
string configuration, string configuration,
DesignTimeWorkspace workspaceContext, DesignTimeWorkspace workspaceContext,
IReadOnlyList<string> projectSearchPaths, IReadOnlyList<string> previousSearchPaths,
bool clearWorkspaceContextCache) bool clearWorkspaceContextCache)
{ {
var projectContextsCollection = workspaceContext.GetProjectContextCollection(projectDirectory, clearWorkspaceContextCache); var projectContextsCollection = workspaceContext.GetProjectContextCollection(projectDirectory, clearWorkspaceContextCache);
@ -42,7 +42,7 @@ namespace Microsoft.DotNet.ProjectModel.Server
foreach (var projectContext in projectContextsCollection.FrameworkOnlyContexts) foreach (var projectContext in projectContextsCollection.FrameworkOnlyContexts)
{ {
snapshot.ProjectContexts[projectContext.TargetFramework] = snapshot.ProjectContexts[projectContext.TargetFramework] =
ProjectContextSnapshot.Create(projectContext, configuration, projectSearchPaths); ProjectContextSnapshot.Create(projectContext, configuration, previousSearchPaths);
} }
return snapshot; return snapshot;