Skip to content

Commit 95d9ea9

Browse files
authored
Remove dynamic load of QueryDebugger (#1968)
1 parent f4f727c commit 95d9ea9

File tree

3 files changed

+7
-21
lines changed

3 files changed

+7
-21
lines changed

Rx.NET/Documentation/ReleaseHistory/Rx.v6.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Rx Release History v6.0
22

3-
## v6.0.0-preview
3+
## v6.0.1-preview
4+
5+
This release fixes [Issue #1942: "AOT compilation produces single trim analysis warning"](https://github.com/dotnet/reactive/issues/1942)
6+
7+
## v6.0.0
48

59
### Breaking changes
610

Rx.NET/Source/src/System.Reactive/Internal/CurrentPlatformEnlightenmentProvider.cs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -68,27 +68,9 @@ public class CurrentPlatformEnlightenmentProvider : IPlatformEnlightenmentProvid
6868
// expectation it'd be pretty hard to turn on interception dynamically
6969
// upon a debugger attach event, so we should make this check early.
7070
//
71-
// In the initial release of v2.0 (RTM), we won't have the corresponding
72-
// debugger assembly available yet, so the dynamic load would always
73-
// fail. We also don't want to take the price of (an attempt to) a dynamic
74-
// assembly load for the regular production case.
75-
//
7671
if (Debugger.IsAttached)
7772
{
78-
var ifType = t.GetTypeInfo();
79-
80-
var asm = new AssemblyName(ifType.Assembly.FullName!)
81-
{
82-
Name = "System.Reactive"
83-
};
84-
85-
var name = "System.Reactive.Linq.QueryDebugger, " + asm.FullName;
86-
87-
var dbg = Type.GetType(name, false);
88-
if (dbg != null)
89-
{
90-
return (T?)Activator.CreateInstance(dbg);
91-
}
73+
return (T)(object)new QueryDebugger();
9274
}
9375
}
9476

Rx.NET/Source/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.0.0-preview.{height}",
2+
"version": "6.0.1-preview.{height}",
33
"publicReleaseRefSpec": [
44
"^refs/heads/main$", // we release out of main
55
"^refs/heads/rel/v\\d+\\.\\d+", // we also release branches starting with rel/vN.N

0 commit comments

Comments
 (0)