Merge pull request #2178 from icsharpcode/pgkdepupdates

Update NuGet Dependencies

ICSharpCode.Decompiler.Console/ICSharpCode.Decompiler.Console.csproj

@@ -27,6 +27,8 @@
     <WarningsAsErrors>NU1605</WarningsAsErrors>
   </PropertyGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
     <Compile Include="..\ICSharpCode.Decompiler.PdbProvider.Cecil\MonoCecilDebugInfoProvider.cs" Link="MonoCecilDebugInfoProvider.cs" />
     <Compile Include="..\ILSpy\DebugInfo\PortableDebugInfoProvider.cs" Link="PortableDebugInfoProvider.cs" />
@@ -52,7 +54,7 @@
     <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
-    <PackageReference Include="Mono.Cecil" Version="0.10.3" />
+    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
   </ItemGroup>
 
 </Project>

ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj

@@ -6,8 +6,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.10.3" />
+    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
   </ItemGroup>
 
   <ItemGroup>

ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj

@@ -7,9 +7,11 @@
     <RootNamespace>ICSharpCode.Decompiler.PowerShell</RootNamespace>
   </PropertyGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
-    <PackageReference Include="Mono.Cecil" Version="0.10.3" />
+    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">

ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@@ -39,18 +39,20 @@
     <DefineConstants>TRACE;NET46;ROSLYN;CS60;CS70;CS71;CS72;CS73</DefineConstants>
   </PropertyGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
-    <PackageReference Include="DiffLib" Version="2017.7.26.1241" />
+    <PackageReference Include="DiffLib" Version="$(DiffLibVersion)" />
     <PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.8.0-3.final" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
-    <PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.8.20407.11" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
-	<PackageReference Include="System.Reflection.Metadata" Version="5.0.0-preview.8.20407.11" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(RoslynVersion)" />
     <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta1-63314-01" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitAdapterVersion)" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="Mono.Cecil" Version="0.10.3" />
+    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
   </ItemGroup>
 
   <ItemGroup>

ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@@ -46,11 +46,12 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
-    <PackageReference Include="Humanizer.Core" Version="2.2.0" />
+    <PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

ICSharpCode.Decompiler/ICSharpCode.Decompiler.nuspec.template

@@ -17,9 +17,8 @@
     <dependencies>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Humanizer.Core" version="2.2.0" />
-        <dependency id="System.Collections.Immutable" version="1.5.0" />
+        <dependency id="System.Collections.Immutable" version="5.0.0-preview.8.20371.14" />
-        <dependency id="System.Reflection.Metadata" version="1.6.0" />
+        <dependency id="System.Reflection.Metadata" version="5.0.0-preview.8.20371.14" />
-        <dependency id="System.ValueTuple" version="4.3.0" />
       </group>
     </dependencies>
   </metadata>

ICSharpCode.Decompiler/Metadata/AssemblyReferences.cs

@@ -44,8 +44,10 @@ namespace ICSharpCode.Decompiler.Metadata
 
 	public interface IAssemblyResolver
 	{
+#if !VSADDIN
 		PEFile Resolve(IAssemblyReference reference);
 		PEFile ResolveModule(PEFile mainModule, string moduleName);
+#endif
 		bool IsGacAssembly(IAssemblyReference reference);
 	}
 
@@ -169,6 +171,7 @@ namespace ICSharpCode.Decompiler.Metadata
 		}
 	}
 
+#if !VSADDIN
 	public class AssemblyReference : IAssemblyReference
 	{
 		static readonly SHA1 sha1 = SHA1.Create();
@@ -226,4 +229,5 @@ namespace ICSharpCode.Decompiler.Metadata
 			return FullName;
 		}
 	}
+#endif
 }

ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs

@@ -157,6 +157,7 @@ namespace ICSharpCode.Decompiler.Metadata
 			return (identifier, version ?? ZeroVersion);
 		}
 
+#if !VSADDIN
 		public PEFile Resolve(IAssemblyReference name)
 		{
 			var file = FindAssemblyFile(name);
@@ -181,6 +182,7 @@ namespace ICSharpCode.Decompiler.Metadata
 			}
 			return new PEFile(moduleFileName, new FileStream(moduleFileName, FileMode.Open, FileAccess.Read), streamOptions, metadataOptions);
 		}
