From 59f6bf85ebf0dbbf1de62f218d9d18343c51532d Mon Sep 17 00:00:00 2001
From: Antao Almada <antao.almada@farfetch.com>
Date: Thu, 12 Oct 2023 15:47:57 +0100
Subject: [PATCH] Use dnMerge to merge dependencies

---
 .../NetFabric.Hyperlinq.Analyzer.Package.csproj       |  2 --
 .../NetFabric.Hyperlinq.Analyzer.csproj               | 11 ++++++++---
 NetFabric.Hyperlinq.Analyzer/dnMerge.config           |  7 +++++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 NetFabric.Hyperlinq.Analyzer/dnMerge.config

diff --git a/NetFabric.Hyperlinq.Analyzer.Package/NetFabric.Hyperlinq.Analyzer.Package.csproj b/NetFabric.Hyperlinq.Analyzer.Package/NetFabric.Hyperlinq.Analyzer.Package.csproj
index 0eec3fe..f860147 100644
--- a/NetFabric.Hyperlinq.Analyzer.Package/NetFabric.Hyperlinq.Analyzer.Package.csproj
+++ b/NetFabric.Hyperlinq.Analyzer.Package/NetFabric.Hyperlinq.Analyzer.Package.csproj
@@ -21,7 +21,6 @@
     <PackageTags>hyperlinq, analyzers, enumerable, async, linq, performance</PackageTags>
     <DevelopmentDependency>true</DevelopmentDependency>
     <NoPackageAnalysis>true</NoPackageAnalysis>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddAnalyzersToOutput</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
@@ -41,7 +40,6 @@
 
   <Target Name="_AddAnalyzersToOutput">
     <ItemGroup>
-      <TfmSpecificPackageFile Include="$(OutputPath)\NetFabric.CodeAnalysis.dll" PackagePath="analyzers/dotnet/cs" />
       <TfmSpecificPackageFile Include="$(OutputPath)\NetFabric.Hyperlinq.Analyzer.dll" PackagePath="analyzers/dotnet/cs" />
       <TfmSpecificPackageFile Include="$(OutputPath)\NetFabric.Hyperlinq.Analyzer.CodeFixes.dll" PackagePath="analyzers/dotnet/cs" />
     </ItemGroup>
diff --git a/NetFabric.Hyperlinq.Analyzer/NetFabric.Hyperlinq.Analyzer.csproj b/NetFabric.Hyperlinq.Analyzer/NetFabric.Hyperlinq.Analyzer.csproj
index 23ef050..2cab30f 100644
--- a/NetFabric.Hyperlinq.Analyzer/NetFabric.Hyperlinq.Analyzer.csproj
+++ b/NetFabric.Hyperlinq.Analyzer/NetFabric.Hyperlinq.Analyzer.csproj
@@ -3,10 +3,11 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <LangVersion>10</LangVersion>
+    <LangVersion>latest</LangVersion>
     <EnforceExtendedAnalyzerRules>True</EnforceExtendedAnalyzerRules>
-    
-    <PackageId>NetFabric.Hyperlinq.Analyzer</PackageId>
+
+    <!-- Avoid ID conflicts with the package project. -->
+    <PackageId>*$(MSBuildProjectFile)*</PackageId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,6 +21,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="dnMerge" Version="0.5.15">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/NetFabric.Hyperlinq.Analyzer/dnMerge.config b/NetFabric.Hyperlinq.Analyzer/dnMerge.config
new file mode 100644
index 0000000..db09cbd
--- /dev/null
+++ b/NetFabric.Hyperlinq.Analyzer/dnMerge.config
@@ -0,0 +1,7 @@
+<dnMergeConfig>
+  <GeneratePDB>false</GeneratePDB>
+  <OverwriteAssembly>true</OverwriteAssembly>
+  <ExcludeReferences>
+    <ReferenceName>Microsoft.CodeAnalysis.CSharp</ReferenceName>
+  </ExcludeReferences>
+</dnMergeConfig>
\ No newline at end of file