Merge pull request #2694 from fsprojects/release/next

`5.23.0` release
fsprojects · Aug 1, 2022 · 517659c · 517659c
2 parents 89e4d9c + c026863
commit 517659c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 5.23.0 - 2022-08-01
+* ENHANCEMENT: Fake.Core.Process: stop using old ref-cell operators, thanks @knocte - https://github.com/fsprojects/FAKE/pull/2674
+* BUGFIX: Fixes #2600, thanks @yazeedobaid - https://github.com/fsprojects/FAKE/issues/2600
+
 ## 5.23.0-alpha002 - 2022-07-22
 * ENHANCEMENT: GitHubCI: stop restricting build+test jobs to release/next branch, thanks @knocte - https://github.com/fsprojects/FAKE/pull/2673
 * BUGFIX: Fix getLastTag, thanks @akhansari - https://github.com/fsprojects/FAKE/issues/2677

diff --git a/src/app/Fake.Core.Process/InternalStreams.fs b/src/app/Fake.Core.Process/InternalStreams.fs
@@ -100,13 +100,13 @@ module internal InternalStreams =
             let asyncResult = ref null
             Async.FromBeginEnd(
                 (fun (callback, state) -> 
-                    asyncResult := beginAction(callback, state)
-                    !asyncResult), 
+                    asyncResult.Value <- beginAction(callback, state)
+                    asyncResult.Value),
                 (fun res -> 
                     endAction res), 
                 cancelAction  = (fun () -> 
-                    while !asyncResult = null do Thread.Sleep 20
-                    cancelAction(!asyncResult)))
+                    while asyncResult.Value = null do Thread.Sleep 20
+                    cancelAction(asyncResult.Value)))
     open AsyncHelper
 
     type ConcurrentQueueMessage<'a> =
@@ -232,12 +232,12 @@ module internal InternalStreams =
                 while not cts.IsCancellationRequested do
                     let! data = innerStream.Read()
                     let finished = ref false
-                    while not !finished do
+                    while not finished.Value do
                         let! (asyncResult:MyIAsyncReadResult<'a>) = queue.DequeAsync()
                         if not asyncResult.IsCanceled then
                             try
                                 asyncResult.End(data)
-                                finished := true
+                                finished.Value <- true
                             with ReadCanceledException -> () // find next
                 return ()
             }, cancellationToken = workerCts.Token)
@@ -466,7 +466,7 @@ module internal InternalStreams =
             //let raw = infiniteStream()
             let readFinished = ref false
             let read () =
-                if !readFinished then
+                if readFinished.Value then
                    async.Return None
                 else 
                   async {
@@ -477,16 +477,16 @@ module internal InternalStreams =
                             match s with
                             | Some d -> Some d
                             | None -> 
-                                readFinished := true
+                                readFinished.Value <- true
                                 None
                         | None -> 
                             failwith "stream should not be limited as we are using an infiniteStream!" }
             let isFinished = ref false
             let finish () = async {
                 do! raw.Write None
-                isFinished := true }
+                isFinished.Value <- true }
             let write item = 
-                if !isFinished then
+                if isFinished.Value then
                     failwith "stream is in finished state so it should not be written to!"
                 raw.Write (Some item)
             finish,

diff --git a/src/app/Fake.Core.Process/RawProc.fs b/src/app/Fake.Core.Process/RawProc.fs
@@ -33,7 +33,9 @@ module EnvMap =
         else IMap.empty
 
     let ofSeq l : EnvMap =
-        empty.AddRange(l |> Seq.map (fun (k, v) -> KeyValuePair<_,_>(k, v)))
+        empty
+            .AddRange(Environment.environVars () |> Seq.map (fun (k, v) -> KeyValuePair<_,_>(k, v)))
+            .AddRange(l |> Seq.map (fun (k, v) -> KeyValuePair<_,_>(k, v)))
 
     let create() =
         ofSeq (Environment.environVars ())