Merge branch 'net6-updates' into net8-build

# Conflicts: # RELEASE_NOTES.md # build.fsx
fsprojects · Sep 22, 2024 · 8206f8d · 8206f8d
2 parents 3bead06 + d85ebb3
commit 8206f8d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -2,6 +2,8 @@
 ## 6.1.2 - 2024-09-03
 * Added .NET8.0 to package target libraries
 * Some dependency updates
+* Runtime-identifier update to more recent runtimes.
+* Removed .NETFrameworkAssembly attribute fix on detecting .NET assemblies.
 
 ## 6.1.1 - 2024-08-30
 * BUGFIX: Assembly resolver to pick a found SDK instead of first SDK, thanks @Thorium - https://github.com/fsprojects/FAKE/pull/2797/files

diff --git a/integrationtests/core-no-dependencies-hello-world/before/hello_world.fsx b/integrationtests/core-no-dependencies-hello-world/before/hello_world.fsx
@@ -1 +1,2 @@
-printfn "Hello FAKE"
+printfn "Hello FAKE"
+System.Threading.Thread.Sleep 500
diff --git a/src/app/Fake.Core.Process/Process.fs b/src/app/Fake.Core.Process/Process.fs
@@ -457,14 +457,19 @@ module Process =
             try
                 proc.StartTime
             with
+            | :? PlatformNotSupportedException
+            | :? NotSupportedException
             | :? InvalidOperationException
             | :? System.ComponentModel.Win32Exception as e ->
                 let hasExited =
                     try
                         proc.HasExited
                     with
                     | :? InvalidOperationException
-                    | :? System.ComponentModel.Win32Exception -> false
+                    | :? NotSupportedException
+                    | :? System.ComponentModel.Win32Exception as e2 ->
+                        Trace.traceFAKE "Error while retrieving HasExited of process: %O" e2
+                        false
 
                 if not hasExited then
                     Trace.traceFAKE "Error while retrieving StartTime of started process: %O" e