Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to ILSpy 6.1.0.5902 #1913

Merged
merged 3 commits into from
Aug 25, 2020
Merged

Updated to ILSpy 6.1.0.5902 #1913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2138e9e
updated to ICSharpCode.Decompiler 6.1.0.5902
filipw Aug 25, 2020
d370a7b
implemented new interface method
filipw Aug 25, 2020
37e59df
fixed test
filipw Aug 25, 2020
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
2 changes: 1 addition & 1 deletion build/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<PackageReference Update="Dotnet.Script.DependencyModel" Version="0.53.0" />
<PackageReference Update="Dotnet.Script.DependencyModel.NuGet" Version="0.53.0" />
<PackageReference Update="ICSharpCode.Decompiler" Version="5.0.2.5153" />
<PackageReference Update="ICSharpCode.Decompiler" Version="6.1.0.5902" />
<PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.2.4" />

<PackageReference Update="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
Expand Down
6 changes: 6 additions & 0 deletions src/OmniSharp.Roslyn.CSharp/Services/Decompilation/AssemblyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ void BuildReferenceCache()
}
}

public bool IsGacAssembly(IAssemblyReference reference)
{
// not called at the moment
throw new NotSupportedException();
}

public PEFile Resolve(IAssemblyReference name)
{
Log("Resolving: {0}", name.FullName);
Expand Down
2 changes: 1 addition & 1 deletion tests/OmniSharp.Roslyn.CSharp.Tests/GoToDefinitionFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ public void Baz() {
// second comment should indicate we have decompiled
var comments = compilationUnit.DescendantTrivia().Where(t => t.Kind() == SyntaxKind.SingleLineCommentTrivia).ToArray();
Assert.NotNull(comments);
Assert.Equal("// Decompiled with ICSharpCode.Decompiler 5.0.2.5153", comments[1].ToString());
Assert.Equal("// Decompiled with ICSharpCode.Decompiler 6.1.0.5902", comments[1].ToString());

// contrary to regular metadata, we should have methods with full bodies
// this condition would fail if decompilation wouldn't work
Expand Down