File tree Expand file tree Collapse file tree 3 files changed +8
-8
lines changed
tests/FSharp.Test.Utilities Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -59,8 +59,6 @@ module AssemblyResolver =
59
59
match found() with
60
60
| None -> Unchecked.defaultof< Assembly>
61
61
| Some name -> Assembly.Load( name) )
62
-
63
- do addResolver()
64
62
#endif
65
63
66
64
type ExecutionOutcome =
Original file line number Diff line number Diff line change 33
33
<None Include =" ScriptingShims.fsx" />
34
34
<Compile Include =" TestConsole.fs" />
35
35
<Compile Include =" TestFramework.fs" />
36
- <Compile Include =" XunitHelpers.fs" />
37
36
<Compile Include =" ILChecker.fs" />
38
37
<Compile Include =" Utilities.fs" />
39
38
<Compile Include =" CompilerAssert.fs" />
46
45
<Compile Include =" FileInlineDataAttribute.fs" />
47
46
<Compile Include =" ReflectionHelper.fs" />
48
47
<Compile Include =" SurfaceArea.fs" />
48
+ <Compile Include =" XunitHelpers.fs" />
49
49
</ItemGroup >
50
50
51
51
<ItemGroup >
Original file line number Diff line number Diff line change @@ -31,6 +31,9 @@ type FSharpXunitFramework(sink: IMessageSink) =
31
31
// This gets executed once per test assembly.
32
32
MessageSink.sinkWriter |> ignore
33
33
TestConsole.install()
34
+ #if ! NETCOREAPP
35
+ AssemblyResolver.addResolver ()
36
+ #endif
34
37
35
38
interface IDisposable with
36
39
member _.Dispose () =
@@ -148,24 +151,23 @@ type FSharpXunitFramework(sink: IMessageSink) =
148
151
log " FSharpXunitFramework with XUNIT_EXTRAS installing TestConsole redirection"
149
152
TestConsole.install()
150
153
151
- // TODO: Currently does not work with Desktop .NET Framework. Upcoming OpenTelemetry 1.11.0 may change it.
152
- #if NETCOREAPP
154
+ #if ! NETCOREAPP
155
+ AssemblyResolver.addResolver ()
156
+ #endif
157
+
153
158
let traceProvider =
154
159
Sdk.CreateTracerProviderBuilder()
155
160
.AddSource( ActivityNames.FscSourceName)
156
161
.SetResourceBuilder(
157
162
ResourceBuilder.CreateDefault() .AddService( serviceName= " F#" , serviceVersion = " 1.0.0" ))
158
163
.AddOtlpExporter()
159
164
.Build()
160
- #endif
161
165
162
166
interface IDisposable with
163
167
member _.Dispose () =
164
168
cleanUpTemporaryDirectoryOfThisTestRun ()
165
- #if NETCOREAPP
166
169
traceProvider.ForceFlush() |> ignore
167
170
traceProvider.Dispose()
168
- #endif
169
171
base .Dispose()
170
172
171
173
override this.CreateDiscoverer ( assemblyInfo ) =
You can’t perform that action at this time.
0 commit comments