diff --git a/build/AnalyzerProject.targets b/build/AnalyzerProject.targets
index c1b96ebe04..4a95cb306e 100644
--- a/build/AnalyzerProject.targets
+++ b/build/AnalyzerProject.targets
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <EnforceExtendedAnalyzerRules Condition="'$(EnforceExtendedAnalyzerRules)' == ''">true</EnforceExtendedAnalyzerRules>
     <IsRoslynComponent Condition="'$(IsRoslynComponent)' == ''">true</IsRoslynComponent>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <NoWarn>$(NoWarn);RS2008</NoWarn>
   </PropertyGroup>
 
diff --git a/external/Numerge b/external/Numerge
index 9738c6121f..5530e1cbe9 160000
--- a/external/Numerge
+++ b/external/Numerge
@@ -1 +1 @@
-Subproject commit 9738c6121fdd143c78d3e25686a7e4e13c00f586
+Subproject commit 5530e1cbe9e105ff4ebc9da1f4af3253a8756754
diff --git a/nukebuild/.editorconfig b/nukebuild/.editorconfig
index c11849c8e9..d6009b3c0f 100644
--- a/nukebuild/.editorconfig
+++ b/nukebuild/.editorconfig
@@ -6,12 +6,3 @@ root = false
 # C# files
 [*.cs]
 dotnet_style_require_accessibility_modifiers = never
-
-[{il-repack,Numerge}/**/*.cs]
-dotnet_diagnostic.CA1304.severity = none
-dotnet_diagnostic.CA1815.severity = none
-dotnet_diagnostic.CA1820.severity = none
-dotnet_diagnostic.CA1825.severity = none
-dotnet_diagnostic.CA1829.severity = none
-dotnet_diagnostic.CA1847.severity = none
-dotnet_diagnostic.SYSLIB0017.severity = none
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index 075715346d..d56ed55a72 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -4,7 +4,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
-    <NoWarn>$(NoWarn);CS0649;CS0169;SYSLIB0011</NoWarn>
+    <NoWarn>$(NoWarn);CS0649;CA1847</NoWarn>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
     <TargetFramework>$(AvsCurrentTargetFramework)</TargetFramework>
     <!-- See https://github.com/nuke-build/nuke/issues/818 -->
diff --git a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
index 65929f1357..313e66b207 100644
--- a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
+++ b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
@@ -6,6 +6,7 @@
       <BuildOutputTargetFolder>tools</BuildOutputTargetFolder>
       <DefineConstants>$(DefineConstants);BUILDTASK;XAMLX_CECIL_INTERNAL;XAMLX_INTERNAL</DefineConstants>
       <CopyLocalLockFileAssemblies Condition="$(TargetFramework) == 'netstandard2.0'">true</CopyLocalLockFileAssemblies>
+      <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
       <NoWarn>$(NoWarn);NU1605;CS8632</NoWarn>
       <DebugType>embedded</DebugType>
       <IncludeSymbols>false</IncludeSymbols>