diff --git a/NetFabric.Hyperlinq.Analyzer.CodeFixes/NetFabric.Hyperlinq.Analyzer.CodeFixes.csproj b/NetFabric.Hyperlinq.Analyzer.CodeFixes/NetFabric.Hyperlinq.Analyzer.CodeFixes.csproj
index 5fa2352..322d0d9 100644
--- a/NetFabric.Hyperlinq.Analyzer.CodeFixes/NetFabric.Hyperlinq.Analyzer.CodeFixes.csproj
+++ b/NetFabric.Hyperlinq.Analyzer.CodeFixes/NetFabric.Hyperlinq.Analyzer.CodeFixes.csproj
@@ -8,7 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
+	  <PackageReference Include="NetFabric.CodeAnalysis" Version="5.1.0" />
+	  <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
+	  <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/NetFabric.Hyperlinq.Analyzer.Package/NetFabric.Hyperlinq.Analyzer.Package.csproj b/NetFabric.Hyperlinq.Analyzer.Package/NetFabric.Hyperlinq.Analyzer.Package.csproj
index 949f8a7..8e4cfb0 100644
--- a/NetFabric.Hyperlinq.Analyzer.Package/NetFabric.Hyperlinq.Analyzer.Package.csproj
+++ b/NetFabric.Hyperlinq.Analyzer.Package/NetFabric.Hyperlinq.Analyzer.Package.csproj
@@ -1,49 +1,78 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<IsPackable>true</IsPackable>
+		<IncludeBuildOutput>false</IncludeBuildOutput>
+		<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
+	<PropertyGroup>
+		<PackageId>NetFabric.Hyperlinq.Analyzer</PackageId>
+		<PackageVersion>2.3.1</PackageVersion>
+		<Authors>Antao Almada</Authors>
+		<PackageIcon>Icon.png</PackageIcon>
+		<PackageLicenseFile>LICENSE</PackageLicenseFile>
+		<RepositoryUrl>https://github.com/NetFabric/NetFabric.Hyperlinq.Analyzer</RepositoryUrl>
+		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+		<Description>A Roslyn analyzer with rules related to generation and consumption of enumerables and async enumerables in C#.</Description>
+		<PackageReleaseNotes></PackageReleaseNotes>
+		<Copyright>Copyright 2019-2023 Antao Almada</Copyright>
+		<PackageTags>hyperlinq, analyzers, enumerable, async, linq, performance</PackageTags>
+		<DevelopmentDependency>true</DevelopmentDependency>
+		<NoPackageAnalysis>true</NoPackageAnalysis>
+		<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddAnalyzersToOutput</TargetsForTfmSpecificContentInPackage>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <PackageId>NetFabric.Hyperlinq.Analyzer</PackageId>
-    <PackageVersion>2.2.0</PackageVersion>
-    <Authors>Antao Almada</Authors>
-    <PackageIcon>Icon.png</PackageIcon>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <RepositoryUrl>https://github.com/NetFabric/NetFabric.Hyperlinq.Analyzer</RepositoryUrl>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Description>A Roslyn analyzer with rules related to generation and consumption of enumerables and async enumerables in C#.</Description>
-    <PackageReleaseNotes></PackageReleaseNotes>
-    <Copyright>Copyright 2019-2023 Antao Almada</Copyright>
-    <PackageTags>hyperlinq, analyzers, enumerable, async, linq, performance</PackageTags>
-    <DevelopmentDependency>true</DevelopmentDependency>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddAnalyzersToOutput</TargetsForTfmSpecificContentInPackage>
-  </PropertyGroup>
+	<ItemGroup>
+		<None Include="..\Icon.png" Pack="true" PackagePath="" />
+		<None Include="..\LICENSE" Pack="true" PackagePath="" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\Icon.png" Pack="true" PackagePath="" />
-    <None Include="..\LICENSE" Pack="true" PackagePath="" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\NetFabric.Hyperlinq.Analyzer.CodeFixes\NetFabric.Hyperlinq.Analyzer.CodeFixes.csproj" />
-    <ProjectReference Include="..\NetFabric.Hyperlinq.Analyzer\NetFabric.Hyperlinq.Analyzer.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\NetFabric.Hyperlinq.Analyzer.CodeFixes\NetFabric.Hyperlinq.Analyzer.CodeFixes.csproj" />
+		<ProjectReference Include="..\NetFabric.Hyperlinq.Analyzer\NetFabric.Hyperlinq.Analyzer.csproj" />
+	</ItemGroup>
+	
+	<ItemGroup>
+		<None Update="tools\*.ps1" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <None Update="tools\*.ps1" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="NetFabric.CodeAnalysis" Version="5.1.0" PrivateAssets="all" Pack="true" GeneratePathProperty="true" />
+	</ItemGroup>
 
-  <Target Name="_AddAnalyzersToOutput">
-    <ItemGroup>
-      <TfmSpecificPackageFile Include="$(OutputPath)\NetFabric.Hyperlinq.Analyzer.dll" PackagePath="analyzers/dotnet/cs" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\NetFabric.Hyperlinq.Analyzer.CodeFixes.dll" PackagePath="analyzers/dotnet/cs" />
-    </ItemGroup>
-  </Target>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" PrivateAssets="all" />
+	</ItemGroup>
 
