From 3b2c6c9ef09187ee3dce3ca42837b487e0b175c2 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Mon, 20 Nov 2023 16:55:35 +0100
Subject: [PATCH] Use specific versions for Diasymreader from nuget.org to
 allow VS2022 addin to restore properly

---
 Directory.Packages.props | 2 ++
 ILSpy/ILSpy.csproj       | 2 ++
 NuGet.config             | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index b58fb9f4c6..6e84fea885 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -17,6 +17,8 @@
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.final" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0-3.final" />
 	<PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22171-02" />
+	<PackageVersion Include="Microsoft.DiaSymReader" Version="1.4.0" />
+	<PackageVersion Include="Microsoft.DiaSymReader.Native" Version="17.0.0-beta1.21524.1" />
 	<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
 	<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 	<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="8.0.0" />
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index 9a1aa2cdc2..5e8184796c 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -90,6 +90,8 @@
 
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
     <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" />
+	<PackageReference Include="Microsoft.DiaSymReader" />
+	<PackageReference Include="Microsoft.DiaSymReader.Native" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/NuGet.config b/NuGet.config
index ce1019423d..8c93079308 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,10 +6,11 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
   </packageSources>
-    <packageSourceMapping>
+  <packageSourceMapping>
     <packageSource key="nuget.org">
       <package pattern="*" />
       <package pattern="Microsoft.DiaSymReader.Native" />
+      <package pattern="Microsoft.DiaSymReader" />
     </packageSource>
     <packageSource key="dotnet8-transport">
       <package pattern="ILCompiler.Reflection.ReadyToRun.Experimental" />
@@ -17,7 +18,6 @@
     <packageSource key="dotnet-tools">
       <package pattern="Microsoft.DiaSymReader.Converter.Xml" />
       <package pattern="Microsoft.DiaSymReader.PortablePdb" />
-      <package pattern="Microsoft.DiaSymReader" />
     </packageSource>
-  </packageSourceMapping>
+  </packageSourceMapping> -->
 </configuration>