perf: Enable CA1821 (Remove empty finalizers)

unoplatform · Sep 5, 2022 · 3669fee · 3669fee
1 parent 95f45dc
commit 3669fee
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 24 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -238,6 +238,7 @@ dotnet_diagnostic.RS0030.severity = error
 dotnet_analyzer_diagnostic.category-Performance.severity = none #error - Uncomment when all violations are fixed.
 
 dotnet_diagnostic.CA1805.severity = error
+dotnet_diagnostic.CA1821.severity = error
 dotnet_diagnostic.CA1061.severity = none
 dotnet_diagnostic.CA1802.severity = none
 dotnet_diagnostic.CA1014.severity = none
@@ -326,7 +327,6 @@ dotnet_diagnostic.CA1806.severity = none
 dotnet_diagnostic.CA1834.severity = none
 dotnet_diagnostic.CA1713.severity = none
 dotnet_diagnostic.CA1054.severity = none
-dotnet_diagnostic.CA1821.severity = none
 dotnet_diagnostic.CA1055.severity = none
 dotnet_diagnostic.CA2002.severity = none
 dotnet_diagnostic.CA2109.severity = none

diff --git a/src/SourceGenerators/System.Xaml/System.Xaml/XamlSchemaContext.cs b/src/SourceGenerators/System.Xaml/System.Xaml/XamlSchemaContext.cs
@@ -102,13 +102,13 @@ void Hook(object o, AssemblyLoadEventArgs e)
 #endif
 		}
 
+#if SUPPORTS_LOAD_ASSEMBLIES
 		~XamlSchemaContext ()
 		{
-#if SUPPORTS_LOAD_ASSEMBLIES
 			if (reference_assemblies == null)
 				unhookAssemblyLoad?.Invoke();
-#endif
 		}
+#endif
 
 		IList<Assembly> reference_assemblies;
 

diff --git a/src/Uno.UI/DirectUI/JoltCollections.h.cs b/src/Uno.UI/DirectUI/JoltCollections.h.cs
@@ -118,10 +118,10 @@ protected IteratorBase()
 			m_nCurrentIndex = 0;
 		}
 
-		~IteratorBase()
-		{
+		//~IteratorBase()
+		//{
 			//IsDebuggerPresent(); // TODO UNO
-		}
+		//}
 
 		protected abstract T GetCurrent();
 		protected abstract void SetCurrent(T current);

diff --git a/...Controls/PullToRefresh/ScrollViewerIRefreshInfoProviderAdapter/RefreshInfoProviderImpl.cs b/...Controls/PullToRefresh/ScrollViewerIRefreshInfoProviderAdapter/RefreshInfoProviderImpl.cs
@@ -31,10 +31,10 @@ public RefreshInfoProviderImpl()
 		//PTR_TRACE_INFO(null, TRACE_MSG_METH, METH_NAME, this);
 	}
 
-	~RefreshInfoProviderImpl()
-	{
+	//~RefreshInfoProviderImpl()
+	//{
 		//PTR_TRACE_INFO(null, TRACE_MSG_METH, METH_NAME, this);
-	}
+	//}
 
 	public RefreshInfoProviderImpl(RefreshPullDirection refreshPullDirection, Size refreshVisualizerSize, Compositor compositor)
 	{

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/RatingControl/RatingControl.cs
@@ -69,12 +69,12 @@ private void RatingControl_Unloaded(object sender, RoutedEventArgs e)
 			RecycleEvents(true /* useSafeGet */);
 		}
 
-		~RatingControl()
-		{
+		//~RatingControl()
+		//{
 			// We only need to use safe_get in the deruction loop
 			// We don't need to unload events
 			// RecycleEvents(true /* useSafeGet */);
-		}
+		//}
 
 		private float RenderingRatingFontSize()
 		{

diff --git a/src/Uno.UI/UI/Xaml/Controls/NavigationView/NavigationView.cs b/src/Uno.UI/UI/Xaml/Controls/NavigationView/NavigationView.cs
@@ -101,11 +101,6 @@ public partial class NavigationView : ContentControl
 
 		private SerialDisposable _settingsItemSubscriptions = new SerialDisposable();
 
-		~NavigationView()
-		{
-
-		}
-
 		void UnhookEventsAndClearFields(bool isFromDestructor = false)
 		{
 		}

diff --git a/src/Uno.UI/UI/Xaml/Controls/NavigationView/NavigationViewItem.cs b/src/Uno.UI/UI/Xaml/Controls/NavigationView/NavigationViewItem.cs
@@ -86,10 +86,6 @@ private void NavigationViewItem_Loaded(object sender, RoutedEventArgs e)
 			}
 		}
 
-		~NavigationViewItem()
-		{
-		}
-
 		protected override void OnApplyTemplate()
 		{
 			// Stop UpdateLocalVisualState before template is applied. Otherwise the visual may not the same as we expect

diff --git a/...I/Xaml/Controls/Primitives/LoopingSelector/LoopingSelectorItemAutomationPeer_Partial.h.cs b/...I/Xaml/Controls/Primitives/LoopingSelector/LoopingSelectorItemAutomationPeer_Partial.h.cs
@@ -30,8 +30,6 @@ public partial class LoopingSelectorItemAutomationPeer : FrameworkElementAutomat
 
 		// private
 
-		~LoopingSelectorItemAutomationPeer() { }
-
 		//void InitializeImpl(
 		//	LoopingSelectorItem pOwner);
 

diff --git a/src/Uno.UI/UI/Xaml/Controls/Primitives/LoopingSelector/LoopingSelectorItem_Partial.h.cs b/src/Uno.UI/UI/Xaml/Controls/Primitives/LoopingSelector/LoopingSelectorItem_Partial.h.cs
@@ -63,7 +63,6 @@ internal void GetParentNoRef(out LoopingSelector ppValue)
 		//void OnPointerCaptureLostImpl(PointerRoutedEventArgs e);
 
 		// private
-		~LoopingSelectorItem() { }
 
 		//void InitializeImpl();