-</Project>
+	<!-- For every PackageReference with Pack=true, we include the assemblies from it in the package -->
+	<Target Name="AddPackDependencies" Inputs="@(RuntimeCopyLocalItems)" Outputs="%(RuntimeCopyLocalItems.NuGetPackageId)" DependsOnTargets="ResolvePackageAssets" BeforeTargets="GenerateNuspec" AfterTargets="ResolvePackageAssets">
+		<ItemGroup>
+			<NuGetPackageId Include="@(RuntimeCopyLocalItems -> '%(NuGetPackageId)')" />
+		</ItemGroup>
+		<PropertyGroup>
+			<NuGetPackageId>@(NuGetPackageId -&gt; Distinct())</NuGetPackageId>
+		</PropertyGroup>
+		<ItemGroup>
+			<PackageReferenceDependency Include="@(PackageReference -&gt; WithMetadataValue('Identity', '$(NuGetPackageId)'))" />
+		</ItemGroup>
+		<PropertyGroup>
+			<NuGetPackagePack>@(PackageReferenceDependency -> '%(Pack)')</NuGetPackagePack>
+		</PropertyGroup>
+		<ItemGroup Condition="'$(NuGetPackagePack)' == 'true'">
+			<_PackageFiles Include="@(RuntimeCopyLocalItems)" PackagePath="$(BuildOutputTargetFolder)/$(TargetFramework)/%(Filename)%(Extension)" />
+			<None Include="@(RuntimeCopyLocalItems)" Pack="true" PackagePath="analyzers/dotnet/cs" />
+	        <RuntimeCopyLocalItems Update="@(RuntimeCopyLocalItems)" CopyLocal="true" Private="true" />
+			<ResolvedFileToPublish Include="@(RuntimeCopyLocalItems)" CopyToPublishDirectory="PreserveNewest" RelativePath="%(Filename)%(Extension)" />
+		</ItemGroup>
+	</Target>
+	
+	<Target Name="_AddAnalyzersToOutput">
+		<ItemGroup>
+			<TfmSpecificPackageFile Include="$(OutputPath)\*.dll" PackagePath="analyzers/dotnet/cs" />
+		</ItemGroup>
+	</Target>
+	
+</Project>
\ No newline at end of file
diff --git a/NetFabric.Hyperlinq.Analyzer.sln b/NetFabric.Hyperlinq.Analyzer.sln
index 0a485f3..48f1a42 100644
--- a/NetFabric.Hyperlinq.Analyzer.sln
+++ b/NetFabric.Hyperlinq.Analyzer.sln
@@ -32,6 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat
 		docs\reference\HLQ007_NonDisposableEnumerator.md = docs\reference\HLQ007_NonDisposableEnumerator.md
 		docs\reference\HLQ008_ReadOnlyRefEnumerable.md = docs\reference\HLQ008_ReadOnlyRefEnumerable.md
 		docs\reference\HLQ009_RemoveOptionalMethods.md = docs\reference\HLQ009_RemoveOptionalMethods.md
+		docs\reference\HLQ010_UseForLoop.md = docs\reference\HLQ010_UseForLoop.md
 		docs\reference\HLQ011_ReadOnlyEnumeratorField.md = docs\reference\HLQ011_ReadOnlyEnumeratorField.md
 		docs\reference\HLQ012_UseCollectionsMarshalAsSpan.md = docs\reference\HLQ012_UseCollectionsMarshalAsSpan.md
 		docs\reference\HLQ013_UseForEachLoop.md = docs\reference\HLQ013_UseForEachLoop.md
diff --git a/NetFabric.Hyperlinq.Analyzer/NetFabric.Hyperlinq.Analyzer.csproj b/NetFabric.Hyperlinq.Analyzer/NetFabric.Hyperlinq.Analyzer.csproj
index b95a36c..2077275 100644
--- a/NetFabric.Hyperlinq.Analyzer/NetFabric.Hyperlinq.Analyzer.csproj
+++ b/NetFabric.Hyperlinq.Analyzer/NetFabric.Hyperlinq.Analyzer.csproj
@@ -5,10 +5,8 @@
     <IsPackable>false</IsPackable>
     <LangVersion>10</LangVersion>
     <EnforceExtendedAnalyzerRules>True</EnforceExtendedAnalyzerRules>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-
-    <!-- Avoid ID conflicts with the package project. -->
-    <PackageId>*$(MSBuildProjectFile)*</PackageId>
+    
+	<PackageId>*$(MSBuildProjectFile)*</PackageId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,10 +20,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13">      
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -33,19 +27,4 @@
     <EmbeddedResource Update="Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
   </ItemGroup>
 
-  <Target Name="ILRepack" AfterTargets="Build">
-    <PropertyGroup>
-      <WorkingDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)</WorkingDirectory>
-    </PropertyGroup>
-    <ItemGroup>
-      <InputAssemblies Include="NetFabric.CodeAnalysis.dll" />
-    </ItemGroup>
-    <ILRepack OutputType="$(OutputType)" 
-              MainAssembly="$(AssemblyName).dll" 
-              OutputAssembly="$(AssemblyName).dll" 
-              InputAssemblies="@(InputAssemblies)" 
-              InternalizeExcludeAssemblies="@(InternalizeExcludeAssemblies)" 
-              WorkingDirectory="$(WorkingDirectory)" />
-  </Target>
-
 </Project>