Merge pull request #142 from icsharpcode/min80

Minimal update to decompilation engine 8.0.0.7345
icsharpcode · Jul 26, 2023 · bc00df4 · bc00df4
2 parents cfc90bb + d92df4c
commit bc00df4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="0.11.3" />
-    <PackageReference Include="ICSharpCode.Decompiler" Version="8.0.0.7106-preview2" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="8.0.0.7345" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
     <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />

diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj
@@ -29,7 +29,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="ICSharpCode.Decompiler" Version="8.0.0.7106-preview2" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="8.0.0.7345" />
     <PackageReference Include="Microsoft.DiaSymReader" Version="1.4.0" />
     <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22164-02" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="17.1.20" />

diff --git a/ILSpy.Core/Languages/CSharpLanguage.cs b/ILSpy.Core/Languages/CSharpLanguage.cs
@@ -332,7 +332,8 @@ void AddReferenceWarningMessage(PEFile module, ITextOutput output)
                 return;
             string line1 = Properties.Resources.WarningSomeAssemblyReference;
             string line2 = Properties.Resources.PropertyManuallyMissingReferencesListLoadedAssemblies;
-            AddWarningMessage(module, output, line1, line2, Properties.Resources.ShowAssemblyLoad, Images.ViewCode, delegate {
+            AddWarningMessage(module, output, line1, line2, Properties.Resources.ShowAssemblyLoad, Images.ViewCode, delegate
+            {
                 ILSpyTreeNode assemblyNode = MainWindow.Instance.FindTreeNode(module);
                 assemblyNode.EnsureLazyChildren();
                 MainWindow.Instance.SelectNode(assemblyNode.Children.OfType<ReferenceFolderTreeNode>().Single());
@@ -485,25 +486,26 @@ class ILSpyWholeProjectDecompiler : WholeProjectDecompiler
             readonly DecompilationOptions options;
 
             public ILSpyWholeProjectDecompiler(LoadedAssembly assembly, DecompilationOptions options)
-            : base (
-                options.DecompilerSettings, 
-                assembly.GetAssemblyResolver (),
+            : base(
+                options.DecompilerSettings,
+                assembly.GetAssemblyResolver(),
                 null,
-                assembly.GetDebugInfoOrNull ()
-            ) {
+                assembly.GetDebugInfoOrNull()
+            )
+            {
                 this.assembly = assembly;
                 this.options = options;
             }
 
-            protected override IEnumerable<(string itemType, string fileName, List<PartialTypeInfo> partialTypes)> WriteResourceToFile(string fileName, string resourceName, Stream entryStream)
+            protected override IEnumerable<ProjectItemInfo> WriteResourceToFile(string fileName, string resourceName, Stream entryStream)
             {
                 foreach (var handler in App.ExportProvider.GetExportedValues<IResourceFileHandler>())
                 {
                     if (handler.CanHandle(fileName, options))
                     {
                         entryStream.Position = 0;
                         fileName = handler.WriteResourceToFile(assembly, fileName, entryStream, options);
-                        return new[] { (handler.EntryType, fileName, (List<PartialTypeInfo>)null) };
+                        return new[] { new ProjectItemInfo(handler.EntryType, fileName) };
                     }
                 }
                 return base.WriteResourceToFile(fileName, resourceName, entryStream);

diff --git a/ILSpy.Core/Properties/AssemblyInfo.cs b/ILSpy.Core/Properties/AssemblyInfo.cs
@@ -16,7 +16,7 @@
 [assembly: AssemblyDescription(".NET assembly inspector and decompiler")]
 [assembly: AssemblyCompany("ic#code")]
 [assembly: AssemblyProduct("ILSpy")]
-[assembly: AssemblyCopyright("Copyright 2011-2019 AlphaSierraPapa for the SharpDevelop Team")]
+[assembly: AssemblyCopyright("Copyright 2011-2023 AlphaSierraPapa for the SharpDevelop Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -39,7 +39,7 @@ internal static class RevisionClass
 	public const string Minor = "0";
 	public const string Build = "0";
 	public const string Revision = "0";
-	public const string VersionName = "preview2";
+	public const string VersionName = "preview3";
 
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision + "." + VersionName;
 }
diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "6.0.200",
+    "rollForward": "major",
+    "allowPrerelease": true
+  }
+}