Do not force ShowProjectOutputs - can cause crash in some solutions w…

…ith "Miscellaneous Files" entries Add error for no Build parameters Update Copyrights
ninjaoxygen · Jun 19, 2019 · e3621c9 · e3621c9
1 parent 85bd7c8
commit e3621c9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/Program.cs b/Program.cs
@@ -5,7 +5,7 @@
  *
  * The MIT License
  *
- * Copyright © 2017 AVSP Ltd
+ * Copyright © 2017 - 2019 AVSP Ltd
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -50,13 +50,11 @@ private static int Run(SimpleArguments arguments)
                 return 1;
             }
 
-            //@"C:\Dropbox\Code\CresNuget\BuildTest\BuildTest.sln"
-
             VsBuilder builder = new VsBuilder();
 
-            builder.Run(options);
+            int result = builder.Run(options);
 
-            if (builder.Results.Failed)
+            if ((result != 0) || builder.Results.Failed)
             {
                 Console.Error.WriteLine("ERROR: some builds failed, check output");
                 return 1;

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("AVSP Ltd")]
 [assembly: AssemblyProduct("VsIdeBuild")]
-[assembly: AssemblyCopyright("Copyright © 2017 Chris Poole")]
+[assembly: AssemblyCopyright("Copyright © 2017 - 2019 Chris Poole")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/VsIdeBuild/VsBuilder.cs b/VsIdeBuild/VsBuilder.cs
@@ -5,7 +5,7 @@
  *
  * The MIT License
  *
- * Copyright © 2017 AVSP Ltd
+ * Copyright © 2017 - 2019 AVSP Ltd
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -60,6 +60,8 @@ public class VsBuilder
         /// <returns></returns>
         public int Run(VsBuilderOptions options)
         {
+            int returnValue = 0;
+
             this.options = options;
             this.Results = new VsBuilderResults();
 
@@ -96,7 +98,11 @@ public int Run(VsBuilderOptions options)
                 Console.WriteLine(GetProjectContexts());
             }
 
-            ShowProjectOutputs();
+            if (options.ShowProjectOutputs)
+            {
+                Console.WriteLine("Showing project outputs...");
+                ShowProjectOutputs();
+            }
 
             if (options.BuildAll)
             {
@@ -108,6 +114,11 @@ public int Run(VsBuilderOptions options)
                 {
                     BuildSolutionConfiguration(options.BuildSolutionConfiguration);
                 }
+                else
+                {
+                    Console.WriteLine("ERROR: neither BuildAll or BuildSolutionConfiguration was specified");
+                    returnValue = 1;
+                }
             }
 
             Console.WriteLine("Closing Solution...");
@@ -116,7 +127,7 @@ public int Run(VsBuilderOptions options)
             Console.WriteLine("Closing Visual Studio...");
             CloseVS();
 
-            return 0;
+            return returnValue;
         }
 
         private void PostBuildChecks()

diff --git a/VsIdeBuild/VsBuilderOptions.cs b/VsIdeBuild/VsBuilderOptions.cs
@@ -5,7 +5,7 @@
  *
  * The MIT License
  *
- * Copyright © 2017 AVSP Ltd
+ * Copyright © 2017 - 2019 AVSP Ltd
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -65,6 +65,11 @@ public class VsBuilderOptions
         /// </summary>
         public bool ShowProjectContexts { get; set; }
 
+        /// <summary>
+        /// Output ProjectOutputs, useful to get configuration information
+        /// </summary>
+        public bool ShowProjectOutputs { get; set; }
+
         /// <summary>
         /// Filepath of Visual Studio 2008 solution file
         /// </summary>

diff --git a/readme.md b/readme.md
@@ -15,7 +15,7 @@ E-mail: chris@avsp.co.uk
 
 ## Copyright
 
-VsIdeBuild is Copyright © 2017 AVSP Ltd
+VsIdeBuild is Copyright © 2017 - 2019 AVSP Ltd
 
 ## Command line parameters: