diff --git a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj index b3bfcbb..cfca3ad 100644 --- a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj +++ b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj @@ -8,7 +8,7 @@ - + diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj index 6840b17..aa4865e 100644 --- a/ILSpy.Core/ILSpy.Core.csproj +++ b/ILSpy.Core/ILSpy.Core.csproj @@ -29,7 +29,7 @@ - + diff --git a/ILSpy.Core/Languages/CSharpLanguage.cs b/ILSpy.Core/Languages/CSharpLanguage.cs index a9fcb50..64f7366 100644 --- 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().Single()); @@ -485,17 +486,18 @@ 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 partialTypes)> WriteResourceToFile(string fileName, string resourceName, Stream entryStream) + protected override IEnumerable WriteResourceToFile(string fileName, string resourceName, Stream entryStream) { foreach (var handler in App.ExportProvider.GetExportedValues()) { @@ -503,7 +505,7 @@ public ILSpyWholeProjectDecompiler(LoadedAssembly assembly, DecompilationOptions { entryStream.Position = 0; fileName = handler.WriteResourceToFile(assembly, fileName, entryStream, options); - return new[] { (handler.EntryType, fileName, (List)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 index 51e7420..50ef249 100644 --- 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 new file mode 100644 index 0000000..68d9ece --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "6.0.200", + "rollForward": "major", + "allowPrerelease": true + } +} \ No newline at end of file