Use generic weakref instead

h3xds1nz · h3xds1nz · commit 99b9573da56c · 2025-01-28T15:47:14.000+01:00
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/MS/Impl/AssemblyNamespacePair.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/MS/Impl/AssemblyNamespacePair.cs
@@ -13,23 +13,23 @@ namespace System.Xaml.MS.Impl
     [DebuggerDisplay("{ClrNamespace} {Assembly.FullName}")]
     internal readonly struct AssemblyNamespacePair
     {
-        private readonly WeakReference _assembly;
+        private readonly WeakReference<Assembly> _assembly;
         private readonly string _clrNamespace;
 
         public AssemblyNamespacePair(Assembly asm, string clrNamespace)
         {
-            _assembly = new WeakReference(asm);
+            _assembly = new WeakReference<Assembly>(asm);
             _clrNamespace = clrNamespace;
         }
 
         public Assembly? Assembly
         {
-            get { return (Assembly?)_assembly.Target; }
+            get => _assembly.TryGetTarget(out Assembly? assembly) ? assembly : null;
         }
 
         public string ClrNamespace
         {
-            get { return _clrNamespace; }
+            get => _clrNamespace;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,23 +13,23 @@ namespace System.Xaml.MS.Impl`
`13`	`13`	`[DebuggerDisplay("{ClrNamespace} {Assembly.FullName}")]`
`14`	`14`	`internal readonly struct AssemblyNamespacePair`
`15`	`15`	`{`
`16`		`- private readonly WeakReference _assembly;`
	`16`	`+ private readonly WeakReference<Assembly> _assembly;`
`17`	`17`	`private readonly string _clrNamespace;`
`18`	`18`
`19`	`19`	`public AssemblyNamespacePair(Assembly asm, string clrNamespace)`
`20`	`20`	`{`
`21`		`- _assembly = new WeakReference(asm);`
	`21`	`+ _assembly = new WeakReference<Assembly>(asm);`
`22`	`22`	`_clrNamespace = clrNamespace;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public Assembly? Assembly`
`26`	`26`	`{`
`27`		`- get { return (Assembly?)_assembly.Target; }`
	`27`	`+ get => _assembly.TryGetTarget(out Assembly? assembly) ? assembly : null;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public string ClrNamespace`
`31`	`31`	`{`
`32`		`- get { return _clrNamespace; }`
	`32`	`+ get => _clrNamespace;`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`