From 6ea69b45e09dae2aa0829358d1270c0481ba6902 Mon Sep 17 00:00:00 2001 From: Phil Date: Sat, 19 Oct 2024 00:41:47 -0700 Subject: [PATCH] - Update packages - Fixed Explorer tool / Emit binary --- .../Mosa.Compiler.Common.xUnit.csproj | 21 +++++++++++-------- .../Mosa.Compiler.Framework.xUnit.csproj | 21 +++++++++++-------- .../CompilerStages/LinkerEmitStage.cs | 2 -- .../Mosa.Tool.Bootstrap.csproj | 6 +++--- .../Mosa.Tool.Explorer.Avalonia.csproj | 6 +++--- Source/Mosa.Tool.Explorer/MainForm.cs | 7 ++++++- .../Mosa.Tool.Launcher.csproj | 6 +++--- .../Mosa.Utility.CreateCoreLib.csproj | 2 +- 8 files changed, 40 insertions(+), 31 deletions(-) diff --git a/Source/Mosa.Compiler.Common.xUnit/Mosa.Compiler.Common.xUnit.csproj b/Source/Mosa.Compiler.Common.xUnit/Mosa.Compiler.Common.xUnit.csproj index ad7d0a2e74..225101add8 100644 --- a/Source/Mosa.Compiler.Common.xUnit/Mosa.Compiler.Common.xUnit.csproj +++ b/Source/Mosa.Compiler.Common.xUnit/Mosa.Compiler.Common.xUnit.csproj @@ -5,18 +5,21 @@ - - + + - - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all - + all diff --git a/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj b/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj index ad7d0a2e74..225101add8 100644 --- a/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj +++ b/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj @@ -5,18 +5,21 @@ - - + + - - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all - + all diff --git a/Source/Mosa.Compiler.Framework/CompilerStages/LinkerEmitStage.cs b/Source/Mosa.Compiler.Framework/CompilerStages/LinkerEmitStage.cs index 6abb3c6945..ef83b57fd5 100644 --- a/Source/Mosa.Compiler.Framework/CompilerStages/LinkerEmitStage.cs +++ b/Source/Mosa.Compiler.Framework/CompilerStages/LinkerEmitStage.cs @@ -16,8 +16,6 @@ protected override void Finalization() if (string.IsNullOrEmpty(MosaSettings.OutputFile)) return; - File.Delete(MosaSettings.OutputFile); - Compiler.PostEvent(CompilerEvent.LinkingStart); using (var file = new FileStream(MosaSettings.OutputFile, FileMode.Create)) diff --git a/Source/Mosa.Tool.Bootstrap/Mosa.Tool.Bootstrap.csproj b/Source/Mosa.Tool.Bootstrap/Mosa.Tool.Bootstrap.csproj index 05655f6606..64acefdf5b 100644 --- a/Source/Mosa.Tool.Bootstrap/Mosa.Tool.Bootstrap.csproj +++ b/Source/Mosa.Tool.Bootstrap/Mosa.Tool.Bootstrap.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/Source/Mosa.Tool.Explorer.Avalonia/Mosa.Tool.Explorer.Avalonia.csproj b/Source/Mosa.Tool.Explorer.Avalonia/Mosa.Tool.Explorer.Avalonia.csproj index 485dcca87d..29c04168c3 100755 --- a/Source/Mosa.Tool.Explorer.Avalonia/Mosa.Tool.Explorer.Avalonia.csproj +++ b/Source/Mosa.Tool.Explorer.Avalonia/Mosa.Tool.Explorer.Avalonia.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/Source/Mosa.Tool.Explorer/MainForm.cs b/Source/Mosa.Tool.Explorer/MainForm.cs index 5c1ff64b4b..8212f9f04c 100644 --- a/Source/Mosa.Tool.Explorer/MainForm.cs +++ b/Source/Mosa.Tool.Explorer/MainForm.cs @@ -13,7 +13,7 @@ using Mosa.Compiler.MosaTypeSystem.CLR; using Mosa.Tool.Explorer.Stages; using Mosa.Utility.Configuration; -using Reko.Core; + using static Mosa.Utility.Configuration.MosaSettings; namespace Mosa.Tool.Explorer; @@ -467,6 +467,11 @@ private void CompileAll() if (Compiler == null) return; + if (MosaSettings.EmitBinary & !Directory.Exists(MosaSettings.DefaultFolder)) + { + Directory.CreateDirectory(MosaSettings.DefaultFolder); + } + CompilerData.Stopwatch.Restart(); Compiler.ScheduleAll(); diff --git a/Source/Mosa.Tool.Launcher/Mosa.Tool.Launcher.csproj b/Source/Mosa.Tool.Launcher/Mosa.Tool.Launcher.csproj index 03b47e9fa5..b5ca4f9495 100644 --- a/Source/Mosa.Tool.Launcher/Mosa.Tool.Launcher.csproj +++ b/Source/Mosa.Tool.Launcher/Mosa.Tool.Launcher.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/Source/Mosa.Utility.CreateCoreLib/Mosa.Utility.CreateCoreLib.csproj b/Source/Mosa.Utility.CreateCoreLib/Mosa.Utility.CreateCoreLib.csproj index 5bac3e90d9..50ed30d81a 100644 --- a/Source/Mosa.Utility.CreateCoreLib/Mosa.Utility.CreateCoreLib.csproj +++ b/Source/Mosa.Utility.CreateCoreLib/Mosa.Utility.CreateCoreLib.csproj @@ -8,7 +8,7 @@ - +