From 531588cf1c258292c3398031dd81d7b73456a216 Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:17:28 +0100
Subject: [PATCH 1/2] enable otel for desktop target

---
 tests/FSharp.Test.Utilities/CompilerAssert.fs            | 2 --
 tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj | 2 +-
 tests/FSharp.Test.Utilities/XunitHelpers.fs              | 9 ++++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/FSharp.Test.Utilities/CompilerAssert.fs b/tests/FSharp.Test.Utilities/CompilerAssert.fs
index 0f7baf597fb..cc5fb4c3e9b 100644
--- a/tests/FSharp.Test.Utilities/CompilerAssert.fs
+++ b/tests/FSharp.Test.Utilities/CompilerAssert.fs
@@ -59,8 +59,6 @@ module AssemblyResolver =
             match found() with
             | None -> Unchecked.defaultof<Assembly>
             | Some name -> Assembly.Load(name) )
-
-    do addResolver()
 #endif
 
 type ExecutionOutcome = 
diff --git a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
index 5b8f66bac7d..4a255384e07 100644
--- a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
+++ b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
@@ -33,7 +33,6 @@
     <None Include="ScriptingShims.fsx" />
     <Compile Include="TestConsole.fs" />
     <Compile Include="TestFramework.fs" />
-    <Compile Include="XunitHelpers.fs" />
     <Compile Include="ILChecker.fs" />
     <Compile Include="Utilities.fs" />
     <Compile Include="CompilerAssert.fs" />
@@ -46,6 +45,7 @@
     <Compile Include="FileInlineDataAttribute.fs" />
     <Compile Include="ReflectionHelper.fs" />
     <Compile Include="SurfaceArea.fs" />
+    <Compile Include="XunitHelpers.fs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/FSharp.Test.Utilities/XunitHelpers.fs b/tests/FSharp.Test.Utilities/XunitHelpers.fs
index 3a0049df5a8..567e3e62479 100644
--- a/tests/FSharp.Test.Utilities/XunitHelpers.fs
+++ b/tests/FSharp.Test.Utilities/XunitHelpers.fs
@@ -146,8 +146,10 @@ type FSharpXunitFramework(sink: IMessageSink) =
         log "FSharpXunitFramework with XUNIT_EXTRAS installing TestConsole redirection"
         TestConsole.install()
 
-// TODO: Currently does not work with Desktop .NET Framework. Upcoming OpenTelemetry 1.11.0 may change it.
-#if NETCOREAPP
+#if !NETCOREAPP
+        AssemblyResolver.addResolver ()
+#endif
+
     let traceProvider =
         Sdk.CreateTracerProviderBuilder()
                 .AddSource(ActivityNames.FscSourceName)
@@ -155,15 +157,12 @@ type FSharpXunitFramework(sink: IMessageSink) =
                     ResourceBuilder.CreateDefault().AddService(serviceName="F#", serviceVersion = "1.0.0"))
                 .AddOtlpExporter()
                 .Build()
-#endif
 
     interface IDisposable with
         member _.Dispose() =
             cleanUpTemporaryDirectoryOfThisTestRun ()
-#if NETCOREAPP
             traceProvider.ForceFlush() |> ignore
             traceProvider.Dispose()
-#endif
             base.Dispose()        
 
     override this.CreateDiscoverer (assemblyInfo) =

From 0041777cec4e15210bfa53b202d82cb9cd89bcda Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Mon, 13 Jan 2025 18:32:41 +0100
Subject: [PATCH 2/2] make sure it does not break things

---
 tests/FSharp.Test.Utilities/XunitHelpers.fs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/FSharp.Test.Utilities/XunitHelpers.fs b/tests/FSharp.Test.Utilities/XunitHelpers.fs
index 567e3e62479..d93884b5d31 100644
--- a/tests/FSharp.Test.Utilities/XunitHelpers.fs
+++ b/tests/FSharp.Test.Utilities/XunitHelpers.fs
@@ -31,6 +31,9 @@ type FSharpXunitFramework(sink: IMessageSink) =
         // This gets executed once per test assembly.
         MessageSink.sinkWriter |> ignore
         TestConsole.install()
+#if !NETCOREAPP
+        AssemblyResolver.addResolver ()
+#endif
 
     interface IDisposable with
         member _.Dispose() =