diff --git a/.editorconfig b/.editorconfig
index c3058de..ff8681f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -427,6 +427,8 @@ dotnet_diagnostic.SX1101.severity = error
 dotnet_diagnostic.SX1309.severity = error
 dotnet_diagnostic.SX1623.severity = none
 
+dotnet_diagnostic.AD0001.severity = none
+
 # C++ Files
 [*.{cpp,h,in}]
 curly_bracket_next_line = true
diff --git a/src/ReactiveMarbles.ObservableEvents.SourceGenerator/EventGenerator.cs b/src/ReactiveMarbles.ObservableEvents.SourceGenerator/EventGenerator.cs
index 990e824..e8d3af9 100644
--- a/src/ReactiveMarbles.ObservableEvents.SourceGenerator/EventGenerator.cs
+++ b/src/ReactiveMarbles.ObservableEvents.SourceGenerator/EventGenerator.cs
@@ -202,9 +202,7 @@ private static bool GenerateEvents(
                 return true;
             }
 
-#pragma warning disable RS1024 // Compare symbols correctly
-            var processedItems = new HashSet<INamedTypeSymbol>(TypeDefinitionNameComparer.Default);
-#pragma warning restore RS1024 // Compare symbols correctly
+            var processedItems = new HashSet<INamedTypeSymbol>(SymbolEqualityComparer.Default);
 
             var fileType = isStatic ? "Static" : "Instance";
 
diff --git a/src/ReactiveMarbles.ObservableEvents.SourceGenerator/ReactiveMarbles.ObservableEvents.SourceGenerator.csproj b/src/ReactiveMarbles.ObservableEvents.SourceGenerator/ReactiveMarbles.ObservableEvents.SourceGenerator.csproj
index ffb0d88..216895b 100644
--- a/src/ReactiveMarbles.ObservableEvents.SourceGenerator/ReactiveMarbles.ObservableEvents.SourceGenerator.csproj
+++ b/src/ReactiveMarbles.ObservableEvents.SourceGenerator/ReactiveMarbles.ObservableEvents.SourceGenerator.csproj
@@ -1,15 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<LangVersion>latest</LangVersion>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
     <DevelopmentDependency>true</DevelopmentDependency>
-	</PropertyGroup>
+    <NoWarn>$(NoWarn);AD0001</NoWarn>
+  </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
-		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>