Skip to content
This repository was archived by the owner on Jul 21, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion ILSpy.Core/ILSpy.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
18 changes: 10 additions & 8 deletions ILSpy.Core/Languages/CSharpLanguage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ILSpy.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand All @@ -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;
}
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"version": "6.0.200",
"rollForward": "major",
"allowPrerelease": true
}
}