Fixed an issue with WaitAll running on STA threads, Refactored so we only need one waithandle

Author: Mpdreamz

build/scripts/Building.fsx

@@ -24,7 +24,7 @@ open Versioning
 
 module Build =
 
-    type private GlobalJson = JsonProvider<"../../global.json">
+    type private GlobalJson = JsonProvider<"../../global.json", InferTypesFromValues = false>
     let private pinnedSdkVersion = GlobalJson.GetSample().Sdk.Version
 
     let private compileCore () =

build/scripts/Targets.fsx

@@ -36,7 +36,7 @@ Target "InternalizeDependencies" Build.ILRepack
 
 Target "ChangeVersion" <| fun _ -> 
     let newVersion = getBuildParam "version"
-    Versioning.writeVersionIntoGlobalJson Commandline.project newVersion
+    Versioning.writeVersionIntoVersionsJson Commandline.project newVersion
 
 Target "Version" <| fun _ -> 
     for v in Versioning.AllProjectVersions do

build/scripts/Versioning.fsx

@@ -24,8 +24,8 @@ open SemVerHelper
 open Commandline
 
 module Versioning =
-    type private GlobalJson = JsonProvider<"../../global.json">
-    let globalJson = GlobalJson.Load("../../global.json");
+    type private VersionsJson = JsonProvider<"../../versions.json">
+    let globalJson = VersionsJson.Load("../../versions.json");
     let private versionOf project =
         match project with
         | Proc -> globalJson.Versions.Proc.Remove(0, 1)
@@ -34,16 +34,16 @@ module Versioning =
 
     let private assemblyFileVersionOf v = sprintf "%i.%i.%i.0" v.Major v.Minor v.Patch |> parse
 
-    let writeVersionIntoGlobalJson project version =
+    let writeVersionIntoVersionsJson project version =
         //write it with a leading v in the json, needed for the json type provider to keep things strings
         let pre (v: string) = match (v.StartsWith("v")) with | true -> v | _ -> sprintf "v%s" v
         let observableProcessVersion = pre version 
-        let versionsNode = GlobalJson.Versions(observableProcessVersion)
+        let versionsNode = VersionsJson.Versions(observableProcessVersion)
 
-        let newGlobalJson = GlobalJson.Root (GlobalJson.Sdk(globalJson.Sdk.Version), versionsNode)
-        use tw = new StreamWriter("global.json")
-        newGlobalJson.JsonValue.WriteTo(tw, JsonSaveOptions.None)
-        traceImportant <| sprintf "Written (%O) to global.json as the current version will use this version from now on as current in the build" version
+        let newVersionsJson = VersionsJson.Root (versionsNode)
+        use tw = new StreamWriter("versions.json")
+        newVersionsJson.JsonValue.WriteTo(tw, JsonSaveOptions.None)
+        traceImportant <| sprintf "Written (%O) to versions.json as the current version will use this version from now on as current in the build" version
 
     type AssemblyVersionInfo = { Informational: SemVerInfo; Assembly: SemVerInfo; AssemblyFile: SemVerInfo; Project: ProjectInfo }
     let VersionInfo project =
@@ -53,15 +53,15 @@ module Versioning =
             match (Commandline.project) with 
             | p when p = project -> if (isNullOrEmpty bv) then None else Some(parse(bv))
             | _ -> Some(parse(versionOf project))
-        let target =getBuildParam "target"
+        let target = getBuildParam "target"
         let isCurrentProject = project = Commandline.project
         match (target, buildVersion, isCurrentProject) with
         | ("release", None, _) -> failwithf "can not run release because no explicit version number was passed on the command line"
         | ("release", Some v, true) ->
             if (currentVersion >= v) then failwithf "tried to create release %O for project %O but current version is already at %O" v project currentVersion
             { Informational= v; Assembly= assemblyVersionOf v; AssemblyFile = assemblyFileVersionOf v; Project = infoOf project }
         | _ ->
-            tracefn "Not running 'release' target or %O is not the release current release target (%O) so using version in global.json (%O) as current" project (Commandline.project) currentVersion
+            tracefn "Not running 'release' target or %O is not the release current release target (%O) so using version in versions.json (%O) as current" project (Commandline.project) currentVersion
             { Informational= currentVersion; Assembly= assemblyVersionOf currentVersion; AssemblyFile = assemblyFileVersionOf currentVersion; Project = infoOf project}
 
     let AllProjectVersions = Project.All |> Seq.map VersionInfo

global.json

@@ -1,8 +1,5 @@
 {
   "sdk": {
     "version": "2.1.300"
-  },
-  "versions": {
-    "proc": "v0.3.6"
   }
 }

src/Proc.Tests/LineOutputTests.cs

@@ -58,13 +58,15 @@ Windows IP Configuration
    Media State . . . . . . . . . . . : Media disconnected
    Connection-specific DNS Suffix  . :";
 
