From fdbdf0ce6273cd6a86606180558851aa3d40251f Mon Sep 17 00:00:00 2001 From: Zontreck Date: Thu, 10 Aug 2023 22:52:14 -0700 Subject: [PATCH] Fix strange scripting errors. --- bootstrap/prebuild.dll | Bin 270336 -> 270336 bytes prebuild.xml | 6 ++++-- .../Prebuild/Core/Targets/VSGenericTarget.cs | 2 +- source/SnapWrap/SnapWrap.cs | 10 ++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/bootstrap/prebuild.dll b/bootstrap/prebuild.dll index 2efe2f7aac7676711c021693a5b3f331034c9c3b..94d4d0c3b3f6063b5bc53f1148cf663e6c4a1227 100644 GIT binary patch delta 4512 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 GPw~InB`_NR delta 4492 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 diff --git a/prebuild.xml b/prebuild.xml index bda8613..1b3e275 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -94,6 +94,7 @@ ../../bootstrap/debug/ false false + @@ -104,11 +105,12 @@ - + - + + diff --git a/source/Prebuild/Core/Targets/VSGenericTarget.cs b/source/Prebuild/Core/Targets/VSGenericTarget.cs index 323ac79..445a32f 100644 --- a/source/Prebuild/Core/Targets/VSGenericTarget.cs +++ b/source/Prebuild/Core/Targets/VSGenericTarget.cs @@ -696,7 +696,7 @@ public abstract class VSGenericTarget : ITarget string outputFile = Path.Combine(project.Path, node.OutputName); ps.WriteLine(" "); - ps.WriteLine($" "); + ps.WriteLine($" "); ps.WriteLine($" "); } } diff --git a/source/SnapWrap/SnapWrap.cs b/source/SnapWrap/SnapWrap.cs index bb578b0..ca051f9 100644 --- a/source/SnapWrap/SnapWrap.cs +++ b/source/SnapWrap/SnapWrap.cs @@ -14,16 +14,26 @@ namespace SnapWrap string output = args[1]; var customImports = args[2].Split(".."); + if (customImports.Length == 0) customImports = new string[3] { "System", "System.Diagnostics.Process", "System.IO" }; + try { var inputCode = File.ReadAllText(input); var options = ScriptOptions.Default .WithReferences(AppDomain.CurrentDomain.GetAssemblies()) // Add necessary assemblies + .WithReferences(typeof(Process).Assembly, + typeof(Console).Assembly + ) + .WithOptimizationLevel(Microsoft.CodeAnalysis.OptimizationLevel.Release) .WithImports(customImports) .WithAllowUnsafe(true); + Console.WriteLine("Run Script: " + input); + Console.WriteLine("Script Length: " + inputCode.Length); + + // Capture console output using custom class using (var consoleOutput = new ConsoleOutput()) {