Sep 24, 2020 · Oct 22, 2020 · Oct 22, 2020 · Dec 10, 2020 · Dec 21, 2020 · Dec 21, 2020
diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj

  <PropertyGroup>
    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
    <LangVersion>9.0</LangVersion>
    <AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
    <SignAssembly>true</SignAssembly>
  </PropertyGroup>
diff --git a/src/embed_tests/TestClass.cs b/src/embed_tests/TestClass.cs
        public void WeakRefForClrObject()
        {
            var obj = new MyClass();
            using (var scope = Py.CreateScope())
            {
                scope.Set("clr_obj", obj);
                scope.Exec(@"
            using var scope = Py.CreateScope();
            scope.Set("clr_obj", obj);
            scope.Exec(@"
 import weakref
 ref = weakref.ref(clr_obj)
 ");
                using (PyObject pyobj = scope.Get("clr_obj"))
                {
                    ValidateAttachedGCHandle(obj, pyobj.Handle);
                }
            }
            using PyObject pyobj = scope.Get("clr_obj");
            ValidateAttachedGCHandle(obj, pyobj.Handle);
        }

        [Test]
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
            flags |= TypeFlags.Subclass;
            flags |= TypeFlags.HaveGC;
            Util.WriteCLong(type, TypeOffset.tp_flags, flags);

            //TypeManager.CopySlot(base_type, type, TypeOffset.tp_dealloc);

            // Hmm - the standard subtype_traverse, clear look at ob_size to
            // do things, so to allow gc to work correctly we need to move
            // our hidden handle out of ob_size. Then, in theory we can
            // comment this out and still not crash.
            //TypeManager.CopySlot(base_type, type, TypeOffset.tp_traverse);
            //TypeManager.CopySlot(base_type, type, TypeOffset.tp_clear);

            // for now, move up hidden handle...
            unsafe
            {
    [StructLayout(LayoutKind.Sequential)]
    struct ClrMetaTypeEx
    {
        publicIntPtr ClrHandleOffset;
        publicnint ClrHandleOffset;
        public IntPtr ClrHandle;

        public static unsafe ClrMetaTypeEx* FromType(IntPtr type)
diff --git a/src/runtime/native/TypeOffset.cs b/src/runtime/native/TypeOffset.cs
                int value = (int)sourceProperty.GetValue(offsets, null);
                offsetProperty.SetValue(obj: null, value: value, index: null);
            }
            Size = (int)Marshal.ReadIntPtr(Runtime.PyTypeType, tp_basicsize); ;
            Size = (int)Marshal.ReadIntPtr(Runtime.PyTypeType, tp_basicsize);
            ValidateUnusedTypeOffsetProperties(offsetProperties);
            ValidateRequiredOffsetsPresent(offsetProperties);
        }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,7 @@

		<PropertyGroup>
		<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
		<LangVersion>9.0</LangVersion>
		<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
		<SignAssembly>true</SignAssembly>
		</PropertyGroup>
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,18 +31,14 @@ public void Dispose()
		public void WeakRefForClrObject()
		{
		var obj = new MyClass();
		using (var scope = Py.CreateScope())
		{
		scope.Set("clr_obj", obj);
		scope.Exec(@"
		using var scope = Py.CreateScope();
		scope.Set("clr_obj", obj);
		scope.Exec(@"
		import weakref
		ref = weakref.ref(clr_obj)
		");
		using (PyObject pyobj = scope.Get("clr_obj"))
		{
		ValidateAttachedGCHandle(obj, pyobj.Handle);
		}
		}
		using PyObject pyobj = scope.Get("clr_obj");
		ValidateAttachedGCHandle(obj, pyobj.Handle);
		}

		[Test]
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -155,16 +155,6 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)
		flags \|= TypeFlags.Subclass;
		flags \|= TypeFlags.HaveGC;
		Util.WriteCLong(type, TypeOffset.tp_flags, flags);

		//TypeManager.CopySlot(base_type, type, TypeOffset.tp_dealloc);

		// Hmm - the standard subtype_traverse, clear look at ob_size to
		// do things, so to allow gc to work correctly we need to move
		// our hidden handle out of ob_size. Then, in theory we can
		// comment this out and still not crash.
		//TypeManager.CopySlot(base_type, type, TypeOffset.tp_traverse);
		//TypeManager.CopySlot(base_type, type, TypeOffset.tp_clear);

		// for now, move up hidden handle...
		unsafe
		{
Expand DownExpand Up		@@ -361,7 +351,7 @@ public static IntPtr __subclasscheck__(IntPtr tp, IntPtr args)
		[StructLayout(LayoutKind.Sequential)]
		struct ClrMetaTypeEx
		{
		publicIntPtr ClrHandleOffset;
		publicnint ClrHandleOffset;
		public IntPtr ClrHandle;

		public static unsafe ClrMetaTypeEx* FromType(IntPtr type)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -94,7 +94,7 @@ internal static void Use(ITypeOffsets offsets)
		int value = (int)sourceProperty.GetValue(offsets, null);
		offsetProperty.SetValue(obj: null, value: value, index: null);
		}
		Size = (int)Marshal.ReadIntPtr(Runtime.PyTypeType, tp_basicsize); ;
		Size = (int)Marshal.ReadIntPtr(Runtime.PyTypeType, tp_basicsize);
		ValidateUnusedTypeOffsetProperties(offsetProperties);
		ValidateRequiredOffsetsPresent(offsetProperties);
		}
Expand Down