Skip to content
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.

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

fixed build issues #315

Merged
merged 2 commits into from
Apr 14, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
5 changes: 5 additions & 0 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,11 @@ Task("SRGen")
System.IO.File.Delete(outputCs);
}

if(!System.IO.Directory.Exists(inputXliff))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

( [](start = 4, length = 1)

nit: space after this if

{
System.IO.Directory.CreateDirectory(inputXliff);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: spaces not tabs


// Run SRGen
var dotnetArgs = string.Format("{0} -or \"{1}\" -oc \"{2}\" -ns \"{3}\" -an \"{4}\" -cn SR -l CS -dnx \"{5}\"",
srgenPath, outputResx, outputCs, projectName, projectNameSpace, projectStrings);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@









// This file was generated by a T4 Template. Do not modify directly, instead update the SmoQueryModelDefinition.xml file
// This file was generated by a T4 Template. Do not modify directly, instead update the SmoQueryModelDefinition.xml file
// and re-run the T4 template. This can be done in Visual Studio by right-click in and choosing "Run Custom Tool",
// or from the command-line on any platform by running "build.cmd -Target=CodeGen" or "build.sh -Target=CodeGen".

Expand Down Expand Up @@ -1578,6 +1569,5 @@ public override IEnumerable<SqlSmoObject> Query(SmoQueryContext context)
return Enumerable.Empty<SqlSmoObject>();
}
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
doc.Load(xmlFile);
XmlElement navPathElement = (XmlElement)doc.SelectSingleNode(string.Format("/SmoQueryModel/Node[@Name='{0}']/NavigationPath[@Parent='{1}']", nodeName, parent));

return navPathElement?.GetAttribute("Field");
return navPathElement == null ? null : navPathElement.GetAttribute("Field");
}

public static string GetNavigationPath(XmlElement nodeElement, string xmlFile, string nodeName, string parentName)
Expand Down Expand Up @@ -181,7 +181,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
if (parentNodes != null && parentNodes.Count > 0)
{
List<string> parents = new List<string>();
int i = 0;
foreach(var node in parentNodes)
{
parents.Add(node.InnerText);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@









using System;
using System;
using System.Collections.Generic;
using System.Composition;
using Microsoft.SqlTools.ServiceLayer;
Expand Down Expand Up @@ -3461,6 +3452,5 @@ public override TreeNode CreateChild(TreeNode parent, object context)
}
}


}