AriasCreations/Prebuild
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix strange scripting errors.

Browse source
This commit is contained in:
Zontreck 2023-08-10 22:52:14 -07:00
parent 035ab6e830
commit fdbdf0ce62
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
bootstrap/prebuild.dll
View file

Binary file not shown.

4
prebuild.xml
View file

@ -94,6 +94,7 @@
<OutputPath>../../bootstrap/debug/</OutputPath> <OutputPath>../../bootstrap/debug/</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
</Options> </Options>
</Configuration> </Configuration>
<Configuration name="Release"> <Configuration name="Release">
@ -108,7 +109,8 @@
<PackageReference name="Microsoft.CodeAnalysis" version="4.6.0"/> <PackageReference name="Microsoft.CodeAnalysis" version="4.6.0"/>
<PackageReference name="Microsoft.CodeAnalysis.CSharp" version="4.6.0"/> <PackageReference name="Microsoft.CodeAnalysis.CSharp" version="4.6.0"/>
<PackageReference name="Microsoft.CodeAnalysis.CSharp.Scripting" version="4.6.0"/> <PackageReference name="Microsoft.CodeAnalysis.CSharp.Scripting" version="4.6.0"/>
<PackageReference name="System.Diagnostics.Process" version="4.3.0"/> <Reference name="System.Diagnostics"/>
<Reference name="System.Diagnostics.Process"/>
</Project> </Project>
</Solution> </Solution>

2
source/Prebuild/Core/Targets/VSGenericTarget.cs
View file

@ -696,7 +696,7 @@ public abstract class VSGenericTarget : ITarget
string outputFile = Path.Combine(project.Path, node.OutputName); string outputFile = Path.Combine(project.Path, node.OutputName);
ps.WriteLine(" <Target Name=\"Prebuild\" BeforeTargets=\"PreBuildEvent\">"); ps.WriteLine(" <Target Name=\"Prebuild\" BeforeTargets=\"PreBuildEvent\">");
ps.WriteLine($" <Exec Command=\"'dotnet' '$(ProjectDir){pathText}' '$(ProjectDir){node.Name}' '$(ProjectDir){node.OutputName}' '{node.Libraries}' \" />"); ps.WriteLine($" <Exec Command='dotnet \"$(SolutionDir){pathText}\" \"$(ProjectDir){node.Name}\" \"$(ProjectDir){node.OutputName}\" \"{node.Libraries}\"' />");
ps.WriteLine($" </Target>"); ps.WriteLine($" </Target>");
} }
} }

10
source/SnapWrap/SnapWrap.cs
View file

@ -14,16 +14,26 @@ namespace SnapWrap
string output = args[1]; string output = args[1];
var customImports = args[2].Split(".."); var customImports = args[2].Split("..");
if (customImports.Length == 0) customImports = new string[3] { "System", "System.Diagnostics.Process", "System.IO" };
try try
{ {
var inputCode = File.ReadAllText(input); var inputCode = File.ReadAllText(input);
var options = ScriptOptions.Default var options = ScriptOptions.Default
.WithReferences(AppDomain.CurrentDomain.GetAssemblies()) // Add necessary assemblies .WithReferences(AppDomain.CurrentDomain.GetAssemblies()) // Add necessary assemblies
.WithReferences(typeof(Process).Assembly,
typeof(Console).Assembly
)
.WithOptimizationLevel(Microsoft.CodeAnalysis.OptimizationLevel.Release)
.WithImports(customImports) .WithImports(customImports)
.WithAllowUnsafe(true); .WithAllowUnsafe(true);
Console.WriteLine("Run Script: " + input);
Console.WriteLine("Script Length: " + inputCode.Length);
// Capture console output using custom class // Capture console output using custom class
using (var consoleOutput = new ConsoleOutput()) using (var consoleOutput = new ConsoleOutput())
{ {