From e5508343e82b7e8c05bd2301c1e9ef36b07db5ec Mon Sep 17 00:00:00 2001 From: Bitl Date: Sun, 12 Jul 2020 12:51:18 -0700 Subject: [PATCH] Trimmed the end of the textbox just to make it look nicer. --- .../Classes/LocalVars.cs | 11 +++++++ .../Forms/ClientScriptTestForm.cs | 3 +- .../Novetus.ClientScriptTester.csproj | 31 ------------------- .../packages.config | 8 ----- Novetus/Novetus.sln | 1 - .../NovetusCore/StorageAndFunctions/NETExt.cs | 13 -------- 6 files changed, 13 insertions(+), 54 deletions(-) delete mode 100644 Novetus/Novetus.ClientScriptTester/packages.config diff --git a/Novetus/Novetus.ClientScriptTester/Classes/LocalVars.cs b/Novetus/Novetus.ClientScriptTester/Classes/LocalVars.cs index 88a8255..5f225d6 100644 --- a/Novetus/Novetus.ClientScriptTester/Classes/LocalVars.cs +++ b/Novetus/Novetus.ClientScriptTester/Classes/LocalVars.cs @@ -1,5 +1,7 @@ #region Usings +using System; using System.Collections.Generic; +using System.Diagnostics.Contracts; #endregion namespace Novetus.ClientScriptTester @@ -8,6 +10,15 @@ namespace Novetus.ClientScriptTester class LocalVars { public static List SharedArgs = new List(); + //a re-implementation of "Environment.NewLine" but with double spaces. Should be in NETExt, but we only use it here. + public static String DoubleSpacedNewLine + { + get + { + Contract.Ensures(Contract.Result() != null); + return "\r\n\r\n"; + } + } } #endregion } diff --git a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs index 6c74e57..62900f2 100644 --- a/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs +++ b/Novetus/Novetus.ClientScriptTester/Forms/ClientScriptTestForm.cs @@ -20,9 +20,10 @@ namespace Novetus.ClientScriptTester { foreach (string str in LocalVars.SharedArgs) { - OutputBox.AppendText(str + NETExt.DoubleSpacedNewLine); + OutputBox.AppendText(str + LocalVars.DoubleSpacedNewLine); } + OutputBox.Text.TrimEnd(); OutputBox.SelectionStart = 0; OutputBox.ScrollToCaret(); } diff --git a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj index 817c8dc..96e9888 100644 --- a/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj +++ b/Novetus/Novetus.ClientScriptTester/Novetus.ClientScriptTester.csproj @@ -35,33 +35,9 @@ NovetusIcon.ico - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - - - ..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll - - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll - - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll - - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll - @@ -94,7 +70,6 @@ Resources.resx - SettingsSingleFileGenerator Settings.Designer.cs @@ -108,7 +83,6 @@ - SET path=$(SolutionDir)build @@ -121,9 +95,4 @@ del "%25path%25"\*.xml if not exist "%25path%25"\clients\ClientScriptTester mkdir "%25path%25"\clients\ClientScriptTester move "%25path%25"\* "%25path%25"\clients\ClientScriptTester - - - - - \ No newline at end of file diff --git a/Novetus/Novetus.ClientScriptTester/packages.config b/Novetus/Novetus.ClientScriptTester/packages.config deleted file mode 100644 index d635654..0000000 --- a/Novetus/Novetus.ClientScriptTester/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Novetus/Novetus.sln b/Novetus/Novetus.sln index bbf952d..dae2569 100644 --- a/Novetus/Novetus.sln +++ b/Novetus/Novetus.sln @@ -16,7 +16,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution NovetusCore\NovetusCore.projitems*{2070eaa6-7606-4006-a628-5705c24a3644}*SharedItemsImports = 4 - NovetusCore\NovetusCore.projitems*{83b08607-65b8-4f9c-8d0f-ab1c8eeffae0}*SharedItemsImports = 4 NovetusCore\NovetusCore.projitems*{bac99c87-f6c1-4ed0-aa2e-05c6ae8979ea}*SharedItemsImports = 4 NovetusCore\NovetusCore.projitems*{debcc57d-9a3b-4d7c-8693-fa4aec56c8c1}*SharedItemsImports = 13 NovetusCore\NovetusCore.projitems*{f92ffbed-2767-4676-9711-bb89cda58a43}*SharedItemsImports = 4 diff --git a/Novetus/NovetusCore/StorageAndFunctions/NETExt.cs b/Novetus/NovetusCore/StorageAndFunctions/NETExt.cs index a6a0e59..dc81a8d 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/NETExt.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/NETExt.cs @@ -5,7 +5,6 @@ using System.Windows.Forms; using System.Diagnostics; using System.Security.Cryptography; using System.Text; -using System.Diagnostics.Contracts; #endregion #region .NET Extentions @@ -162,17 +161,5 @@ public static class NETExt return Encoding.Unicode.GetString(outputBuffer); } #endregion - - #region Environment Extentions - //a re-implementation of "Environment.NewLine" but with double spaces. - public static String DoubleSpacedNewLine - { - get - { - Contract.Ensures(Contract.Result() != null); - return "\r\n\r\n"; - } - } - #endregion } #endregion \ No newline at end of file