-		private readonly string[] _expectedLines = _expected.Split(new [] {Environment.NewLine}, StringSplitOptions.None);
+		private readonly string[] _expectedLines = _expected.Replace("\r\n", "\n").Split(new [] {"\n"}, StringSplitOptions.None);
 
 		[Fact]
 		public void ProcSeesAllLines()
 		{
 			var args = TestCaseArguments("MoreText");
 			var result = Proc.Start(args, WaitTimeout);
+			result.ExitCode.Should().HaveValue();
+			result.Completed.Should().BeTrue();
 			result.ConsoleOut.Should().NotBeEmpty().And.HaveCount(_expectedLines.Length);
 			for (var i = 0; i < result.ConsoleOut.Count; i++)
 				result.ConsoleOut[i].Line.Should().Be(_expectedLines[i], i.ToString());
@@ -88,6 +90,8 @@ public void ConsoleWriterSeesAllLines()
 			var writer = new TestConsoleOutWriter();
 			var args = TestCaseArguments("MoreText");
 			var result = Proc.Start(args, WaitTimeout, writer);
+			result.ExitCode.Should().HaveValue();
+			result.Completed.Should().BeTrue();
 			var lines = writer.Lines;
 			lines.Should().NotBeEmpty().And.HaveCount(_expectedLines.Length + 1);
 			for (var i = 0; i < lines.Length - 1; i++)
@@ -97,7 +101,7 @@ public void ConsoleWriterSeesAllLines()
 		public class TestConsoleOutWriter : IConsoleOutWriter
 		{
 			private readonly StringBuilder _sb = new StringBuilder();
-			public string[] Lines => _sb.ToString().Split(new [] {Environment.NewLine}, StringSplitOptions.None);
+			public string[] Lines => _sb.ToString().Replace("\r\n", "\n").Split(new [] {"\n"}, StringSplitOptions.None);
 			public string Text => _sb.ToString();
 
 			public void Write(Exception e) => throw e;

src/Proc.Tests/Proc.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>Proc.Tests</AssemblyName>
     <RootNamespace>ProcNet.Tests</RootNamespace>
   </PropertyGroup>

src/Proc.sln

@@ -8,13 +8,13 @@ ProjectSection(SolutionItems) = preProject
 	..\paket.dependencies = ..\paket.dependencies
 	..\global.json = ..\global.json
 	..\build\Versioning.targets = ..\build\Versioning.targets
-	..\build\outputpath.props = ..\build\outputpath.props
 	..\.editorconfig = ..\.editorconfig
 	..\.gitignore = ..\.gitignore
 	..\build.bat = ..\build.bat
 	..\build.sh = ..\build.sh
 	..\readme.md = ..\readme.md
-	..\nuget.config = ..\nuget.config
+	..\versions.json = ..\versions.json
+	outputpath.props = outputpath.props
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Proc.Tests.Binary", "Proc.Tests.Binary\Proc.Tests.Binary.csproj", "{D3AFFBE0-8F40-42C7-8A6A-BCCD2EDF4A3E}"

src/Proc/BufferedObservableProcess.cs

@@ -139,8 +139,8 @@ public void StartAsyncReads()
 				this.Process.StandardOutput.BaseStream.Flush();
 				this.Process.StandardError.BaseStream.Flush();
 
-				this._stdOutSubscription = this.Process.ObserveStandardOutBuffered(_observer, BufferSize, ContinueReadingFromProcessReaders, _ctx.Token);
-				this._stdErrSubscription = this.Process.ObserveErrorOutBuffered(_observer, BufferSize, ContinueReadingFromProcessReaders, _ctx.Token);
+				this._stdOutSubscription = this.Process.ObserveStandardOutBuffered(_observer, BufferSize, () => this.ContinueReadingFromProcessReaders(), _ctx.Token);
+				this._stdErrSubscription = this.Process.ObserveErrorOutBuffered(_observer, BufferSize, () => this.ContinueReadingFromProcessReaders(), _ctx.Token);
 				this._reading = true;
 			}
 		}

src/Proc/Embedded/Proc.ControlC.exe

@@ -57,15 +57,6 @@ protected override IObservable<CharactersOut> CreateConsoleOutObservable()
 
 		private static readonly char[] NewlineChars = Environment.NewLine.ToCharArray();
 
-		private readonly ManualResetEvent _subscribeWaitHandle = new ManualResetEvent(false);
-		private bool _waitLines;
-		protected override WaitHandle[] CompletionHandles()
-		{
-			if (!_waitLines) return base.CompletionHandles();
-			var waitHandles = base.CompletionHandles();
-			return new List<WaitHandle>(waitHandles) { this._subscribeWaitHandle }.ToArray();
-		}
-
 		/// <summary>
 		/// Subclasses can implement this and return true to stop buffering lines.
 		/// This is great for long running processes to only buffer console output until
@@ -92,7 +83,6 @@ protected virtual bool BufferBoundary(char[] stdOut, char[] stdErr)
 
 		public IDisposable Subscribe(IObserver<LineOut> observer)
 		{
-			this._waitLines = true;
 			var published = this.OutStream.Publish();
 			var boundaries = published
 				.Where(o => o.EndsWithNewLine || o.StartsWithCarriage || this.BufferBoundary(_bufferStdOutRemainder, _bufferStdErrRemainder));
@@ -111,12 +101,12 @@ public IDisposable Subscribe(IObserver<LineOut> observer)
 					e =>
 					{
 						observer.OnError(e);
-						_subscribeWaitHandle.Set();
+						SetCompletedHandle();
 					},
 					() =>
 					{
 						observer.OnCompleted();
-						_subscribeWaitHandle.Set();
+						SetCompletedHandle();
 					});
 			var connected = published.Connect();
 			return new CompositeDisposable(newlines, connected);