Making runtime folders case-insensitive and adding additional path check

Azure · Dec 5, 2017 · 11c8a8c · 11c8a8c
1 parent ad4bed6
commit 11c8a8c
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/AzureFunctions/Code/TemplatesManager.cs b/AzureFunctions/Code/TemplatesManager.cs
@@ -65,8 +65,13 @@ private void HandleFileSystemChange()
                     var templateDirs = new List<string>();
 
                     foreach (var d in runtimeDirs)
-                    {
-                        templateDirs.AddRange(Directory.GetDirectories(Path.Combine(d, "Templates")));
+                    {
+                        string templatesDirectory = Path.Combine(d, "Templates");
+                        if (Directory.Exists(templatesDirectory))
+                        {
+                            templateDirs.AddRange(Directory.GetDirectories(templatesDirectory));
+                        }
+
                     }
 
                     IEnumerable<FunctionTemplate> templates = templateDirs.Select(GetFunctionTemplate).ToList();
@@ -128,9 +133,9 @@ public IEnumerable<FunctionTemplate> GetTemplates(string runtime)
             {
                 try
                 {
-                    return _templates.Any(t => t.Runtime == runtime)
-                        ? _templates.Where(t => t.Runtime == runtime)
-                        : _templates.Where(t => t.Runtime == "default");
+                    return _templates.Any(t => t.Runtime.ToLowerInvariant() == runtime.ToLowerInvariant())
+                        ? _templates.Where(t => t.Runtime.ToLowerInvariant() == runtime.ToLowerInvariant())
+                        : _templates.Where(t => t.Runtime.ToLowerInvariant() == "default");
                 }
                 finally
                 {