From 88eb0f699bf42dea19ee67df08754bf2cc9b9c74 Mon Sep 17 00:00:00 2001 From: Leila Lali Date: Fri, 14 Apr 2017 11:47:25 -0700 Subject: [PATCH] fixed build issues (#315) * fixed build issues --- build.cake | 5 +++++ .../ObjectExplorer/SmoModel/SmoQueryModel.cs | 12 +----------- .../ObjectExplorer/SmoModel/SmoQueryModel.tt | 3 +-- .../ObjectExplorer/SmoModel/TreeNodeGenerator.cs | 12 +----------- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/build.cake b/build.cake index 40c90c0b..f32e35f6 100644 --- a/build.cake +++ b/build.cake @@ -551,6 +551,11 @@ Task("SRGen") System.IO.File.Delete(outputCs); } + if (!System.IO.Directory.Exists(inputXliff)) + { + System.IO.Directory.CreateDirectory(inputXliff); + } + // 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); diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.cs index a87a1dc4..1df00d1d 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.cs @@ -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". @@ -1578,6 +1569,5 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel return Enumerable.Empty(); } } - } diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.tt b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.tt index 99fe3fcd..0ed1ebe4 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.tt +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.tt @@ -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) @@ -181,7 +181,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel if (parentNodes != null && parentNodes.Count > 0) { List parents = new List(); - int i = 0; foreach(var node in parentNodes) { parents.Add(node.InnerText); diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs index fc994563..759627c1 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs @@ -1,13 +1,4 @@ - - - - - - - - - -using System; +using System; using System.Collections.Generic; using System.Composition; using Microsoft.SqlTools.ServiceLayer; @@ -3461,6 +3452,5 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel } } - }