fixed build issues (#315)

* fixed build issues
microsoft · Apr 14, 2017 · 88eb0f6 · 88eb0f6
1 parent 6daadcf
commit 88eb0f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git 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
@@ -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 @@ public override  IEnumerable<SqlSmoObject> Query(SmoQueryContext context)
             return Enumerable.Empty<SqlSmoObject>();
         }
     }
-
 }
 
diff --git 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<string> parents = new List<string>();
-			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
@@ -1,13 +1,4 @@
-
-
-
-
-
-
-
-
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Composition;
 using Microsoft.SqlTools.ServiceLayer;
@@ -3461,6 +3452,5 @@ public override TreeNode CreateChild(TreeNode parent, object context)
         }
     }
 
-
 }