Trimmed the end of the textbox just to make it look nicer.
This commit is contained in:
parent
8c34bd0395
commit
e5508343e8
|
|
@ -1,5 +1,7 @@
|
||||||
#region Usings
|
#region Usings
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics.Contracts;
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
namespace Novetus.ClientScriptTester
|
namespace Novetus.ClientScriptTester
|
||||||
|
|
@ -8,6 +10,15 @@ namespace Novetus.ClientScriptTester
|
||||||
class LocalVars
|
class LocalVars
|
||||||
{
|
{
|
||||||
public static List<string> SharedArgs = new List<string>();
|
public static List<string> SharedArgs = new List<string>();
|
||||||
|
//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<String>() != null);
|
||||||
|
return "\r\n\r\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,9 +20,10 @@ namespace Novetus.ClientScriptTester
|
||||||
{
|
{
|
||||||
foreach (string str in LocalVars.SharedArgs)
|
foreach (string str in LocalVars.SharedArgs)
|
||||||
{
|
{
|
||||||
OutputBox.AppendText(str + NETExt.DoubleSpacedNewLine);
|
OutputBox.AppendText(str + LocalVars.DoubleSpacedNewLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
OutputBox.Text.TrimEnd();
|
||||||
OutputBox.SelectionStart = 0;
|
OutputBox.SelectionStart = 0;
|
||||||
OutputBox.ScrollToCaret();
|
OutputBox.ScrollToCaret();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,33 +35,9 @@
|
||||||
<ApplicationIcon>NovetusIcon.ico</ApplicationIcon>
|
<ApplicationIcon>NovetusIcon.ico</ApplicationIcon>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Mono.Nat, Version=1.2.24.0, Culture=neutral, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Nini, Version=1.1.0.0, Culture=neutral, PublicKeyToken=691faec150a7fa7b, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\Trove.Nini.1.1.0.0\lib\net20\Nini.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.IO, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System.Net" />
|
<Reference Include="System.Net" />
|
||||||
<Reference Include="System.Runtime, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System.Threading.Tasks, Version=2.6.8.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
|
@ -94,7 +70,6 @@
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
<DependentUpon>Resources.resx</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<None Include="app.config" />
|
<None Include="app.config" />
|
||||||
<None Include="packages.config" />
|
|
||||||
<None Include="Properties\Settings.settings">
|
<None Include="Properties\Settings.settings">
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
<Generator>SettingsSingleFileGenerator</Generator>
|
||||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||||
|
|
@ -108,7 +83,6 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="NovetusIcon.ico" />
|
<Content Include="NovetusIcon.ico" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="..\NovetusCore\NovetusCore.projitems" Label="Shared" />
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>SET path=$(SolutionDir)build
|
<PostBuildEvent>SET path=$(SolutionDir)build
|
||||||
|
|
@ -121,9 +95,4 @@ del "%25path%25"\*.xml
|
||||||
if not exist "%25path%25"\clients\ClientScriptTester mkdir "%25path%25"\clients\ClientScriptTester
|
if not exist "%25path%25"\clients\ClientScriptTester mkdir "%25path%25"\clients\ClientScriptTester
|
||||||
move "%25path%25"\* "%25path%25"\clients\ClientScriptTester</PostBuildEvent>
|
move "%25path%25"\* "%25path%25"\clients\ClientScriptTester</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
|
|
||||||
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
|
|
||||||
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
|
|
||||||
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
|
|
||||||
</Target>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<packages>
|
|
||||||
<package id="Microsoft.Bcl" version="1.1.8" targetFramework="net40" />
|
|
||||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
|
||||||
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
|
|
||||||
<package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" />
|
|
||||||
<package id="Trove.Nini" version="1.1.0.0" targetFramework="net40" />
|
|
||||||
</packages>
|
|
||||||
|
|
@ -16,7 +16,6 @@ EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||||
NovetusCore\NovetusCore.projitems*{2070eaa6-7606-4006-a628-5705c24a3644}*SharedItemsImports = 4
|
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*{bac99c87-f6c1-4ed0-aa2e-05c6ae8979ea}*SharedItemsImports = 4
|
||||||
NovetusCore\NovetusCore.projitems*{debcc57d-9a3b-4d7c-8693-fa4aec56c8c1}*SharedItemsImports = 13
|
NovetusCore\NovetusCore.projitems*{debcc57d-9a3b-4d7c-8693-fa4aec56c8c1}*SharedItemsImports = 13
|
||||||
NovetusCore\NovetusCore.projitems*{f92ffbed-2767-4676-9711-bb89cda58a43}*SharedItemsImports = 4
|
NovetusCore\NovetusCore.projitems*{f92ffbed-2767-4676-9711-bb89cda58a43}*SharedItemsImports = 4
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ using System.Windows.Forms;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Diagnostics.Contracts;
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region .NET Extentions
|
#region .NET Extentions
|
||||||
|
|
@ -162,17 +161,5 @@ public static class NETExt
|
||||||
return Encoding.Unicode.GetString(outputBuffer);
|
return Encoding.Unicode.GetString(outputBuffer);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Environment Extentions
|
|
||||||
//a re-implementation of "Environment.NewLine" but with double spaces.
|
|
||||||
public static String DoubleSpacedNewLine
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
Contract.Ensures(Contract.Result<String>() != null);
|
|
||||||
return "\r\n\r\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endregion
|
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
Loading…
Reference in New Issue