Skip to content

Bunch of smaller fixes #1577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulvanbrenk merged 3 commits into from
May 15, 2017
Merged

Bunch of smaller fixes #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2e113c
Remove log converter, since it's only used by the profiler
May 12, 2017
3ee2f01
Fix null reference exception
May 13, 2017
5275144
Fix icons in add new item dialog
May 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions Nodejs/NodejsTools.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26507.0
VisualStudioVersion = 15.0.26510.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nodejs", "Product\Nodejs\Nodejs.csproj", "{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}"
ProjectSection(ProjectDependencies) = postProject
{5085DF35-3A32-4894-835E-E5A3956D4F57} = {5085DF35-3A32-4894-835E-E5A3956D4F57}
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogConverter", "Product\LogConverter\LogConverter.csproj", "{9A69745F-546D-40A0-8770-7E5B9ED0C82F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveWindow", "Product\InteractiveWindow\InteractiveWindow.csproj", "{24A3887F-DA50-4989-8D6C-4A5B04D5D457}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Product", "Product", "{F9719B35-F359-47A7-A2F8-34F42E53C809}"
Expand All @@ -35,10 +33,6 @@ Global
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Debug|x86.Build.0 = Debug|x86
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|x86.ActiveCfg = Release|x86
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|x86.Build.0 = Release|x86
{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Debug|x86.ActiveCfg = Debug|x86
{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Debug|x86.Build.0 = Debug|x86
{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Release|x86.ActiveCfg = Release|x86
{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Release|x86.Build.0 = Release|x86
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|x86.ActiveCfg = Debug|x86
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|x86.Build.0 = Debug|x86
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Release|x86.ActiveCfg = Release|x86
Expand Down Expand Up @@ -69,7 +63,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
{9A69745F-546D-40A0-8770-7E5B9ED0C82F} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
{24A3887F-DA50-4989-8D6C-4A5B04D5D457} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
{DBC73DF7-1B4C-48BE-8B48-715297487E7A} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
{712D84EC-B2A6-46D1-B030-BA697AE5E554} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3023"/>
<Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3024"/>
<Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="0"/>
<Icon Package="{AAB75614-2F8F-4DA6-B0A6-763C6DBB2969}" ID="2200"/>
<ProjectType>Node.js</ProjectType>
<DefaultName>Json.json</DefaultName>
<SortOrder>420</SortOrder>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3038"/>
<Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3039"/>
<Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="0"/>
<Icon Package="{AAB75614-2F8F-4DA6-B0A6-763C6DBB2969}" ID="2100"/>
<ProjectType>Node.js</ProjectType>
<DefaultName>StyleSheet.less</DefaultName>
<SortOrder>450</SortOrder>
Expand Down
2 changes: 1 addition & 1 deletion Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<TemplateData>
<Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3017"/>
<Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3018"/>
<Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3"/>
<Icon Package="{2ffe45c4-5c73-493c-b187-f2e955ff875e}" ID="3"></Icon>
<ProjectType>Node.js</ProjectType>
<DefaultName>TypeScript.ts</DefaultName>
<SortOrder>200</SortOrder>
Expand Down
6 changes: 3 additions & 3 deletions Nodejs/Product/Npm/SPI/RootPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using Microsoft.CSharp.RuntimeBinder;

namespace Microsoft.NodejsTools.Npm.SPI
Expand Down Expand Up @@ -54,11 +55,11 @@ public RootPackage(

public string Path { get; }

public IEnumerable<string> Homepages => this.PackageJson?.Homepages;
public IEnumerable<string> Homepages => this.PackageJson?.Homepages ?? Enumerable.Empty<string>();

public bool HasPackageJson => this.PackageJson != null;

public string Name => this.HasPackageJson ? new DirectoryInfo(this.Path).Name : this.PackageJson.Name;
public string Name => this.PackageJson?.Name ?? new DirectoryInfo(this.Path).Name;

public SemverVersion Version => this.PackageJson?.Version ?? new SemverVersion();

Expand All @@ -67,4 +68,3 @@ public RootPackage(
public string Description => this.PackageJson?.Description;
}
}