+#endif
 
 		public virtual bool IsGacAssembly(IAssemblyReference reference)
 		{

ILSpy.AddIn/AssemblyFileFinder.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using System.Text.RegularExpressions;
 
 using ICSharpCode.Decompiler.Metadata;
-using ICSharpCode.Decompiler.Util;
 
 namespace ICSharpCode.ILSpy.AddIn
 {

ILSpy.AddIn/Commands/OpenReferenceCommand.cs

@@ -1,16 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 using EnvDTE;
 
-using ICSharpCode.Decompiler.Metadata;
-
-using Microsoft.CodeAnalysis;
 using Microsoft.VisualStudio.Shell;
 
-using Mono.Cecil;
-
 using VSLangProj;
 
 namespace ICSharpCode.ILSpy.AddIn.Commands

ILSpy.AddIn/Commands/ProjectReferenceForILSpy.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 using EnvDTE;
 
@@ -10,8 +6,6 @@ using ICSharpCode.Decompiler.Metadata;
 
 using Microsoft.VisualStudio.Shell;
 
-using Mono.Cecil;
-
 namespace ICSharpCode.ILSpy.AddIn.Commands
 {
 	/// <summary>

ILSpy.AddIn/Decompiler/Dummy.cs

@@ -0,0 +1,30 @@
+// Dummy types so that we can use compile some ICS.Decompiler classes in the AddIn context
+// without depending on SRM etc.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ICSharpCode.Decompiler
+{
+	public class ReferenceLoadInfo
+	{
+		public void AddMessage(params object[] args) { }
+	}
+
+	enum MessageKind { Warning }
+
+	public static class MetadataExtensions
+	{
+		public static string ToHexString(this IEnumerable<byte> bytes, int estimatedLength)
+		{
+			if (bytes == null)
+				throw new ArgumentNullException(nameof(bytes));
+
+			StringBuilder sb = new StringBuilder(estimatedLength * 2);
+			foreach (var b in bytes)
+				sb.AppendFormat("{0:x2}", b);
+			return sb.ToString();
+		}
+	}
+}

ILSpy.AddIn/ILSpy.AddIn.csproj

@@ -41,16 +41,18 @@
     <Reference Include="System.Design" />
   </ItemGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.9.3" />
+    <!-- Intentionally using an old Roslyn version in the AddIn, so that we stay compatible with old VS versions. -->
     <PackageReference Include="Microsoft.CodeAnalysis" Version="2.4.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.4.0" />
     <PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="2.4.0" />
-    <PackageReference Include="Mono.Cecil" Version="0.10.3" />
+    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
     <ProjectReference Include="..\ILSpy\ILSpy.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <Private>false</Private>
@@ -58,6 +60,18 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\AssemblyReferences.cs" Link="Decompiler\AssemblyReferences.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\DotNetCorePathFinder.cs" Link="Decompiler\DotNetCorePathFinder.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\LightJson\JsonArray.cs" Link="Decompiler\LightJson\JsonArray.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\LightJson\JsonObject.cs" Link="Decompiler\LightJson\JsonObject.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\LightJson\JsonValue.cs" Link="Decompiler\LightJson\JsonValue.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\LightJson\JsonValueType.cs" Link="Decompiler\LightJson\JsonValueType.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\LightJson\Serialization\JsonParseException.cs" Link="Decompiler\LightJson\Serialization\JsonParseException.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\LightJson\Serialization\JsonReader.cs" Link="Decompiler\LightJson\Serialization\JsonReader.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\LightJson\Serialization\TextPosition.cs" Link="Decompiler\LightJson\Serialization\TextPosition.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\LightJson\Serialization\TextScanner.cs" Link="Decompiler\LightJson\Serialization\TextScanner.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Metadata\UniversalAssemblyResolver.cs" Link="UniversalAssemblyResolver.cs" />
+    <Compile Include="..\ICSharpCode.Decompiler\Util\EmptyList.cs" Link="Decompiler\EmptyList.cs" />
     <Compile Include="..\ILSpy\NativeMethods.cs" Link="NativeMethods.cs" />
     <Compile Include="Commands\AssemblyReferenceForILSpy.cs" />
     <Compile Include="Commands\NuGetReferenceForILSpy.cs" />
@@ -67,6 +81,7 @@
     <Compile Include="Commands\OpenILSpyCommand.cs" />
     <Compile Include="Commands\OpenProjectOutputCommand.cs" />
     <Compile Include="Commands\OpenReferenceCommand.cs" />
+    <Compile Include="Decompiler\Dummy.cs" />
     <Compile Include="Guids.cs" />
     <Compile Include="ILSpyInstance.cs" />
     <Compile Include="Resources.Designer.cs">
@@ -186,6 +201,14 @@
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;VSADDIN</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;VSADDIN</DefineConstants>
+  </PropertyGroup>
+
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />

ILSpy.BamlDecompiler.Tests/ILSpy.BamlDecompiler.Tests.csproj

@@ -34,8 +34,10 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
   </ItemGroup>
 
   <ItemGroup>

ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj

@@ -35,8 +35,10 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
-    <PackageReference Include="AvalonEdit" Version="6.1.0-preview1" />
+    <PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" />
     <PackageReference Include="System.Composition" Version="1.3.0" />
   </ItemGroup>
 

ILSpy.Tests/ILSpy.Tests.csproj

@@ -44,15 +44,17 @@
     <Compile Include="Stub.cs" />
   </ItemGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
-    <PackageReference Include="DiffLib" Version="2017.7.26.1241" />
+    <PackageReference Include="DiffLib" Version="$(DiffLibVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" />
+    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.8.0-3.final" />
+    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
-    <PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.8.20407.11" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(RoslynVersion)" />
-	<PackageReference Include="System.Reflection.Metadata" Version="5.0.0-preview.8.20407.11" />
+    <PackageReference Include="NUnit3TestAdapter" Version="$(NUnitAdapterVersion)" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="NUnit" Version="$(NUnitVersion)" />
-    <PackageReference Include="Moq" Version="4.14.1" />
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>
 
   <ItemGroup>

ILSpy/ILSpy.csproj

@@ -48,16 +48,16 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
 
+  <Import Project="..\packages.props" />
+
   <ItemGroup>
-    <PackageReference Include="AvalonEdit" Version="6.1.0-preview1" />
+    <PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" />
     <PackageReference Include="Dirkster.AvalonDock" Version="3.6.1" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.3.7" />
     <PackageReference Include="System.Composition" Version="1.3.0" />
-    <PackageReference Include="Mono.Cecil" Version="0.10.3" />
+    <PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
     <PackageReference Include="OSVersionHelper" Version="1.0.11" />
     <PackageReference Include="DataGridExtensions" Version="2.1.1" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.8.1" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
   </ItemGroup>
 

ILSpy/Properties/app.config.template

@@ -26,11 +26,11 @@
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+				<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-1.4.5.0" newVersion="1.4.5.0" />
+				<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
 			</dependentAssembly>
 		</assemblyBinding>
 	</runtime>

packages.props

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <!-- Centrally define the versions of the NuGet packages we use -->
+  <PropertyGroup>
+    <HumanizerVersion>2.2.0</HumanizerVersion>
+    <SystemCollectionsImmutableVersion>5.0.0-preview.8.20407.11</SystemCollectionsImmutableVersion>
+    <SystemReflectionMetadataVersion>5.0.0-preview.8.20407.11</SystemReflectionMetadataVersion>
+    <RoslynVersion>3.8.0-3.final</RoslynVersion>
+    <MonoCecilVersion>0.10.3</MonoCecilVersion>
+    <AvalonEditVersion>6.1.0-preview1</AvalonEditVersion>
+    <NUnitVersion>3.12.0</NUnitVersion>
+    <NUnitAdapterVersion>3.13.0</NUnitAdapterVersion>
+    <MoqVersion>4.14.1</MoqVersion>
+    <DiffLibVersion>2017.7.26.1241</DiffLibVersion>
+  </PropertyGroup>
+</Project>