Fixes for compiling multi contracts in single csproj (neo-project#953)

cschuchardt88 · Mar 21, 2024 · 5953f76 · 5953f76
1 parent 64979c1
commit 5953f76
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Neo.Compiler.CSharp/CompilationEngine.cs b/src/Neo.Compiler.CSharp/CompilationEngine.cs
@@ -172,8 +172,9 @@ public Compilation GetCompilation(string csproj)
         {
             string folder = Path.GetDirectoryName(csproj)!;
             string obj = Path.Combine(folder, "obj");
+            string binSc = Path.Combine(Path.Combine(folder, "bin"), "sc");
             HashSet<string> sourceFiles = Directory.EnumerateFiles(folder, "*.cs", SearchOption.AllDirectories)
-                .Where(p => !p.StartsWith(obj))
+                .Where(p => !p.StartsWith(obj) && !p.StartsWith(binSc))
                 .GroupBy(Path.GetFileName)
                 .Select(g => g.First())
                 .ToHashSet(StringComparer.OrdinalIgnoreCase);

diff --git a/src/Neo.Compiler.CSharp/Program.cs b/src/Neo.Compiler.CSharp/Program.cs
@@ -138,7 +138,22 @@ private static int ProcessSources(Options options, string folder, string[] sourc
 
         private static int ProcessOutputs(Options options, string folder, List<CompilationContext> contexts)
         {
-            return contexts.Select(p => ProcessOutput(options, folder, p)).Any(p => p != 1) ? 0 : 1;
+            int result = 0;
+            List<Exception> exceptions = new();
+            foreach (CompilationContext context in contexts)
+                try
+                {
+                    if (ProcessOutput(options, folder, context) != 0)
+                        result = 1;
+                }
+                catch (Exception e)
+                {
+                    result = 1;
+                    exceptions.Add(e);
+                }
+            foreach (Exception e in exceptions)
+                Console.Error.WriteLine(e.ToString());
+            return result;
         }
 
         private static int ProcessOutput(Options options, string folder, CompilationContext context)