Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/debugger-libs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluis Sanchez <llsan@microsoft.com>2021-08-23 11:07:07 +0300
committerLluis Sanchez <llsan@microsoft.com>2021-08-24 11:16:45 +0300
commiteaf83aacd4f5b41e240ceb3a61dd49f64227370f (patch)
treecc0c5a8a6401197c34e6cdfb08a60b1b962e6173 /Mono.Debugging
parentc4f02830a50213586e7d834471b90ce38350738d (diff)
Add support for .net 6
For now, just removed some code that doesn't work
Diffstat (limited to 'Mono.Debugging')
-rw-r--r--Mono.Debugging/Mono.Debugging.Client/ObjectValue.cs2
-rw-r--r--Mono.Debugging/Mono.Debugging.Evaluation/RemoteFrameObject.cs2
-rw-r--r--Mono.Debugging/Mono.Debugging.csproj2
3 files changed, 5 insertions, 1 deletions
diff --git a/Mono.Debugging/Mono.Debugging.Client/ObjectValue.cs b/Mono.Debugging/Mono.Debugging.Client/ObjectValue.cs
index ad1cebd..ffb6c4a 100644
--- a/Mono.Debugging/Mono.Debugging.Client/ObjectValue.cs
+++ b/Mono.Debugging/Mono.Debugging.Client/ObjectValue.cs
@@ -816,8 +816,10 @@ namespace Mono.Debugging.Client
~ObjectValue ()
{
+#if !NETCOREAPP
if (updateCallback != null)
System.Runtime.Remoting.RemotingServices.Disconnect ((UpdateCallbackProxy)updateCallback.Callback);
+#endif
}
internal static void ConnectCallbacks (StackFrame parentFrame, params ObjectValue[] values)
diff --git a/Mono.Debugging/Mono.Debugging.Evaluation/RemoteFrameObject.cs b/Mono.Debugging/Mono.Debugging.Evaluation/RemoteFrameObject.cs
index e4411eb..7afb725 100644
--- a/Mono.Debugging/Mono.Debugging.Evaluation/RemoteFrameObject.cs
+++ b/Mono.Debugging/Mono.Debugging.Evaluation/RemoteFrameObject.cs
@@ -59,7 +59,9 @@ namespace Mono.Debugging.Evaluation
{
lock (connectedValues) {
foreach (RemoteFrameObject val in connectedValues) {
+#if !NETCOREAPP
System.Runtime.Remoting.RemotingServices.Disconnect (val);
+#endif
IDisposable disp = val as IDisposable;
if (disp != null)
disp.Dispose ();
diff --git a/Mono.Debugging/Mono.Debugging.csproj b/Mono.Debugging/Mono.Debugging.csproj
index 2f302a4..d5f261b 100644
--- a/Mono.Debugging/Mono.Debugging.csproj
+++ b/Mono.Debugging/Mono.Debugging.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net472</TargetFramework>
+ <TargetFrameworks>net6.0;net472</TargetFrameworks>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>mono.debugging.snk</AssemblyOriginatorKeyFile>
<NoWarn>1591;1573</NoWarn>