ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed build issues (#315)

Browse Source 
* fixed build issues
This commit is contained in:
Leila Lali
2017-04-14 11:47:25 -07:00
committed by GitHub
parent 6daadcf8cc
commit 88eb0f699b
4 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.cake
View File

@@ -551,6 +551,11 @@ Task("SRGen")
System.IO.File.Delete(outputCs); System.IO.File.Delete(outputCs);
} }
if (!System.IO.Directory.Exists(inputXliff))
{
System.IO.Directory.CreateDirectory(inputXliff);
}
// Run SRGen // Run SRGen
var dotnetArgs = string.Format("{0} -or \"{1}\" -oc \"{2}\" -ns \"{3}\" -an \"{4}\" -cn SR -l CS -dnx \"{5}\"", 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); srgenPath, outputResx, outputCs, projectName, projectNameSpace, projectStrings);

12
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.cs
View File

@@ -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", // 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". // or from the command-line on any platform by running "build.cmd -Target=CodeGen" or "build.sh -Target=CodeGen".
@@ -1578,6 +1569,5 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
return Enumerable.Empty<SqlSmoObject>(); return Enumerable.Empty<SqlSmoObject>();
} }
} }
} }

3
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.tt
View File

@@ -128,7 +128,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
doc.Load(xmlFile); doc.Load(xmlFile);
XmlElement navPathElement = (XmlElement)doc.SelectSingleNode(string.Format("/SmoQueryModel/Node[@Name='{0}']/NavigationPath[@Parent='{1}']", nodeName, parent)); 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) public static string GetNavigationPath(XmlElement nodeElement, string xmlFile, string nodeName, string parentName)
@@ -181,7 +181,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
if (parentNodes != null && parentNodes.Count > 0) if (parentNodes != null && parentNodes.Count > 0)
{ {
List<string> parents = new List<string>(); List<string> parents = new List<string>();
int i = 0;
foreach(var node in parentNodes) foreach(var node in parentNodes)
{ {
parents.Add(node.InnerText); parents.Add(node.InnerText);

12
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs
View File

@@ -1,13 +1,4 @@
using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Composition; using System.Composition;
using Microsoft.SqlTools.ServiceLayer; using Microsoft.SqlTools.ServiceLayer;
@@ -3461,6 +3452,5 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
} }
} }