Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dynamic load of QueryDebugger #1968

Merged
merged 1 commit into from
Jun 14, 2023
Merged

Remove dynamic load of QueryDebugger #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Rx.NET/Documentation/ReleaseHistory/Rx.v6.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Rx Release History v6.0

## v6.0.0-preview
## v6.0.1-preview

This release fixes [Issue #1942: "AOT compilation produces single trim analysis warning"](https://github.com/dotnet/reactive/issues/1942)

## v6.0.0

### Breaking changes

Expand Down
20 changes: 1 addition & 19 deletions Rx.NET/Source/src/System.Reactive/Internal/CurrentPlatformEnlightenmentProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,27 +68,9 @@ public class CurrentPlatformEnlightenmentProvider : IPlatformEnlightenmentProvid
// expectation it'd be pretty hard to turn on interception dynamically
// upon a debugger attach event, so we should make this check early.
//
// In the initial release of v2.0 (RTM), we won't have the corresponding
// debugger assembly available yet, so the dynamic load would always
// fail. We also don't want to take the price of (an attempt to) a dynamic
// assembly load for the regular production case.
//
if (Debugger.IsAttached)
{
var ifType = t.GetTypeInfo();

var asm = new AssemblyName(ifType.Assembly.FullName!)
{
Name = "System.Reactive"
};

var name = "System.Reactive.Linq.QueryDebugger, " + asm.FullName;

var dbg = Type.GetType(name, false);
if (dbg != null)
{
return (T?)Activator.CreateInstance(dbg);
}
return (T)(object)new QueryDebugger();
}
}

Expand Down
2 changes: 1 addition & 1 deletion Rx.NET/Source/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.0.0-preview.{height}",
"version": "6.0.1-preview.{height}",
"publicReleaseRefSpec": [
"^refs/heads/main$", // we release out of main
"^refs/heads/rel/v\\d+\\.\\d+", // we also release branches starting with rel/vN.N
Expand Down