fix return code is always 0 (#1)

* fix return code is always 0 * allow unmatched property in YAML
docascode · Jun 30, 2017 · 6a9fa96 · 6a9fa96
1 parent 0822bae
commit 6a9fa96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Microsoft.Content.Build.Code2Yaml.Steps/GenerateServiceMappingFile.cs b/src/Microsoft.Content.Build.Code2Yaml.Steps/GenerateServiceMappingFile.cs
@@ -59,7 +59,7 @@ select g
             {
                 using (var reader = new StreamReader(outputPath))
                 {
-                    var oldMapping = new YamlDeserializer().Deserialize<ServiceMapping>(reader);
+                    var oldMapping = new YamlDeserializer(ignoreUnmatched: true).Deserialize<ServiceMapping>(reader);
                     foreach (var m in oldMapping[0].items)
                     {
                         if (m.name == "Other")

diff --git a/src/code2yaml/Program.cs b/src/code2yaml/Program.cs
@@ -18,11 +18,11 @@ class Program
     {
         private static ConfigModel _config;
 
-        static void Main(string[] args)
+        static int Main(string[] args)
         {
             if (!ValidateConfig(args))
             {
-                return;
+                return 1;
             }
             var context = new BuildContext();
             context.SetSharedObject(Constants.Constants.Config, _config);
@@ -38,12 +38,12 @@ static void Main(string[] args)
                             new GenerateArticles { Generator = ArticleGeneratorFactory.Create(_config.Language) },
                             new GenerateServiceMappingFile()),
                     }));
-            string status = "Failed";
+            var status = 1;
             var watch = Stopwatch.StartNew();
             try
             {
                 procedure.RunAsync(context).Wait();
-                status = "Succeeded";
+                status = 0;
             }
             catch
             {
@@ -53,7 +53,9 @@ static void Main(string[] args)
             {
                 watch.Stop();
             }
-            Console.WriteLine($"{status} in {watch.ElapsedMilliseconds} milliseconds.");
+            var statusString = status == 0 ? "Succeeded" : "Failed";
+            Console.WriteLine($"{statusString} in {watch.ElapsedMilliseconds} milliseconds.");
+            return status;
         }
 
         private static bool ValidateConfig(string[] args)