Browse Source

Merge branch 'master' into ranges

pull/1986/head
Siegfried Pammer 5 years ago committed by GitHub
parent
commit
2e5a597300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  2. 14
      ICSharpCode.Decompiler.Tests/TestCases/Correctness/ControlFlow.cs
  3. 52
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullPropagation.cs
  4. 8
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullableRefTypes.cs
  5. 6
      ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
  6. 12
      ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
  7. 4
      ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
  8. 3
      ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs
  9. 45
      ICSharpCode.Decompiler/CSharp/SequencePointBuilder.cs
  10. 1
      ICSharpCode.Decompiler/CSharp/StatementBuilder.cs
  11. 166
      ICSharpCode.Decompiler/CSharp/Syntax/Statements/TryCatchStatement.cs
  12. 97
      ICSharpCode.Decompiler/CSharp/Transforms/TransformFieldAndConstructorInitializers.cs
  13. 2
      ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs
  14. 2
      ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
  15. 7
      ICSharpCode.Decompiler/IL/ControlFlow/AsyncAwaitDecompiler.cs
  16. 17
      ICSharpCode.Decompiler/IL/ControlFlow/ControlFlowSimplification.cs
  17. 25
      ICSharpCode.Decompiler/IL/Instructions/ILInstruction.cs
  18. 13
      ICSharpCode.Decompiler/IL/Instructions/TryInstruction.cs
  19. 14
      ICSharpCode.Decompiler/IL/Transforms/ExpressionTransforms.cs
  20. 201
      ICSharpCode.Decompiler/IL/Transforms/NullPropagationTransform.cs
  21. 595
      ICSharpCode.Decompiler/IL/Transforms/TransformExpressionTrees.cs
  22. 2
      ICSharpCode.Decompiler/Metadata/DotNetCorePathFinder.cs
  23. 28
      ICSharpCode.Decompiler/Metadata/DotNetCorePathFinderExtensions.cs
  24. 38
      ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs
  25. 3
      ILSpy.AddIn/Commands/ProjectReferenceForILSpy.cs
  26. 19
      ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs
  27. 19
      ILSpy.BamlDecompiler.Tests/Cases/AttachedEvent.xaml.cs
  28. 20
      ILSpy.BamlDecompiler.Tests/Cases/CustomControl.cs
  29. 20
      ILSpy.BamlDecompiler.Tests/Cases/Issue1547.xaml.cs
  30. 19
      ILSpy.BamlDecompiler.Tests/Cases/MyControl.xaml.cs
  31. 19
      ILSpy.BamlDecompiler.Tests/Cases/Resources.xaml.cs
  32. 19
      ILSpy.BamlDecompiler.Tests/Cases/Simple.xaml.cs
  33. 19
      ILSpy.BamlDecompiler.Tests/Cases/SimpleNames.xaml.cs
  34. 19
      ILSpy.BamlDecompiler.Tests/Mocks/AvalonDock.cs
  35. 4
      ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
  36. 15
      ILSpy.ReadyToRun/ReadyToRunLanguage.cs
  37. 4
      ILSpy.Tests/ILSpy.Tests.csproj
  38. 4
      ILSpy/Analyzers/Builtin/TypeUsedByAnalyzer.cs
  39. 2
      ILSpy/AssemblyList.cs
  40. 35
      ILSpy/AssemblyListManager.cs
  41. 32
      ILSpy/Commands/DecompileCommand.cs
  42. 32
      ILSpy/Commands/DelegateCommand.cs
  43. 45
      ILSpy/EntityReference.cs
  44. 135
      ILSpy/Fusion.cs
  45. 137
      ILSpy/GacInterop.cs
  46. 3
      ILSpy/ILSpy.csproj
  47. 19
      ILSpy/Languages/CSharpLexer.cs
  48. 26
      ILSpy/LoadedAssembly.cs
  49. 14
      ILSpy/MainWindow.xaml.cs
  50. 54
      ILSpy/Properties/Resources.Designer.cs
  51. 14
      ILSpy/Properties/Resources.resx
  52. 2
      ILSpy/TextView/AvalonEditTextOutput.cs
  53. 19
      ILSpy/TextView/BracketHighlightRenderer.cs
  54. 7
      ILSpy/TextView/DecompilerTextView.cs
  55. 2
      ILSpy/ViewModels/DebugStepsPaneModel.cs
  56. 313
      ILSpy/ViewModels/ManageAssemblyListsViewModel.cs
  57. 24
      ILSpy/Views/CreateListDialog.xaml
  58. 16
      ILSpy/Views/CreateListDialog.xaml.cs
  59. 12
      ILSpy/Views/ManageAssemblyLIstsDialog.xaml.cs
  60. 14
      ILSpy/Views/ManageAssemblyListsDialog.xaml
  61. 2
      ILSpy/Views/OpenFromGacDialog.xaml
  62. 16
      ILSpy/Views/OpenFromGacDialog.xaml.cs

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

@ -42,8 +42,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="DiffLib" Version="2017.7.26.1241" /> <PackageReference Include="DiffLib" Version="2017.7.26.1241" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" /> <PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0-beta2-final" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0-3.final" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.5.0-beta2-final" /> <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.6.0-3.final" />
<PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta1-63314-01" /> <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta1-63314-01" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />

14
ICSharpCode.Decompiler.Tests/TestCases/Correctness/ControlFlow.cs

@ -41,6 +41,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Correctness
BreakUnlessContinue(true); BreakUnlessContinue(true);
BreakUnlessContinue(false); BreakUnlessContinue(false);
TestConditionals(); TestConditionals();
Console.WriteLine("Issue1946:\n" + Issue1946());
return 0; return 0;
} }
@ -149,5 +150,18 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Correctness
byte answer = (byte)(value == 128 ? 255 : 0); byte answer = (byte)(value == 128 ? 255 : 0);
return answer; return answer;
} }
static string Issue1946()
{
string obj = "1";
try {
obj = "2";
} catch {
obj = "3";
} finally {
obj = "4";
}
return obj;
}
} }
} }

52
ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullPropagation.cs

@ -68,6 +68,48 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
{ {
} }
} }
private class Container<T1, T2>
{
public GenericStruct<T1, T2> Other;
}
private struct GenericStruct<T1, T2>
{
public T1 Field1;
public T2 Field2;
public Container<T1, T2> Other;
public override string ToString()
{
return "(" + Field1?.ToString() + ", " + Field2?.ToString() + ")";
}
public int? GetTextLength()
{
return Field1?.ToString().Length + Field2?.ToString().Length + 4;
}
public string Chain1()
{
return Other?.Other.Other?.Other.Field1?.ToString();
}
public string Chain2()
{
return Other?.Other.Other?.Other.Field1?.ToString()?.GetType().Name;
}
public int? Test2()
{
return Field1?.ToString().Length ?? 42;
}
public int? GetTextLengthNRE()
{
return (Field1?.ToString()).Length;
}
}
public interface ITest public interface ITest
{ {
@ -243,12 +285,10 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
return t?.Int(); return t?.Int();
} }
// See also: https://github.com/icsharpcode/ILSpy/issues/1050 private static int? GenericRefUnconstrainedInt<T>(ref T t) where T : ITest
// The C# compiler generates pretty weird code in this case. {
//private static int? GenericRefUnconstrainedInt<T>(ref T t) where T : ITest return t?.Int();
//{ }
// return t?.Int();
//}
private static int? GenericRefClassConstraintInt<T>(ref T t) where T : class, ITest private static int? GenericRefClassConstraintInt<T>(ref T t) where T : class, ITest
{ {

8
ICSharpCode.Decompiler.Tests/TestCases/Pretty/NullableRefTypes.cs

@ -79,6 +79,14 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
set; set;
} }
public event EventHandler? Event; public event EventHandler? Event;
public static int? NullConditionalOperator(T02_EverythingIsNullableInHere? x)
{
// This code throws if `x != null && x.field1 == null`.
// But we can't decompile it to the warning-free "x?.field1!.Length",
// because of https://github.com/dotnet/roslyn/issues/43659
return x?.field1.Length;
}
} }
public class T03_EverythingIsNotNullableInHere public class T03_EverythingIsNotNullableInHere

6
ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@ -181,7 +181,7 @@ namespace ICSharpCode.Decompiler.CSharp
new IntroduceUnsafeModifier(), new IntroduceUnsafeModifier(),
new AddCheckedBlocks(), new AddCheckedBlocks(),
new DeclareVariables(), // should run after most transforms that modify statements new DeclareVariables(), // should run after most transforms that modify statements
new ConvertConstructorCallIntoInitializer(), // must run after DeclareVariables new TransformFieldAndConstructorInitializers(), // must run after DeclareVariables
new DecimalConstantTransform(), new DecimalConstantTransform(),
new PrettifyAssignments(), // must run after DeclareVariables new PrettifyAssignments(), // must run after DeclareVariables
new IntroduceUsingDeclarations(), new IntroduceUsingDeclarations(),
@ -376,7 +376,7 @@ namespace ICSharpCode.Decompiler.CSharp
return false; return false;
if (name.Contains("DisplayClass") || name.Contains("AnonStorey")) if (name.Contains("DisplayClass") || name.Contains("AnonStorey"))
return true; return true;
return type.BaseType.GetFullTypeName(metadata).ToString() == "System.Object" && !type.GetInterfaceImplementations().Any(); return type.BaseType.IsKnownType(metadata, KnownTypeCode.Object) && !type.GetInterfaceImplementations().Any();
} }
#endregion #endregion
@ -396,7 +396,7 @@ namespace ICSharpCode.Decompiler.CSharp
settings.LoadInMemory = true; settings.LoadInMemory = true;
var file = LoadPEFile(fileName, settings); var file = LoadPEFile(fileName, settings);
var resolver = new UniversalAssemblyResolver(fileName, settings.ThrowOnAssemblyResolveErrors, var resolver = new UniversalAssemblyResolver(fileName, settings.ThrowOnAssemblyResolveErrors,
file.Reader.DetectTargetFrameworkId(), file.DetectTargetFrameworkId(),
settings.LoadInMemory ? PEStreamOptions.PrefetchMetadata : PEStreamOptions.Default, settings.LoadInMemory ? PEStreamOptions.PrefetchMetadata : PEStreamOptions.Default,
settings.ApplyWindowsRuntimeProjections ? MetadataReaderOptions.ApplyWindowsRuntimeProjections : MetadataReaderOptions.None); settings.ApplyWindowsRuntimeProjections ? MetadataReaderOptions.ApplyWindowsRuntimeProjections : MetadataReaderOptions.None);
return new DecompilerTypeSystem(file, resolver); return new DecompilerTypeSystem(file, resolver);

12
ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs

@ -2027,7 +2027,7 @@ namespace ICSharpCode.Decompiler.CSharp
.WithRR(new ResolveResult(NullableType.GetUnderlyingType(translatedTarget.Type))) .WithRR(new ResolveResult(NullableType.GetUnderlyingType(translatedTarget.Type)))
.WithoutILInstruction(); .WithoutILInstruction();
} }
translatedTarget = EnsureTargetNotNullable(translatedTarget); translatedTarget = EnsureTargetNotNullable(translatedTarget, target);
return translatedTarget; return translatedTarget;
} }
} else { } else {
@ -2055,12 +2055,18 @@ namespace ICSharpCode.Decompiler.CSharp
} }
} }
private TranslatedExpression EnsureTargetNotNullable(TranslatedExpression expr) private TranslatedExpression EnsureTargetNotNullable(TranslatedExpression expr, ILInstruction inst)
{ {
// inst is the instruction that got translated into expr.
if (expr.Type.Nullability == Nullability.Nullable) { if (expr.Type.Nullability == Nullability.Nullable) {
if (expr.Expression is UnaryOperatorExpression uoe && uoe.Operator == UnaryOperatorType.NullConditional) { if (expr.Expression is UnaryOperatorExpression uoe && uoe.Operator == UnaryOperatorType.NullConditional) {
return expr; return expr;
} }
if (inst.HasFlag(InstructionFlags.MayUnwrapNull)) {
// We can't use ! in the chain of operators after a NullConditional, due to
// https://github.com/dotnet/roslyn/issues/43659
return expr;
}
return new UnaryOperatorExpression(UnaryOperatorType.SuppressNullableWarning, expr) return new UnaryOperatorExpression(UnaryOperatorType.SuppressNullableWarning, expr)
.WithRR(new ResolveResult(expr.Type.ChangeNullability(Nullability.Oblivious))) .WithRR(new ResolveResult(expr.Type.ChangeNullability(Nullability.Oblivious)))
.WithoutILInstruction(); .WithoutILInstruction();
@ -2153,7 +2159,7 @@ namespace ICSharpCode.Decompiler.CSharp
if (arrayExpr.Type.Kind != TypeKind.Array) { if (arrayExpr.Type.Kind != TypeKind.Array) {
arrayExpr = arrayExpr.ConvertTo(arrayType, this); arrayExpr = arrayExpr.ConvertTo(arrayType, this);
} }
arrayExpr = EnsureTargetNotNullable(arrayExpr); arrayExpr = EnsureTargetNotNullable(arrayExpr, inst.Array);
string memberName; string memberName;
KnownTypeCode code; KnownTypeCode code;
if (inst.ResultType == StackType.I4) { if (inst.ResultType == StackType.I4) {

4
ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs

@ -1815,11 +1815,11 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
Space(); Space();
WriteKeyword(CatchClause.WhenKeywordRole); WriteKeyword(CatchClause.WhenKeywordRole);
Space(policy.SpaceBeforeIfParentheses); Space(policy.SpaceBeforeIfParentheses);
LPar(); WriteToken(CatchClause.CondLPar);
Space(policy.SpacesWithinIfParentheses); Space(policy.SpacesWithinIfParentheses);
catchClause.Condition.AcceptVisitor(this); catchClause.Condition.AcceptVisitor(this);
Space(policy.SpacesWithinIfParentheses); Space(policy.SpacesWithinIfParentheses);
RPar(); WriteToken(CatchClause.CondRPar);
} }
WriteBlock(catchClause.Body, policy.StatementBraceStyle); WriteBlock(catchClause.Body, policy.StatementBraceStyle);
EndNode(catchClause); EndNode(catchClause);

3
ICSharpCode.Decompiler/CSharp/OutputVisitor/InsertMissingTokensDecorator.cs

@ -46,6 +46,9 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
} else if (node is Comment comment) { } else if (node is Comment comment) {
comment.SetStartLocation(locationProvider.Location); comment.SetStartLocation(locationProvider.Location);
} }
if (node is ErrorExpression error) {
error.Location = locationProvider.Location;
}
base.StartNode(node); base.StartNode(node);
} }

45
ICSharpCode.Decompiler/CSharp/SequencePointBuilder.cs

@ -113,7 +113,13 @@ namespace ICSharpCode.Decompiler.CSharp
ILInstruction blockContainer = blockStatement.Annotations.OfType<ILInstruction>().FirstOrDefault(); ILInstruction blockContainer = blockStatement.Annotations.OfType<ILInstruction>().FirstOrDefault();
if (blockContainer != null) { if (blockContainer != null) {
StartSequencePoint(blockStatement.LBraceToken); StartSequencePoint(blockStatement.LBraceToken);
int intervalStart = blockContainer.ILRanges.First().Start; int intervalStart;
if (blockContainer.Parent is TryCatchHandler handler && !handler.ExceptionSpecifierILRange.IsEmpty) {
// if this block container is part of a TryCatchHandler, do not steal the exception-specifier IL range
intervalStart = handler.ExceptionSpecifierILRange.End;
} else {
intervalStart = blockContainer.StartILOffset;
}
// The end will be set to the first sequence point candidate location before the first statement of the function when the seqeunce point is adjusted // The end will be set to the first sequence point candidate location before the first statement of the function when the seqeunce point is adjusted
int intervalEnd = intervalStart + 1; int intervalEnd = intervalStart + 1;
@ -256,12 +262,15 @@ namespace ICSharpCode.Decompiler.CSharp
foreachStatement.InExpression.AcceptVisitor(this); foreachStatement.InExpression.AcceptVisitor(this);
AddToSequencePoint(foreachInfo.GetEnumeratorCall); AddToSequencePoint(foreachInfo.GetEnumeratorCall);
EndSequencePoint(foreachStatement.InExpression.StartLocation, foreachStatement.InExpression.EndLocation); EndSequencePoint(foreachStatement.InExpression.StartLocation, foreachStatement.InExpression.EndLocation);
StartSequencePoint(foreachStatement); StartSequencePoint(foreachStatement);
AddToSequencePoint(foreachInfo.MoveNextCall); AddToSequencePoint(foreachInfo.MoveNextCall);
EndSequencePoint(foreachStatement.InToken.StartLocation, foreachStatement.InToken.EndLocation); EndSequencePoint(foreachStatement.InToken.StartLocation, foreachStatement.InToken.EndLocation);
StartSequencePoint(foreachStatement); StartSequencePoint(foreachStatement);
AddToSequencePoint(foreachInfo.GetCurrentCall); AddToSequencePoint(foreachInfo.GetCurrentCall);
EndSequencePoint(foreachStatement.VariableType.StartLocation, foreachStatement.VariableNameToken.EndLocation); EndSequencePoint(foreachStatement.VariableType.StartLocation, foreachStatement.VariableNameToken.EndLocation);
VisitAsSequencePoint(foreachStatement.EmbeddedStatement); VisitAsSequencePoint(foreachStatement.EmbeddedStatement);
} }
@ -310,6 +319,33 @@ namespace ICSharpCode.Decompiler.CSharp
VisitAsSequencePoint(fixedStatement.EmbeddedStatement); VisitAsSequencePoint(fixedStatement.EmbeddedStatement);
} }
public override void VisitTryCatchStatement(TryCatchStatement tryCatchStatement)
{
VisitAsSequencePoint(tryCatchStatement.TryBlock);
foreach (var c in tryCatchStatement.CatchClauses) {
VisitAsSequencePoint(c);
}
VisitAsSequencePoint(tryCatchStatement.FinallyBlock);
}
public override void VisitCatchClause(CatchClause catchClause)
{
if (catchClause.Condition.IsNull) {
var tryCatchHandler = catchClause.Annotation<TryCatchHandler>();
if (!tryCatchHandler.ExceptionSpecifierILRange.IsEmpty) {
StartSequencePoint(catchClause.CatchToken);
var function = tryCatchHandler.Ancestors.OfType<ILFunction>().FirstOrDefault();
AddToSequencePointRaw(function, new[] { tryCatchHandler.ExceptionSpecifierILRange });
EndSequencePoint(catchClause.CatchToken.StartLocation, catchClause.RParToken.IsNull ? catchClause.CatchToken.EndLocation : catchClause.RParToken.EndLocation);
}
} else {
StartSequencePoint(catchClause.WhenToken);
AddToSequencePoint(catchClause.Condition);
EndSequencePoint(catchClause.WhenToken.StartLocation, catchClause.CondRParToken.EndLocation);
}
VisitAsSequencePoint(catchClause.Body);
}
/// <summary> /// <summary>
/// Start a new C# statement = new sequence point. /// Start a new C# statement = new sequence point.
/// </summary> /// </summary>
@ -339,6 +375,13 @@ namespace ICSharpCode.Decompiler.CSharp
current = outerStates.Pop(); current = outerStates.Pop();
} }
void AddToSequencePointRaw(ILFunction function, IEnumerable<Interval> ranges)
{
current.Intervals.AddRange(ranges);
Debug.Assert(current.Function == null || current.Function == function);
current.Function = function;
}
/// <summary> /// <summary>
/// Add the ILAst instruction associated with the AstNode to the sequence point. /// Add the ILAst instruction associated with the AstNode to the sequence point.
/// Also add all its ILAst sub-instructions (unless they were already added to another sequence point). /// Also add all its ILAst sub-instructions (unless they were already added to another sequence point).

1
ICSharpCode.Decompiler/CSharp/StatementBuilder.cs

@ -363,6 +363,7 @@ namespace ICSharpCode.Decompiler.CSharp
tryCatch.TryBlock = ConvertAsBlock(inst.TryBlock); tryCatch.TryBlock = ConvertAsBlock(inst.TryBlock);
foreach (var handler in inst.Handlers) { foreach (var handler in inst.Handlers) {
var catchClause = new CatchClause(); var catchClause = new CatchClause();
catchClause.AddAnnotation(handler);
var v = handler.Variable; var v = handler.Variable;
if (v != null) { if (v != null) {
catchClause.AddAnnotation(new ILVariableResolveResult(v, v.Type)); catchClause.AddAnnotation(new ILVariableResolveResult(v, v.Type));

166
ICSharpCode.Decompiler/CSharp/Syntax/Statements/TryCatchStatement.cs

@ -32,68 +32,70 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
/// </summary> /// </summary>
public class TryCatchStatement : Statement public class TryCatchStatement : Statement
{ {
public static readonly TokenRole TryKeywordRole = new TokenRole ("try"); public static readonly TokenRole TryKeywordRole = new TokenRole("try");
public static readonly Role<BlockStatement> TryBlockRole = new Role<BlockStatement>("TryBlock", BlockStatement.Null); public static readonly Role<BlockStatement> TryBlockRole = new Role<BlockStatement>("TryBlock", BlockStatement.Null);
public static readonly Role<CatchClause> CatchClauseRole = new Role<CatchClause>("CatchClause", CatchClause.Null); public static readonly Role<CatchClause> CatchClauseRole = new Role<CatchClause>("CatchClause", CatchClause.Null);
public static readonly TokenRole FinallyKeywordRole = new TokenRole ("finally"); public static readonly TokenRole FinallyKeywordRole = new TokenRole("finally");
public static readonly Role<BlockStatement> FinallyBlockRole = new Role<BlockStatement>("FinallyBlock", BlockStatement.Null); public static readonly Role<BlockStatement> FinallyBlockRole = new Role<BlockStatement>("FinallyBlock", BlockStatement.Null);
public CSharpTokenNode TryToken { public CSharpTokenNode TryToken {
get { return GetChildByRole (TryKeywordRole); } get { return GetChildByRole(TryKeywordRole); }
} }
public BlockStatement TryBlock { public BlockStatement TryBlock {
get { return GetChildByRole (TryBlockRole); } get { return GetChildByRole(TryBlockRole); }
set { SetChildByRole (TryBlockRole, value); } set { SetChildByRole(TryBlockRole, value); }
} }
public AstNodeCollection<CatchClause> CatchClauses { public AstNodeCollection<CatchClause> CatchClauses {
get { return GetChildrenByRole (CatchClauseRole); } get { return GetChildrenByRole(CatchClauseRole); }
} }
public CSharpTokenNode FinallyToken { public CSharpTokenNode FinallyToken {
get { return GetChildByRole (FinallyKeywordRole); } get { return GetChildByRole(FinallyKeywordRole); }
} }
public BlockStatement FinallyBlock { public BlockStatement FinallyBlock {
get { return GetChildByRole (FinallyBlockRole); } get { return GetChildByRole(FinallyBlockRole); }
set { SetChildByRole (FinallyBlockRole, value); } set { SetChildByRole(FinallyBlockRole, value); }
} }
public override void AcceptVisitor (IAstVisitor visitor) public override void AcceptVisitor(IAstVisitor visitor)
{ {
visitor.VisitTryCatchStatement (this); visitor.VisitTryCatchStatement(this);
} }
public override T AcceptVisitor<T> (IAstVisitor<T> visitor) public override T AcceptVisitor<T>(IAstVisitor<T> visitor)
{ {
return visitor.VisitTryCatchStatement (this); return visitor.VisitTryCatchStatement(this);
} }
public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data) public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
{ {
return visitor.VisitTryCatchStatement (this, data); return visitor.VisitTryCatchStatement(this, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{ {
TryCatchStatement o = other as TryCatchStatement; TryCatchStatement o = other as TryCatchStatement;
return o != null && this.TryBlock.DoMatch(o.TryBlock, match) && this.CatchClauses.DoMatch(o.CatchClauses, match) && this.FinallyBlock.DoMatch(o.FinallyBlock, match); return o != null && this.TryBlock.DoMatch(o.TryBlock, match) && this.CatchClauses.DoMatch(o.CatchClauses, match) && this.FinallyBlock.DoMatch(o.FinallyBlock, match);
} }
} }
/// <summary> /// <summary>
/// catch (Type VariableName) { Body } /// catch (Type VariableName) { Body }
/// </summary> /// </summary>
public class CatchClause : AstNode public class CatchClause : AstNode
{ {
public static readonly TokenRole CatchKeywordRole = new TokenRole ("catch"); public static readonly TokenRole CatchKeywordRole = new TokenRole("catch");
public static readonly TokenRole WhenKeywordRole = new TokenRole ("when"); public static readonly TokenRole WhenKeywordRole = new TokenRole("when");
public static readonly Role<Expression> ConditionRole = Roles.Condition; public static readonly Role<Expression> ConditionRole = Roles.Condition;
public static readonly TokenRole CondLPar = new TokenRole("(");
public static readonly TokenRole CondRPar = new TokenRole(")");
#region Null #region Null
public new static readonly CatchClause Null = new NullCatchClause (); public new static readonly CatchClause Null = new NullCatchClause();
sealed class NullCatchClause : CatchClause sealed class NullCatchClause : CatchClause
{ {
public override bool IsNull { public override bool IsNull {
@ -101,22 +103,22 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return true; return true;
} }
} }
public override void AcceptVisitor (IAstVisitor visitor) public override void AcceptVisitor(IAstVisitor visitor)
{ {
visitor.VisitNullNode(this); visitor.VisitNullNode(this);
} }
public override T AcceptVisitor<T> (IAstVisitor<T> visitor) public override T AcceptVisitor<T>(IAstVisitor<T> visitor)
{ {
return visitor.VisitNullNode(this); return visitor.VisitNullNode(this);
} }
public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data) public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
{ {
return visitor.VisitNullNode(this, data); return visitor.VisitNullNode(this, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{ {
return other == null || other.IsNull; return other == null || other.IsNull;
@ -129,26 +131,26 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
return pattern != null ? new PatternPlaceholder(pattern) : null; return pattern != null ? new PatternPlaceholder(pattern) : null;
} }
sealed class PatternPlaceholder : CatchClause, PatternMatching.INode sealed class PatternPlaceholder : CatchClause, PatternMatching.INode
{ {
readonly PatternMatching.Pattern child; readonly PatternMatching.Pattern child;
public PatternPlaceholder(PatternMatching.Pattern child) public PatternPlaceholder(PatternMatching.Pattern child)
{ {
this.child = child; this.child = child;
} }
public override NodeType NodeType { public override NodeType NodeType {
get { return NodeType.Pattern; } get { return NodeType.Pattern; }
} }
public override void AcceptVisitor (IAstVisitor visitor) public override void AcceptVisitor(IAstVisitor visitor)
{ {
visitor.VisitPatternPlaceholder(this, child); visitor.VisitPatternPlaceholder(this, child);
} }
public override T AcceptVisitor<T> (IAstVisitor<T> visitor) public override T AcceptVisitor<T>(IAstVisitor<T> visitor)
{ {
return visitor.VisitPatternPlaceholder(this, child); return visitor.VisitPatternPlaceholder(this, child);
} }
@ -157,90 +159,98 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
{ {
return visitor.VisitPatternPlaceholder(this, child, data); return visitor.VisitPatternPlaceholder(this, child, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{ {
return child.DoMatch(other, match); return child.DoMatch(other, match);
} }
bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo) bool PatternMatching.INode.DoMatchCollection(Role role, PatternMatching.INode pos, PatternMatching.Match match, PatternMatching.BacktrackingInfo backtrackingInfo)
{ {
return child.DoMatchCollection(role, pos, match, backtrackingInfo); return child.DoMatchCollection(role, pos, match, backtrackingInfo);
} }
} }
#endregion #endregion
public override NodeType NodeType { public override NodeType NodeType {
get { get {
return NodeType.Unknown; return NodeType.Unknown;
} }
} }
public CSharpTokenNode CatchToken { public CSharpTokenNode CatchToken {
get { return GetChildByRole (CatchKeywordRole); } get { return GetChildByRole(CatchKeywordRole); }
} }
public CSharpTokenNode LParToken { public CSharpTokenNode LParToken {
get { return GetChildByRole (Roles.LPar); } get { return GetChildByRole(Roles.LPar); }
} }
public AstType Type { public AstType Type {
get { return GetChildByRole (Roles.Type); } get { return GetChildByRole(Roles.Type); }
set { SetChildByRole (Roles.Type, value); } set { SetChildByRole(Roles.Type, value); }
} }
public string VariableName { public string VariableName {
get { return GetChildByRole (Roles.Identifier).Name; } get { return GetChildByRole(Roles.Identifier).Name; }
set { set {
if (string.IsNullOrEmpty(value)) if (string.IsNullOrEmpty(value))
SetChildByRole (Roles.Identifier, null); SetChildByRole(Roles.Identifier, null);
else else
SetChildByRole (Roles.Identifier, Identifier.Create (value)); SetChildByRole(Roles.Identifier, Identifier.Create(value));
} }
} }
public Identifier VariableNameToken { public Identifier VariableNameToken {
get { get {
return GetChildByRole (Roles.Identifier); return GetChildByRole(Roles.Identifier);
} }
set { set {
SetChildByRole(Roles.Identifier, value); SetChildByRole(Roles.Identifier, value);
} }
} }
public CSharpTokenNode RParToken { public CSharpTokenNode RParToken {
get { return GetChildByRole (Roles.RPar); } get { return GetChildByRole(Roles.RPar); }
} }
public CSharpTokenNode WhenToken { public CSharpTokenNode WhenToken {
get { return GetChildByRole (WhenKeywordRole); } get { return GetChildByRole(WhenKeywordRole); }
} }
public CSharpTokenNode CondLParToken {
get { return GetChildByRole(CondLPar); }
}
public Expression Condition { public Expression Condition {
get { return GetChildByRole(ConditionRole); } get { return GetChildByRole(ConditionRole); }
set { SetChildByRole(ConditionRole, value); } set { SetChildByRole(ConditionRole, value); }
} }
public CSharpTokenNode CondRParToken {
get { return GetChildByRole(CondRPar); }
}
public BlockStatement Body { public BlockStatement Body {
get { return GetChildByRole (Roles.Body); } get { return GetChildByRole(Roles.Body); }
set { SetChildByRole (Roles.Body, value); } set { SetChildByRole(Roles.Body, value); }
} }
public override void AcceptVisitor (IAstVisitor visitor) public override void AcceptVisitor(IAstVisitor visitor)
{ {
visitor.VisitCatchClause (this); visitor.VisitCatchClause(this);
} }
public override T AcceptVisitor<T> (IAstVisitor<T> visitor) public override T AcceptVisitor<T>(IAstVisitor<T> visitor)
{ {
return visitor.VisitCatchClause (this); return visitor.VisitCatchClause(this);
} }
public override S AcceptVisitor<T, S> (IAstVisitor<T, S> visitor, T data) public override S AcceptVisitor<T, S>(IAstVisitor<T, S> visitor, T data)
{ {
return visitor.VisitCatchClause (this, data); return visitor.VisitCatchClause(this, data);
} }
protected internal override bool DoMatch(AstNode other, PatternMatching.Match match) protected internal override bool DoMatch(AstNode other, PatternMatching.Match match)
{ {
CatchClause o = other as CatchClause; CatchClause o = other as CatchClause;

97
ICSharpCode.Decompiler/CSharp/Transforms/ConvertConstructorCallIntoInitializer.cs → ICSharpCode.Decompiler/CSharp/Transforms/TransformFieldAndConstructorInitializers.cs

@ -17,7 +17,6 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.CSharp.Syntax; using ICSharpCode.Decompiler.CSharp.Syntax;
using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching; using ICSharpCode.Decompiler.CSharp.Syntax.PatternMatching;
@ -27,35 +26,31 @@ using SRM = System.Reflection.Metadata;
namespace ICSharpCode.Decompiler.CSharp.Transforms namespace ICSharpCode.Decompiler.CSharp.Transforms
{ {
/// <summary> /// <summary>
/// If the first element of a constructor is a chained constructor call, convert it into a constructor initializer. /// This transform moves field initializers at the start of constructors to their respective field declarations
/// and transforms this-/base-ctor calls in constructors to constructor initializers.
/// </summary> /// </summary>
public class ConvertConstructorCallIntoInitializer : IAstTransform public class TransformFieldAndConstructorInitializers : DepthFirstAstVisitor, IAstTransform
{ {
public void Run(AstNode node, TransformContext context) TransformContext context;
{
var visitor = new ConvertConstructorCallIntoInitializerVisitor(context);
// If we're viewing some set of members (fields are direct children of SyntaxTree),
// we also need to handle those:
visitor.HandleInstanceFieldInitializers(node.Children);
visitor.HandleStaticFieldInitializers(node.Children);
node.AcceptVisitor(visitor);
visitor.RemoveSingleEmptyConstructor(node.Children, context.CurrentTypeDefinition); public void Run(AstNode node, TransformContext context)
}
}
sealed class ConvertConstructorCallIntoInitializerVisitor : DepthFirstAstVisitor
{
readonly TransformContext context;
public ConvertConstructorCallIntoInitializerVisitor(TransformContext context)
{ {
Debug.Assert(context != null);
this.context = context; this.context = context;
try {
// If we're viewing some set of members (fields are direct children of SyntaxTree),
// we also need to handle those:
HandleInstanceFieldInitializers(node.Children);
HandleStaticFieldInitializers(node.Children);
node.AcceptVisitor(this);
RemoveSingleEmptyConstructor(node.Children, context.CurrentTypeDefinition);
} finally {
this.context = null;
}
} }
public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration) public override void VisitConstructorDeclaration(ConstructorDeclaration constructorDeclaration)
{ {
if (!(constructorDeclaration.Body.Statements.FirstOrDefault() is ExpressionStatement stmt)) if (!(constructorDeclaration.Body.Statements.FirstOrDefault() is ExpressionStatement stmt))
@ -109,7 +104,7 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
break; break;
} }
} }
static readonly ExpressionStatement fieldInitializerPattern = new ExpressionStatement { static readonly ExpressionStatement fieldInitializerPattern = new ExpressionStatement {
Expression = new AssignmentExpression { Expression = new AssignmentExpression {
Left = new Choice { Left = new Choice {
@ -123,25 +118,25 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
Right = new AnyNode("initializer") Right = new AnyNode("initializer")
} }
}; };
static readonly AstNode thisCallPattern = new ExpressionStatement(new InvocationExpression(new MemberReferenceExpression(new ThisReferenceExpression(), ".ctor"), new Repeat(new AnyNode()))); static readonly AstNode thisCallPattern = new ExpressionStatement(new InvocationExpression(new MemberReferenceExpression(new ThisReferenceExpression(), ".ctor"), new Repeat(new AnyNode())));
public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration) public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
{ {
// Handle initializers on instance fields // Handle initializers on instance fields
HandleInstanceFieldInitializers(typeDeclaration.Members); HandleInstanceFieldInitializers(typeDeclaration.Members);
// Now convert base constructor calls to initializers: // Now convert base constructor calls to initializers:
base.VisitTypeDeclaration(typeDeclaration); base.VisitTypeDeclaration(typeDeclaration);
// Remove single empty constructor: // Remove single empty constructor:
RemoveSingleEmptyConstructor(typeDeclaration.Members, (ITypeDefinition)typeDeclaration.GetSymbol()); RemoveSingleEmptyConstructor(typeDeclaration.Members, (ITypeDefinition)typeDeclaration.GetSymbol());
// Handle initializers on static fields: // Handle initializers on static fields:
HandleStaticFieldInitializers(typeDeclaration.Members); HandleStaticFieldInitializers(typeDeclaration.Members);
} }
internal void HandleInstanceFieldInitializers(IEnumerable<AstNode> members) void HandleInstanceFieldInitializers(IEnumerable<AstNode> members)
{ {
var instanceCtors = members.OfType<ConstructorDeclaration>().Where(c => (c.Modifiers & Modifiers.Static) == 0).ToArray(); var instanceCtors = members.OfType<ConstructorDeclaration>().Where(c => (c.Modifiers & Modifiers.Static) == 0).ToArray();
var instanceCtorsNotChainingWithThis = instanceCtors.Where(ctor => !thisCallPattern.IsMatch(ctor.Body.Statements.FirstOrDefault())).ToArray(); var instanceCtorsNotChainingWithThis = instanceCtors.Where(ctor => !thisCallPattern.IsMatch(ctor.Body.Statements.FirstOrDefault())).ToArray();
@ -151,7 +146,7 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
return; return;
bool ctorIsUnsafe = instanceCtorsNotChainingWithThis.All(c => c.HasModifier(Modifiers.Unsafe)); bool ctorIsUnsafe = instanceCtorsNotChainingWithThis.All(c => c.HasModifier(Modifiers.Unsafe));
// Recognize field or property initializers: // Recognize field or property initializers:
// Translate first statement in all ctors (if all ctors have the same statement) into an initializer. // Translate first statement in all ctors (if all ctors have the same statement) into an initializer.
bool allSame; bool allSame;
@ -170,7 +165,7 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
// 'this'/'base' cannot be used in initializers // 'this'/'base' cannot be used in initializers
if (initializer.DescendantsAndSelf.Any(n => n is ThisReferenceExpression || n is BaseReferenceExpression)) if (initializer.DescendantsAndSelf.Any(n => n is ThisReferenceExpression || n is BaseReferenceExpression))
break; break;
allSame = true; allSame = true;
for (int i = 1; i < instanceCtorsNotChainingWithThis.Length; i++) { for (int i = 1; i < instanceCtorsNotChainingWithThis.Length; i++) {
var otherMatch = fieldInitializerPattern.Match(instanceCtorsNotChainingWithThis[i].Body.FirstOrDefault()); var otherMatch = fieldInitializerPattern.Match(instanceCtorsNotChainingWithThis[i].Body.FirstOrDefault());
@ -200,22 +195,34 @@ namespace ICSharpCode.Decompiler.CSharp.Transforms
} }
} }
internal void RemoveSingleEmptyConstructor(IEnumerable<AstNode> members, ITypeDefinition contextTypeDefinition) void RemoveSingleEmptyConstructor(IEnumerable<AstNode> members, ITypeDefinition contextTypeDefinition)
{ {
// if we're outside of a type definition skip this altogether
if (contextTypeDefinition == null) return; if (contextTypeDefinition == null) return;
// first get non-static constructor declarations from the AST
var instanceCtors = members.OfType<ConstructorDeclaration>().Where(c => (c.Modifiers & Modifiers.Static) == 0).ToArray(); var instanceCtors = members.OfType<ConstructorDeclaration>().Where(c => (c.Modifiers & Modifiers.Static) == 0).ToArray();
if (instanceCtors.Length == 1 && (members.Skip(1).Any() || instanceCtors[0].Parent is TypeDeclaration)) { // if there's exactly one ctor and it's part of a type declaration or there's more than one member in the current selection
ConstructorDeclaration emptyCtor = new ConstructorDeclaration(); // we can remove the constructor. (We do not want to hide the constructor if the user explicitly selected it in the tree view.)
emptyCtor.Modifiers = contextTypeDefinition.IsAbstract ? Modifiers.Protected : Modifiers.Public; if (instanceCtors.Length == 1 && (instanceCtors[0].Parent is TypeDeclaration || members.Skip(1).Any())) {
if (instanceCtors[0].HasModifier(Modifiers.Unsafe)) var ctor = instanceCtors[0];
emptyCtor.Modifiers |= Modifiers.Unsafe; // dynamically create a pattern of an empty ctor
emptyCtor.Body = new BlockStatement(); ConstructorDeclaration emptyCtorPattern = new ConstructorDeclaration();
if (emptyCtor.IsMatch(instanceCtors[0])) emptyCtorPattern.Modifiers = contextTypeDefinition.IsAbstract ? Modifiers.Protected : Modifiers.Public;
instanceCtors[0].Remove(); if (ctor.HasModifier(Modifiers.Unsafe))
emptyCtorPattern.Modifiers |= Modifiers.Unsafe;
emptyCtorPattern.Body = new BlockStatement();
if (emptyCtorPattern.IsMatch(ctor)) {
bool retainBecauseOfDocumentation = ctor.GetSymbol() is IMethod ctorMethod
&& context.Settings.ShowXmlDocumentation
&& context.DecompileRun.DocumentationProvider?.GetDocumentation(ctorMethod) != null;
if (!retainBecauseOfDocumentation)
ctor.Remove();
}
} }
} }
internal void HandleStaticFieldInitializers(IEnumerable<AstNode> members) void HandleStaticFieldInitializers(IEnumerable<AstNode> members)
{ {
// Translate static constructor into field initializers if the class is BeforeFieldInit // Translate static constructor into field initializers if the class is BeforeFieldInit
var staticCtor = members.OfType<ConstructorDeclaration>().FirstOrDefault(c => (c.Modifiers & Modifiers.Static) == Modifiers.Static); var staticCtor = members.OfType<ConstructorDeclaration>().FirstOrDefault(c => (c.Modifiers & Modifiers.Static) == Modifiers.Static);

2
ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs

@ -296,7 +296,7 @@ namespace ICSharpCode.Decompiler.CSharp
break; break;
} }
string targetFramework = module.Reader.DetectTargetFrameworkId(); string targetFramework = module.DetectTargetFrameworkId();
if (!string.IsNullOrEmpty(targetFramework)) { if (!string.IsNullOrEmpty(targetFramework)) {
string[] frameworkParts = targetFramework.Split(','); string[] frameworkParts = targetFramework.Split(',');
result.TargetFrameworkIdentifier = frameworkParts.FirstOrDefault(a => !a.StartsWith("Version=", StringComparison.OrdinalIgnoreCase) && !a.StartsWith("Profile=", StringComparison.OrdinalIgnoreCase)); result.TargetFrameworkIdentifier = frameworkParts.FirstOrDefault(a => !a.StartsWith("Version=", StringComparison.OrdinalIgnoreCase) && !a.StartsWith("Profile=", StringComparison.OrdinalIgnoreCase));

2
ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@ -272,7 +272,7 @@
<Compile Include="CSharp\ExpressionBuilder.cs" /> <Compile Include="CSharp\ExpressionBuilder.cs" />
<Compile Include="CSharp\StatementBuilder.cs" /> <Compile Include="CSharp\StatementBuilder.cs" />
<Compile Include="CSharp\Transforms\AddCheckedBlocks.cs" /> <Compile Include="CSharp\Transforms\AddCheckedBlocks.cs" />
<Compile Include="CSharp\Transforms\ConvertConstructorCallIntoInitializer.cs" /> <Compile Include="CSharp\Transforms\TransformFieldAndConstructorInitializers.cs" />
<Compile Include="CSharp\Transforms\CustomPatterns.cs" /> <Compile Include="CSharp\Transforms\CustomPatterns.cs" />
<Compile Include="CSharp\Transforms\IAstTransform.cs" /> <Compile Include="CSharp\Transforms\IAstTransform.cs" />
<Compile Include="CSharp\Transforms\IntroduceUnsafeModifier.cs" /> <Compile Include="CSharp\Transforms\IntroduceUnsafeModifier.cs" />

7
ICSharpCode.Decompiler/IL/ControlFlow/AsyncAwaitDecompiler.cs

@ -257,8 +257,13 @@ namespace ICSharpCode.Decompiler.IL.ControlFlow
return false; return false;
pos--; pos--;
} }
if (!loadBuilderExpr.MatchLdFld(out var loadStateMachineForBuilderExpr, out builderField)) if (loadBuilderExpr.MatchLdFld(out var loadStateMachineForBuilderExpr, out builderField)) {
// OK, calling Start on copy of stateMachine.<>t__builder
} else if (loadBuilderExpr.MatchLdFlda(out loadStateMachineForBuilderExpr, out builderField)) {
// OK, Roslyn 3.6 started directly calling Start without making a copy
} else {
return false; return false;
}
builderField = (IField)builderField.MemberDefinition; builderField = (IField)builderField.MemberDefinition;
if (!(loadStateMachineForBuilderExpr.MatchLdLocRef(stateMachineVar) || loadStateMachineForBuilderExpr.MatchLdLoc(stateMachineVar))) if (!(loadStateMachineForBuilderExpr.MatchLdLocRef(stateMachineVar) || loadStateMachineForBuilderExpr.MatchLdLoc(stateMachineVar)))
return false; return false;

17
ICSharpCode.Decompiler/IL/ControlFlow/ControlFlowSimplification.cs

@ -197,9 +197,22 @@ namespace ICSharpCode.Decompiler.IL.ControlFlow
bool IsBranchToReturnBlock(Branch branch) bool IsBranchToReturnBlock(Branch branch)
{ {
var targetBlock = branch.TargetBlock; var targetBlock = branch.TargetBlock;
if (targetBlock.Instructions.Count != 1 || targetBlock.FinalInstruction.OpCode != OpCode.Nop) if (targetBlock.Instructions.Count != 1)
return false; return false;
return targetBlock.Instructions[0].MatchReturn(out var value) && value is LdLoc; if (!targetBlock.Instructions[0].MatchReturn(out var value))
return false;
if (!value.MatchLdLoc(out var returnVar))
return false;
var container = branch.TargetContainer;
for (ILInstruction inst = branch; inst != container; inst = inst.Parent) {
if (inst.Parent is TryFinally tryFinally && inst.SlotInfo == TryFinally.TryBlockSlot) {
// The branch will trigger the finally block.
// Moving the return block into the try is only possible if the finally block doesn't touch the return variable.
if (returnVar.IsUsedWithin(tryFinally.FinallyBlock))
return false;
}
}
return true;
} }
static bool CombineBlockWithNextBlock(BlockContainer container, Block block, ILTransformContext context) static bool CombineBlockWithNextBlock(BlockContainer container, Block block, ILTransformContext context)

25
ICSharpCode.Decompiler/IL/Instructions/ILInstruction.cs

@ -214,24 +214,29 @@ namespace ICSharpCode.Decompiler.IL
public void AddILRange(Interval newRange) public void AddILRange(Interval newRange)
{ {
if (this.ILRange.IsEmpty) { this.ILRange = CombineILRange(this.ILRange, newRange);
this.ILRange = newRange; }
return;
protected static Interval CombineILRange(Interval oldRange, Interval newRange)
{
if (oldRange.IsEmpty) {
return newRange;
} }
if (newRange.IsEmpty) { if (newRange.IsEmpty) {
return; return oldRange;
} }
if (newRange.Start <= this.StartILOffset) { if (newRange.Start <= oldRange.Start) {
if (newRange.End < this.StartILOffset) { if (newRange.End < oldRange.Start) {
this.ILRange = newRange; // use the earlier range return newRange; // use the earlier range
} else { } else {
// join overlapping ranges // join overlapping ranges
this.ILRange = new Interval(newRange.Start, Math.Max(newRange.End, this.ILRange.End)); return new Interval(newRange.Start, Math.Max(newRange.End, oldRange.End));
} }
} else if (newRange.Start <= this.ILRange.End) { } else if (newRange.Start <= oldRange.End) {
// join overlapping ranges // join overlapping ranges
this.ILRange = new Interval(this.StartILOffset, Math.Max(newRange.End, this.ILRange.End)); return new Interval(oldRange.Start, Math.Max(newRange.End, oldRange.End));
} }
return oldRange;
} }
public void AddILRange(ILInstruction sourceInstruction) public void AddILRange(ILInstruction sourceInstruction)

13
ICSharpCode.Decompiler/IL/Instructions/TryInstruction.cs

@ -19,6 +19,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using ICSharpCode.Decompiler.Util;
namespace ICSharpCode.Decompiler.IL namespace ICSharpCode.Decompiler.IL
{ {
@ -175,6 +176,18 @@ namespace ICSharpCode.Decompiler.IL
output.Write(' '); output.Write(' ');
body.WriteTo(output, options); body.WriteTo(output, options);
} }
/// <summary>
/// Gets the ILRange of the instructions at the start of the catch-block,
/// that take the exception object and store it in the exception variable slot.
/// Note: This range is empty, if Filter is not empty, i.e., ldloc 1.
/// </summary>
public Interval ExceptionSpecifierILRange { get; private set; }
public void AddExceptionSpecifierILRange(Interval newRange)
{
ExceptionSpecifierILRange = CombineILRange(ExceptionSpecifierILRange, newRange);
}
} }
partial class TryFinally partial class TryFinally

14
ICSharpCode.Decompiler/IL/Transforms/ExpressionTransforms.cs

@ -17,10 +17,12 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System; using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
namespace ICSharpCode.Decompiler.IL.Transforms namespace ICSharpCode.Decompiler.IL.Transforms
{ {
@ -694,7 +696,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
TransformCatchWhen(inst, filterContainer.EntryPoint); TransformCatchWhen(inst, filterContainer.EntryPoint);
} }
if (inst.Body is BlockContainer catchContainer) if (inst.Body is BlockContainer catchContainer)
TransformCatchVariable(inst, catchContainer.EntryPoint); TransformCatchVariable(inst, catchContainer.EntryPoint, isCatchBlock: true);
} }
/// <summary> /// <summary>
@ -711,7 +713,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
/// } /// }
/// } /// }
/// </summary> /// </summary>
void TransformCatchVariable(TryCatchHandler handler, Block entryPoint) void TransformCatchVariable(TryCatchHandler handler, Block entryPoint, bool isCatchBlock)
{ {
if (!handler.Variable.IsSingleDefinition || handler.Variable.LoadCount != 1) if (!handler.Variable.IsSingleDefinition || handler.Variable.LoadCount != 1)
return; // handle.Variable already has non-trivial uses return; // handle.Variable already has non-trivial uses
@ -722,6 +724,8 @@ namespace ICSharpCode.Decompiler.IL.Transforms
if (inlinedUnboxAny.Type.Equals(handler.Variable.Type)) { if (inlinedUnboxAny.Type.Equals(handler.Variable.Type)) {
context.Step("TransformCatchVariable - remove inlined UnboxAny", inlinedUnboxAny); context.Step("TransformCatchVariable - remove inlined UnboxAny", inlinedUnboxAny);
inlinedUnboxAny.ReplaceWith(inlinedUnboxAny.Argument); inlinedUnboxAny.ReplaceWith(inlinedUnboxAny.Argument);
foreach (var range in inlinedUnboxAny.ILRanges)
handler.AddExceptionSpecifierILRange(range);
} }
} }
return; return;
@ -748,6 +752,10 @@ namespace ICSharpCode.Decompiler.IL.Transforms
exceptionVar.Kind = VariableKind.ExceptionLocal; exceptionVar.Kind = VariableKind.ExceptionLocal;
exceptionVar.Type = handler.Variable.Type; exceptionVar.Type = handler.Variable.Type;
handler.Variable = exceptionVar; handler.Variable = exceptionVar;
if (isCatchBlock) {
foreach (var offset in entryPoint.Instructions[0].Descendants.SelectMany(o => o.ILRanges))
handler.AddExceptionSpecifierILRange(offset);
}
entryPoint.Instructions.RemoveAt(0); entryPoint.Instructions.RemoveAt(0);
} }
@ -756,7 +764,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
/// </summary> /// </summary>
void TransformCatchWhen(TryCatchHandler handler, Block entryPoint) void TransformCatchWhen(TryCatchHandler handler, Block entryPoint)
{ {
TransformCatchVariable(handler, entryPoint); TransformCatchVariable(handler, entryPoint, isCatchBlock: false);
if (entryPoint.Instructions.Count == 1 && entryPoint.Instructions[0].MatchLeave(out _, out var condition)) { if (entryPoint.Instructions.Count == 1 && entryPoint.Instructions[0].MatchLeave(out _, out var condition)) {
context.Step("TransformCatchWhen", entryPoint.Instructions[0]); context.Step("TransformCatchWhen", entryPoint.Instructions[0]);
handler.Filter = condition; handler.Filter = condition;

201
ICSharpCode.Decompiler/IL/Transforms/NullPropagationTransform.cs

@ -39,7 +39,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
} }
readonly ILTransformContext context; readonly ILTransformContext context;
public NullPropagationTransform(ILTransformContext context) public NullPropagationTransform(ILTransformContext context)
{ {
this.context = context; this.context = context;
@ -59,6 +59,10 @@ namespace ICSharpCode.Decompiler.IL.Transforms
/// nullable type, used by reference (comparison is 'call get_HasValue(ldloc(testedVar))') /// nullable type, used by reference (comparison is 'call get_HasValue(ldloc(testedVar))')
/// </summary> /// </summary>
NullableByReference, NullableByReference,
/// <summary>
/// unconstrained generic type (see the pattern described in TransformNullPropagationOnUnconstrainedGenericExpression)
/// </summary>
UnconstrainedType,
} }
/// <summary> /// <summary>
@ -142,18 +146,46 @@ namespace ICSharpCode.Decompiler.IL.Transforms
/// </summary> /// </summary>
internal void RunStatements(Block block, int pos) internal void RunStatements(Block block, int pos)
{ {
var ifInst = block.Instructions[pos] as IfInstruction; if (block.Instructions[pos] is IfInstruction ifInst && ifInst.FalseInst.MatchNop()) {
if (ifInst == null || !ifInst.FalseInst.MatchNop()) if (ifInst.Condition is Comp comp && comp.Kind == ComparisonKind.Inequality
return; && comp.Left.MatchLdLoc(out var testedVar) && comp.Right.MatchLdNull()) {
if (ifInst.Condition is Comp comp && comp.Kind == ComparisonKind.Inequality TryNullPropForVoidCall(testedVar, Mode.ReferenceType, ifInst.TrueInst as Block, ifInst);
&& comp.Left.MatchLdLoc(out var testedVar) && comp.Right.MatchLdNull()) { } else if (NullableLiftingTransform.MatchHasValueCall(ifInst.Condition, out ILInstruction arg)) {
TryNullPropForVoidCall(testedVar, Mode.ReferenceType, ifInst.TrueInst as Block, ifInst); if (arg.MatchLdLoca(out testedVar)) {
} else if (NullableLiftingTransform.MatchHasValueCall(ifInst.Condition, out ILInstruction arg)) { TryNullPropForVoidCall(testedVar, Mode.NullableByValue, ifInst.TrueInst as Block, ifInst);
if (arg.MatchLdLoca(out testedVar)) { } else if (arg.MatchLdLoc(out testedVar)) {
TryNullPropForVoidCall(testedVar, Mode.NullableByValue, ifInst.TrueInst as Block, ifInst); TryNullPropForVoidCall(testedVar, Mode.NullableByReference, ifInst.TrueInst as Block, ifInst);
} else if (arg.MatchLdLoc(out testedVar)) { }
TryNullPropForVoidCall(testedVar, Mode.NullableByReference, ifInst.TrueInst as Block, ifInst); }
}
if (TransformNullPropagationOnUnconstrainedGenericExpression(block, pos, out var testedVariable, out var nonNullInst, out var nullInst, out var endBlock)) {
var parentInstruction = nonNullInst.Parent;
var replacement = TryNullPropagation(testedVariable, nonNullInst, nullInst, Mode.UnconstrainedType);
if (replacement == null)
return;
context.Step("TransformNullPropagationOnUnconstrainedGenericExpression", block);
switch (parentInstruction) {
case StLoc stloc:
stloc.Value = replacement;
break;
case Leave leave:
leave.Value = replacement;
break;
default:
// if this ever happens, the pattern checked by TransformNullPropagationOnUnconstrainedGenericExpression
// has changed, but this part of the code was not properly adjusted.
throw new NotSupportedException();
}
// Remove the fallback conditions and blocks
block.Instructions.RemoveRange(pos + 1, 2);
// if the endBlock is only reachable through the current block,
// combine both blocks.
if (endBlock?.IncomingEdgeCount == 1) {
block.Instructions.AddRange(endBlock.Instructions);
block.Instructions.RemoveAt(pos + 2);
endBlock.Remove();
} }
ILInlining.InlineIfPossible(block, pos, context);
} }
} }
@ -261,6 +293,9 @@ namespace ICSharpCode.Decompiler.IL.Transforms
case Mode.NullableByReference: case Mode.NullableByReference:
return NullableLiftingTransform.MatchGetValueOrDefault(inst, out ILInstruction arg) return NullableLiftingTransform.MatchGetValueOrDefault(inst, out ILInstruction arg)
&& arg.MatchLdLoc(testedVar); && arg.MatchLdLoc(testedVar);
case Mode.UnconstrainedType:
// unconstrained generic type (expect: ldloc(testedVar))
return inst.MatchLdLoc(testedVar);
default: default:
throw new ArgumentOutOfRangeException(nameof(mode)); throw new ArgumentOutOfRangeException(nameof(mode));
} }
@ -288,6 +323,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
ILInstruction replacement; ILInstruction replacement;
switch (mode) { switch (mode) {
case Mode.ReferenceType: case Mode.ReferenceType:
case Mode.UnconstrainedType:
// Wrap varLoad in nullable.unwrap: // Wrap varLoad in nullable.unwrap:
replacement = new NullableUnwrap(varLoad.ResultType, varLoad, refInput: varLoad.ResultType == StackType.Ref); replacement = new NullableUnwrap(varLoad.ResultType, varLoad, refInput: varLoad.ResultType == StackType.Ref);
break; break;
@ -310,6 +346,147 @@ namespace ICSharpCode.Decompiler.IL.Transforms
} }
oldParentChildren[oldChildIndex] = replacement; oldParentChildren[oldChildIndex] = replacement;
} }
// stloc target(targetInst)
// stloc defaultTemporary(default.value type)
// if (logic.not(comp.o(box `0(ldloc defaultTemporary) != ldnull))) Block fallbackBlock {
// stloc defaultTemporary(ldobj type(ldloc target))
// stloc target(ldloca defaultTemporary)
// if (comp.o(ldloc defaultTemporary == ldnull)) Block fallbackBlock2 {
// stloc resultTemporary(nullInst)
// br endBlock
// }
// }
// stloc resultTemporary(constrained[type].call_instruction(ldloc target, ...))
// br endBlock
// =>
// stloc resultTemporary(nullable.rewrap(constrained[type].call_instruction(nullable.unwrap(targetInst), ...)))
//
// -or-
//
// stloc target(targetInst)
// stloc defaultTemporary(default.value type)
// if (logic.not(comp.o(box `0(ldloc defaultTemporary) != ldnull))) Block fallbackBlock {
// stloc defaultTemporary(ldobj type(ldloc target))
// stloc target(ldloca defaultTemporary)
// if (comp.o(ldloc defaultTemporary == ldnull)) Block fallbackBlock2 {
// leave(nullInst)
// }
// }
// leave (constrained[type].call_instruction(ldloc target, ...))
// =>
// leave (nullable.rewrap(constrained[type].call_instruction(nullable.unwrap(targetInst), ...)))
private bool TransformNullPropagationOnUnconstrainedGenericExpression(Block block, int pos,
out ILVariable target, out ILInstruction nonNullInst, out ILInstruction nullInst, out Block endBlock)
{
target = null;
nonNullInst = null;
nullInst = null;
endBlock = null;
if (pos + 3 >= block.Instructions.Count)
return false;
// stloc target(...)
if (!block.Instructions[pos].MatchStLoc(out target, out _))
return false;
if (!(target.Kind == VariableKind.StackSlot && target.LoadCount == 2 && target.StoreCount == 2))
return false;
// stloc defaultTemporary(default.value type)
if (!(block.Instructions[pos + 1].MatchStLoc(out var defaultTemporary, out var defaultExpression) && defaultExpression.MatchDefaultValue(out var type)))
return false;
// In the above pattern the defaultTemporary variable is used two times in stloc and ldloc instructions and once in a ldloca instruction
if (!(defaultTemporary.Kind == VariableKind.Local && defaultTemporary.LoadCount == 2 && defaultTemporary.StoreCount == 2 && defaultTemporary.AddressCount == 1))
return false;
// if (logic.not(comp.o(box `0(ldloc defaultTemporary) != ldnull))) Block fallbackBlock
if (!(block.Instructions[pos + 2].MatchIfInstruction(out var condition, out var fallbackBlock1) && condition.MatchCompEqualsNull(out var arg) && arg.MatchLdLoc(defaultTemporary)))
return false;
if (!MatchStLocResultTemporary(block, pos, type, target, defaultTemporary, fallbackBlock1, out nonNullInst, out nullInst, out endBlock)
&& !MatchLeaveResult(block, pos, type, target, defaultTemporary, fallbackBlock1, out nonNullInst, out nullInst))
return false;
return true;
}
// stloc resultTemporary(constrained[type].call_instruction(ldloc target, ...))
// br endBlock
private bool MatchStLocResultTemporary(Block block, int pos, IType type, ILVariable target, ILVariable defaultTemporary, ILInstruction fallbackBlock, out ILInstruction nonNullInst, out ILInstruction nullInst, out Block endBlock)
{
endBlock = null;
nonNullInst = null;
nullInst = null;
if (pos + 4 >= block.Instructions.Count)
return false;
// stloc resultTemporary(constrained[type].call_instruction(ldloc target, ...))
if (!(block.Instructions[pos + 3].MatchStLoc(out var resultTemporary, out nonNullInst)))
return false;
// br endBlock
if (!(block.Instructions[pos + 4].MatchBranch(out endBlock)))
return false;
// Analyze Block fallbackBlock
if (!(fallbackBlock is Block b && IsFallbackBlock(b, type, target, defaultTemporary, resultTemporary, endBlock, out nullInst)))
return false;
return true;
}
private bool MatchLeaveResult(Block block, int pos, IType type, ILVariable target, ILVariable defaultTemporary, ILInstruction fallbackBlock, out ILInstruction nonNullInst, out ILInstruction nullInst)
{
nonNullInst = null;
nullInst = null;
// leave (constrained[type].call_instruction(ldloc target, ...))
if (!(block.Instructions[pos + 3] is Leave leave && leave.IsLeavingFunction))
return false;
nonNullInst = leave.Value;
// Analyze Block fallbackBlock
if (!(fallbackBlock is Block b && IsFallbackBlock(b, type, target, defaultTemporary, null, leave.TargetContainer, out nullInst)))
return false;
return true;
}
// Block fallbackBlock {
// stloc defaultTemporary(ldobj type(ldloc target))
// stloc target(ldloca defaultTemporary)
// if (comp.o(ldloc defaultTemporary == ldnull)) Block fallbackBlock {
// stloc resultTemporary(ldnull)
// br endBlock
// }
// }
private bool IsFallbackBlock(Block block, IType type, ILVariable target, ILVariable defaultTemporary, ILVariable resultTemporary, ILInstruction endBlockOrLeaveContainer, out ILInstruction nullInst)
{
nullInst = null;
if (!(block.Instructions.Count == 3))
return false;
// stloc defaultTemporary(ldobj type(ldloc target))
if (!(block.Instructions[0].MatchStLoc(defaultTemporary, out var value)))
return false;
if (!(value.MatchLdObj(out var inst, out var t) && type.Equals(t) && inst.MatchLdLoc(target)))
return false;
// stloc target(ldloca defaultTemporary)
if (!(block.Instructions[1].MatchStLoc(target, out var defaultAddress) && defaultAddress.MatchLdLoca(defaultTemporary)))
return false;
// if (comp.o(ldloc defaultTemporary == ldnull)) Block fallbackBlock
if (!(block.Instructions[2].MatchIfInstruction(out var condition, out var tmp) && condition.MatchCompEqualsNull(out var arg) && arg.MatchLdLoc(defaultTemporary)))
return false;
// Block fallbackBlock {
// stloc resultTemporary(nullInst)
// br endBlock
// }
var fallbackInst = Block.Unwrap(tmp);
if (fallbackInst is Block fallbackBlock && endBlockOrLeaveContainer is Block endBlock) {
if (!(fallbackBlock.Instructions.Count == 2))
return false;
if (!fallbackBlock.Instructions[0].MatchStLoc(resultTemporary, out nullInst))
return false;
if (!fallbackBlock.Instructions[1].MatchBranch(endBlock))
return false;
} else {
if (!(fallbackInst is Leave fallbackLeave && endBlockOrLeaveContainer is BlockContainer leaveContainer
&& fallbackLeave.TargetContainer == leaveContainer && !fallbackLeave.Value.MatchNop()))
return false;
nullInst = fallbackLeave.Value;
}
return true;
}
} }
class NullPropagationStatementTransform : IStatementTransform class NullPropagationStatementTransform : IStatementTransform

595
ICSharpCode.Decompiler/IL/Transforms/TransformExpressionTrees.cs

File diff suppressed because it is too large Load Diff

2
ICSharpCode.Decompiler/Metadata/DotNetCorePathFinder.cs

@ -206,7 +206,7 @@ namespace ICSharpCode.Decompiler.Metadata
} }
} }
static string FindDotNetExeDirectory() public static string FindDotNetExeDirectory()
{ {
string dotnetExeName = (Environment.OSVersion.Platform == PlatformID.Unix) ? "dotnet" : "dotnet.exe"; string dotnetExeName = (Environment.OSVersion.Platform == PlatformID.Unix) ? "dotnet" : "dotnet.exe";
foreach (var item in Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator)) { foreach (var item in Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator)) {

28
ICSharpCode.Decompiler/Metadata/DotNetCorePathFinderExtensions.cs

@ -29,8 +29,16 @@ namespace ICSharpCode.Decompiler.Metadata
public static class DotNetCorePathFinderExtensions public static class DotNetCorePathFinderExtensions
{ {
static readonly string RefPathPattern = static readonly string RefPathPattern =
@"(Reference Assemblies[/\\]Microsoft[/\\]Framework[/\\](?<1>.NETFramework)[/\\]v(?<2>[^/\\]+)[/\\])" + @"(Reference Assemblies[/\\]Microsoft[/\\]Framework[/\\](?<type>.NETFramework)[/\\]v(?<version>[^/\\]+)[/\\])" +
@"|(NuGetFallbackFolder[/\\](?<1>[^/\\]+)\\(?<2>[^/\\]+)([/\\].*)?[/\\]ref[/\\])"; @"|((?<type>Microsoft\.NET)[/\\]assembly[/\\]GAC_(MSIL|32|64)[/\\])" +
@"|((?<type>Microsoft\.NET)[/\\]Framework(64)?[/\\](?<version>[^/\\]+)[/\\])" +
@"|(NuGetFallbackFolder[/\\](?<type>[^/\\]+)\\(?<version>[^/\\]+)([/\\].*)?[/\\]ref[/\\])" +
@"|(shared[/\\](?<type>[^/\\]+)\\(?<version>[^/\\]+)([/\\].*)?[/\\])";
public static string DetectTargetFrameworkId(this PEFile assembly)
{
return DetectTargetFrameworkId(assembly.Reader, assembly.FileName);
}
public static string DetectTargetFrameworkId(this PEReader assembly, string assemblyPath = null) public static string DetectTargetFrameworkId(this PEReader assembly, string assemblyPath = null)
{ {
@ -62,16 +70,20 @@ namespace ICSharpCode.Decompiler.Metadata
var pathMatch = Regex.Match(assemblyPath, RefPathPattern, var pathMatch = Regex.Match(assemblyPath, RefPathPattern,
RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ExplicitCapture); RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ExplicitCapture);
if (pathMatch.Success) { if (pathMatch.Success) {
var type = pathMatch.Groups[1].Value; var type = pathMatch.Groups["type"].Value;
var version = pathMatch.Groups[2].Value; var version = pathMatch.Groups["version"].Value;
if (string.IsNullOrEmpty(version))
version = reader.MetadataVersion;
if (type == ".NETFramework") { if (type == "Microsoft.NET" || type == ".NETFramework") {
return $".NETFramework,Version=v{version}"; return $".NETFramework,Version=v{version.TrimStart('v').Substring(0, 3)}";
} else if (type.Contains("netcore")) { } else if (type.IndexOf("netcore", StringComparison.OrdinalIgnoreCase) >= 0) {
return $".NETCoreApp,Version=v{version}"; return $".NETCoreApp,Version=v{version}";
} else if (type.Contains("netstandard")) { } else if (type.IndexOf("netstandard", StringComparison.OrdinalIgnoreCase) >= 0) {
return $".NETStandard,Version=v{version}"; return $".NETStandard,Version=v{version}";
} }
} else {
return $".NETFramework,Version={reader.MetadataVersion.Substring(0, 4)}";
} }
} }

38
ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs

@ -23,6 +23,7 @@ using System.Linq;
using System.Reflection.Metadata; using System.Reflection.Metadata;
using System.Reflection.PortableExecutable; using System.Reflection.PortableExecutable;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
namespace ICSharpCode.Decompiler.Metadata namespace ICSharpCode.Decompiler.Metadata
{ {
@ -63,7 +64,7 @@ namespace ICSharpCode.Decompiler.Metadata
readonly string mainAssemblyFileName; readonly string mainAssemblyFileName;
readonly string baseDirectory; readonly string baseDirectory;
readonly List<string> directories = new List<string>(); readonly List<string> directories = new List<string>();
readonly List<string> gac_paths = GetGacPaths(); static readonly List<string> gac_paths = GetGacPaths();
HashSet<string> targetFrameworkSearchPaths; HashSet<string> targetFrameworkSearchPaths;
static readonly DecompilerRuntime decompilerRuntime; static readonly DecompilerRuntime decompilerRuntime;
@ -465,7 +466,7 @@ namespace ICSharpCode.Decompiler.Metadata
return path; return path;
} }
static List<string> GetGacPaths() public static List<string> GetGacPaths()
{ {
if (decompilerRuntime == DecompilerRuntime.Mono) if (decompilerRuntime == DecompilerRuntime.Mono)
return GetDefaultMonoGacPaths(); return GetDefaultMonoGacPaths();
@ -512,7 +513,7 @@ namespace ICSharpCode.Decompiler.Metadata
"gac"); "gac");
} }
string GetAssemblyInGac(IAssemblyReference reference) public static string GetAssemblyInGac(IAssemblyReference reference)
{ {
if (reference.PublicKeyToken == null || reference.PublicKeyToken.Length == 0) if (reference.PublicKeyToken == null || reference.PublicKeyToken.Length == 0)
return null; return null;
@ -523,7 +524,7 @@ namespace ICSharpCode.Decompiler.Metadata
return GetAssemblyInNetGac(reference); return GetAssemblyInNetGac(reference);
} }
string GetAssemblyInMonoGac(IAssemblyReference reference) static string GetAssemblyInMonoGac(IAssemblyReference reference)
{ {
for (int i = 0; i < gac_paths.Count; i++) { for (int i = 0; i < gac_paths.Count; i++) {
var gac_path = gac_paths[i]; var gac_path = gac_paths[i];
@ -535,7 +536,7 @@ namespace ICSharpCode.Decompiler.Metadata
return null; return null;
} }
string GetAssemblyInNetGac(IAssemblyReference reference) static string GetAssemblyInNetGac(IAssemblyReference reference)
{ {
var gacs = new[] { "GAC_MSIL", "GAC_32", "GAC_64", "GAC" }; var gacs = new[] { "GAC_MSIL", "GAC_32", "GAC_64", "GAC" };
var prefixes = new[] { string.Empty, "v4.0_" }; var prefixes = new[] { string.Empty, "v4.0_" };
@ -568,6 +569,33 @@ namespace ICSharpCode.Decompiler.Metadata
reference.Name + ".dll"); reference.Name + ".dll");
} }
/// <summary>
/// Gets the names of all assemblies in the GAC.
/// </summary>
public static IEnumerable<AssemblyNameReference> EnumerateGac()
{
var gacs = new[] { "GAC_MSIL", "GAC_32", "GAC_64", "GAC" };
foreach (var path in GetGacPaths()) {
foreach (var gac in gacs) {
string rootPath = Path.Combine(path, gac);
if (!Directory.Exists(rootPath))
continue;
foreach (var item in new DirectoryInfo(rootPath).EnumerateFiles("*.dll", SearchOption.AllDirectories)) {
string[] name = Path.GetDirectoryName(item.FullName).Substring(rootPath.Length + 1).Split(new[] { "\\" }, StringSplitOptions.RemoveEmptyEntries);
if (name.Length != 2)
continue;
var match = Regex.Match(name[1], $"(v4.0_)?(?<version>[^_]+)_(?<culture>[^_]+)?_(?<publicKey>[^_]+)");
if (!match.Success)
continue;
string culture = match.Groups["culture"].Value;
if (string.IsNullOrEmpty(culture))
culture = "neutral";
yield return AssemblyNameReference.Parse(name[0] + ", Version=" + match.Groups["version"].Value + ", Culture=" + culture + ", PublicKeyToken=" + match.Groups["publicKey"].Value);
}
}
}
}
#endregion #endregion
} }
} }

3
ILSpy.AddIn/Commands/ProjectReferenceForILSpy.cs

@ -4,6 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using EnvDTE; using EnvDTE;
using ICSharpCode.Decompiler.Metadata;
using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell;
using Mono.Cecil; using Mono.Cecil;
@ -74,7 +75,7 @@ namespace ICSharpCode.ILSpy.AddIn.Commands
if (resolvedPath != null) { if (resolvedPath != null) {
return new ILSpyParameters(new[] { $"{resolvedPath}" }); return new ILSpyParameters(new[] { $"{resolvedPath}" });
} else if (!string.IsNullOrWhiteSpace(fusionName)) { } else if (!string.IsNullOrWhiteSpace(fusionName)) {
return new ILSpyParameters(new string[] { GacInterop.FindAssemblyInNetGac(Decompiler.Metadata.AssemblyNameReference.Parse(fusionName)) }); return new ILSpyParameters(new string[] { UniversalAssemblyResolver.GetAssemblyInGac(Decompiler.Metadata.AssemblyNameReference.Parse(fusionName)) });
} }
return null; return null;

19
ILSpy.BamlDecompiler.Tests/BamlTestRunner.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2020 AlphaSierraPapa for the SharpDevelop Team
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System; using System;
using System.Collections; using System.Collections;

19
ILSpy.BamlDecompiler.Tests/Cases/AttachedEvent.xaml.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2020 Siegfried Pammer
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System; using System;
using System.Windows; using System.Windows;

20
ILSpy.BamlDecompiler.Tests/Cases/CustomControl.cs

@ -1,4 +1,22 @@
using System.Windows; // Copyright (c) 2020 AlphaSierraPapa for the SharpDevelop Team
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
namespace ILSpy.BamlDecompiler.Tests.Cases namespace ILSpy.BamlDecompiler.Tests.Cases

20
ILSpy.BamlDecompiler.Tests/Cases/Issue1547.xaml.cs

@ -1,4 +1,22 @@
using System; // Copyright (c) 2020 Siegfried Pammer
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;

19
ILSpy.BamlDecompiler.Tests/Cases/MyControl.xaml.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2020 Siegfried Pammer
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System.Windows.Controls; using System.Windows.Controls;

19
ILSpy.BamlDecompiler.Tests/Cases/Resources.xaml.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2020 Siegfried Pammer
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System.Windows; using System.Windows;

19
ILSpy.BamlDecompiler.Tests/Cases/Simple.xaml.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2020 Siegfried Pammer
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System.Windows; using System.Windows;

19
ILSpy.BamlDecompiler.Tests/Cases/SimpleNames.xaml.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2020 Siegfried Pammer
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System.Windows; using System.Windows;

19
ILSpy.BamlDecompiler.Tests/Mocks/AvalonDock.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2020 Siegfried Pammer
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System.Windows; using System.Windows;
using System.Windows.Controls.Primitives; using System.Windows.Controls.Primitives;

4
ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj

@ -56,8 +56,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Iced" Version="1.4.0" /> <PackageReference Include="Iced" Version="1.6.0" />
<PackageReference Include="ILCompiler.Reflection.ReadyToRun" Version="1.0.6-alpha" /> <PackageReference Include="ILCompiler.Reflection.ReadyToRun" Version="1.0.7-alpha" />
</ItemGroup> </ItemGroup>
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

15
ILSpy.ReadyToRun/ReadyToRunLanguage.cs

@ -125,13 +125,24 @@ namespace ICSharpCode.ILSpy.ReadyToRun
} }
formatter.Options.DigitSeparator = "`"; formatter.Options.DigitSeparator = "`";
formatter.Options.FirstOperandCharIndex = 10; formatter.Options.FirstOperandCharIndex = 10;
var tempOutput = new StringBuilderFormatterOutput(); var tempOutput = new StringOutput();
foreach (var instr in instructions) { foreach (var instr in instructions) {
int byteBaseIndex = (int)(instr.IP - address); int byteBaseIndex = (int)(instr.IP - address);
foreach (var bound in runtimeFunction.DebugInfo.BoundsList) {
if (bound.NativeOffset == byteBaseIndex) {
if (bound.ILOffset == (uint)DebugInfoBoundsType.Prolog) {
WriteCommentLine(output, "Prolog");
} else if (bound.ILOffset == (uint)DebugInfoBoundsType.Epilog) {
WriteCommentLine(output, "Epilog");
} else {
WriteCommentLine(output, $"IL_{bound.ILOffset:x4}");
}
}
}
formatter.Format(instr, tempOutput); formatter.Format(instr, tempOutput);
output.Write(instr.IP.ToString("X16")); output.Write(instr.IP.ToString("X16"));
output.Write(" "); output.Write(" ");
int instrLen = instr.ByteLength; int instrLen = instr.Length;
for (int i = 0; i < instrLen; i++) for (int i = 0; i < instrLen; i++)
output.Write(codeBytes[byteBaseIndex + i].ToString("X2")); output.Write(codeBytes[byteBaseIndex + i].ToString("X2"));
int missingBytes = 10 - instrLen; int missingBytes = 10 - instrLen;

4
ILSpy.Tests/ILSpy.Tests.csproj

@ -45,8 +45,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="DiffLib" Version="2017.7.26.1241" /> <PackageReference Include="DiffLib" Version="2017.7.26.1241" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0-beta2-final" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0-3.final" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.5.0-beta2-final" /> <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.6.0-3.final" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
<PackageReference Include="NUnit" Version="3.11.0" /> <PackageReference Include="NUnit" Version="3.11.0" />

4
ILSpy/Analyzers/Builtin/TypeUsedByAnalyzer.cs

@ -82,6 +82,10 @@ namespace ICSharpCode.ILSpy.Analyzers.Builtin
method.ReturnType.AcceptVisitor(visitor); method.ReturnType.AcceptVisitor(visitor);
foreach (var t in method.TypeArguments) {
t.AcceptVisitor(visitor);
}
if (scanBodies && !visitor.Found) if (scanBodies && !visitor.Found)
ScanMethodBody(visitor, method, context.GetMethodBody(method), context); ScanMethodBody(visitor, method, context.GetMethodBody(method), context);

2
ILSpy/AssemblyList.cs

@ -39,7 +39,7 @@ namespace ICSharpCode.ILSpy
/// <summary>Dirty flag, used to mark modifications so that the list is saved later</summary> /// <summary>Dirty flag, used to mark modifications so that the list is saved later</summary>
bool dirty; bool dirty;
internal readonly ConcurrentDictionary<(string assemblyName, bool isWinRT), LoadedAssembly> assemblyLookupCache = new ConcurrentDictionary<(string assemblyName, bool isWinRT), LoadedAssembly>(); internal readonly ConcurrentDictionary<(string assemblyName, bool isWinRT, string targetFrameworkIdentifier), LoadedAssembly> assemblyLookupCache = new ConcurrentDictionary<(string assemblyName, bool isWinRT, string targetFrameworkIdentifier), LoadedAssembly>();
internal readonly ConcurrentDictionary<string, LoadedAssembly> moduleLookupCache = new ConcurrentDictionary<string, LoadedAssembly>(); internal readonly ConcurrentDictionary<string, LoadedAssembly> moduleLookupCache = new ConcurrentDictionary<string, LoadedAssembly>();
/// <summary> /// <summary>

35
ILSpy/AssemblyListManager.cs

@ -20,6 +20,7 @@ using System;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Xml.Linq; using System.Xml.Linq;
using ICSharpCode.ILSpy.ViewModels;
namespace ICSharpCode.ILSpy namespace ICSharpCode.ILSpy
{ {
@ -76,6 +77,13 @@ namespace ICSharpCode.ILSpy
return CreateList(newList); return CreateList(newList);
} }
public bool RenameList(string selectedAssemblyList, string newListName)
{
var list = DoLoadList(spySettings, selectedAssemblyList);
var newList = new AssemblyList(list, newListName);
return DeleteList(selectedAssemblyList) && CreateList(newList);
}
public const string DefaultListName = "(Default)"; public const string DefaultListName = "(Default)";
/// <summary> /// <summary>
@ -144,5 +152,32 @@ namespace ICSharpCode.ILSpy
doc.Remove(); doc.Remove();
}); });
} }
public void CreateDefaultAssemblyLists()
{
if (AssemblyLists.Count > 0)
return;
if (!AssemblyLists.Contains(ManageAssemblyListsViewModel.DotNet4List)) {
AssemblyList dotnet4 = ManageAssemblyListsViewModel.CreateDefaultList(ManageAssemblyListsViewModel.DotNet4List);
if (dotnet4.assemblies.Count > 0) {
CreateList(dotnet4);
}
}
if (!AssemblyLists.Contains(ManageAssemblyListsViewModel.DotNet35List)) {
AssemblyList dotnet35 = ManageAssemblyListsViewModel.CreateDefaultList(ManageAssemblyListsViewModel.DotNet35List);
if (dotnet35.assemblies.Count > 0) {
CreateList(dotnet35);
}
}
if (!AssemblyLists.Contains(ManageAssemblyListsViewModel.ASPDotNetMVC3List)) {
AssemblyList mvc = ManageAssemblyListsViewModel.CreateDefaultList(ManageAssemblyListsViewModel.ASPDotNetMVC3List);
if (mvc.assemblies.Count > 0) {
CreateList(mvc);
}
}
}
} }
} }

32
ILSpy/Commands/DecompileCommand.cs

@ -1,20 +1,28 @@
using System; // Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
using System.Collections.Generic; //
using System.Diagnostics; // Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Reflection.Metadata;
using System.Reflection.Metadata.Ecma335; using System.Reflection.Metadata.Ecma335;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem; using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.Analyzers;
using ICSharpCode.ILSpy.Controls;
using ICSharpCode.ILSpy.Metadata; using ICSharpCode.ILSpy.Metadata;
using ICSharpCode.ILSpy.TreeNodes; using ICSharpCode.ILSpy.TreeNodes;
@ -66,7 +74,7 @@ namespace ICSharpCode.ILSpy.Commands
public void Execute(TextViewContext context) public void Execute(TextViewContext context)
{ {
int token = GetSelectedToken(context.DataGrid, out PEFile module).Value; int token = GetSelectedToken(context.DataGrid, out PEFile module).Value;
MainWindow.Instance.JumpToReference(("metadata", module, MetadataTokens.Handle(token))); MainWindow.Instance.JumpToReference(new EntityReference("metadata", module, MetadataTokens.Handle(token)));
} }
public bool IsEnabled(TextViewContext context) public bool IsEnabled(TextViewContext context)

32
ILSpy/Commands/DelegateCommand.cs

@ -7,6 +7,38 @@ using System.Windows.Input;
namespace ICSharpCode.ILSpy.Commands namespace ICSharpCode.ILSpy.Commands
{ {
public class DelegateCommand : ICommand
{
private readonly Action action;
private readonly Func<bool> canExecute;
public event EventHandler CanExecuteChanged {
add { CommandManager.RequerySuggested += value; }
remove { CommandManager.RequerySuggested -= value; }
}
public DelegateCommand(Action action)
: this(action, () => true)
{
}
public DelegateCommand(Action action, Func<bool> canExecute)
{
this.action = action;
this.canExecute = canExecute;
}
public bool CanExecute(object parameter)
{
return canExecute();
}
public void Execute(object parameter)
{
action();
}
}
public class DelegateCommand<T> : ICommand public class DelegateCommand<T> : ICommand
{ {
private readonly Action<T> action; private readonly Action<T> action;

45
ILSpy/EntityReference.cs

@ -0,0 +1,45 @@
// Copyright (c) 2018 Siegfried Pammer
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Diagnostics;
using System.Reflection.Metadata;
using ICSharpCode.Decompiler.Metadata;
namespace ICSharpCode.ILSpy
{
[DebuggerDisplay("EntityReference Module={Module}, Handle={Handle}, Protocol={Protocol}")]
public class EntityReference
{
public PEFile Module { get; }
public Handle Handle { get; }
public string Protocol { get; }
public EntityReference(PEFile module, Handle handle)
{
this.Module = module ?? throw new ArgumentNullException(nameof(module));
this.Handle = handle;
}
public EntityReference(string protocol, PEFile module, Handle handle)
: this(module, handle)
{
this.Protocol = protocol ?? "decompile";
}
}
}

135
ILSpy/Fusion.cs

@ -1,135 +0,0 @@
// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Runtime.InteropServices;
using System.Text;
namespace ICSharpCode.ILSpy
{
// .NET Fusion COM interfaces
[ComImport(), Guid("CD193BC0-B4BC-11D2-9833-00C04FC31D2E"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
internal interface IAssemblyName
{
[PreserveSig()]
int SetProperty(uint PropertyId, IntPtr pvProperty, uint cbProperty);
[PreserveSig()]
int GetProperty(uint PropertyId, IntPtr pvProperty, ref uint pcbProperty);
[PreserveSig()]
int Finalize();
[PreserveSig()]
int GetDisplayName([Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder szDisplayName,
ref uint pccDisplayName,
uint dwDisplayFlags);
[PreserveSig()]
int BindToObject(object refIID,
object pAsmBindSink,
IApplicationContext pApplicationContext,
[MarshalAs(UnmanagedType.LPWStr)] string szCodeBase,
long llFlags,
int pvReserved,
uint cbReserved,
out int ppv);
[PreserveSig()]
int GetName(ref uint lpcwBuffer,
[Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pwzName);
[PreserveSig()]
int GetVersion(out uint pdwVersionHi, out uint pdwVersionLow);
[PreserveSig()]
int IsEqual(IAssemblyName pName,
uint dwCmpFlags);
[PreserveSig()]
int Clone(out IAssemblyName pName);
}
[ComImport(), Guid("7C23FF90-33AF-11D3-95DA-00A024A85B51"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
internal interface IApplicationContext
{
void SetContextNameObject(IAssemblyName pName);
void GetContextNameObject(out IAssemblyName ppName);
void Set([MarshalAs(UnmanagedType.LPWStr)] string szName,
int pvValue,
uint cbValue,
uint dwFlags);
void Get([MarshalAs(UnmanagedType.LPWStr)] string szName,
out int pvValue,
ref uint pcbValue,
uint dwFlags);
void GetDynamicDirectory(out int wzDynamicDir,
ref uint pdwSize);
}
[ComImport(), Guid("21B8916C-F28E-11D2-A473-00C04F8EF448"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
internal interface IAssemblyEnum
{
[PreserveSig()]
int GetNextAssembly(out IApplicationContext ppAppCtx,
out IAssemblyName ppName,
uint dwFlags);
[PreserveSig()]
int Reset();
[PreserveSig()]
int Clone(out IAssemblyEnum ppEnum);
}
internal static class Fusion
{
// dwFlags: 1 = Enumerate native image (NGEN) assemblies
// 2 = Enumerate GAC assemblies
// 4 = Enumerate Downloaded assemblies
//
[DllImport("fusion.dll", CharSet=CharSet.Auto)]
internal static extern int CreateAssemblyEnum(out IAssemblyEnum ppEnum,
IApplicationContext pAppCtx,
IAssemblyName pName,
uint dwFlags,
int pvReserved);
[DllImport("fusion.dll")]
internal static extern int GetCachePath(uint flags,
[MarshalAs(UnmanagedType.LPWStr)] StringBuilder wzDir,
ref uint pdwSize);
public static string GetGacPath(bool isCLRv4 = false)
{
const uint ASM_CACHE_ROOT = 0x08; // CLR V2.0
const uint ASM_CACHE_ROOT_EX = 0x80; // CLR V4.0
uint flags = isCLRv4 ? ASM_CACHE_ROOT_EX : ASM_CACHE_ROOT;
const int size = 260; // MAX_PATH
StringBuilder b = new StringBuilder(size);
uint tmp = size;
GetCachePath(flags, b, ref tmp);
return b.ToString();
}
}
}

137
ILSpy/GacInterop.cs

@ -1,137 +0,0 @@
// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Windows;
using ICSharpCode.Decompiler.Metadata;
namespace ICSharpCode.ILSpy
{
/// <summary>
/// Interop with the .NET GAC.
/// </summary>
static class GacInterop
{
/// <summary>
/// Gets the names of all assemblies in the GAC.
/// </summary>
public static IEnumerable<AssemblyNameReference> GetGacAssemblyFullNames()
{
IApplicationContext applicationContext = null;
IAssemblyEnum assemblyEnum = null;
IAssemblyName assemblyName = null;
uint result = unchecked((uint)Fusion.CreateAssemblyEnum(out assemblyEnum, null, null, 2, 0));
if (result == 0x80070005) {
MessageBox.Show($"Cannot access GAC, please restart with elevated privileges! (HRESULT 0x{result:X})", "ILSpy", MessageBoxButton.OK, MessageBoxImage.Error);
yield break;
}
while (assemblyEnum.GetNextAssembly(out applicationContext, out assemblyName, 0) == 0) {
if (assemblyName == null) continue;
uint nChars = 0;
assemblyName.GetDisplayName(null, ref nChars, 0);
StringBuilder name = new StringBuilder((int)nChars);
assemblyName.GetDisplayName(name, ref nChars, 0);
AssemblyNameReference r = null;
try {
r = AssemblyNameReference.Parse(name.ToString());
} catch (ArgumentException) {
} catch (FormatException) {
} catch (OverflowException) {
}
if (r != null)
yield return r;
}
}
#region FindAssemblyInGac
// This region is based on code from Mono.Cecil:
// Author:
// Jb Evain (jbevain@gmail.com)
//
// Copyright (c) 2008 - 2010 Jb Evain
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
static readonly string[] gac_paths = { Fusion.GetGacPath(false), Fusion.GetGacPath(true) };
static readonly string[] gacs = { "GAC_MSIL", "GAC_32", "GAC" };
static readonly string[] prefixes = { string.Empty, "v4.0_" };
/// <summary>
/// Gets the file name for an assembly stored in the GAC.
/// </summary>
public static string FindAssemblyInNetGac (AssemblyNameReference reference)
{
// without public key, it can't be in the GAC
if (reference.PublicKeyToken == null)
return null;
for (int i = 0; i < 2; i++) {
for (int j = 0; j < gacs.Length; j++) {
var gac = Path.Combine (gac_paths [i], gacs [j]);
var file = GetAssemblyFile (reference, prefixes [i], gac);
if (File.Exists (file))
return file;
}
}
return null;
}
static string GetAssemblyFile (AssemblyNameReference reference, string prefix, string gac)
{
var gac_folder = new StringBuilder ()
.Append (prefix)
.Append (reference.Version)
.Append ("__");
for (int i = 0; i < reference.PublicKeyToken.Length; i++)
gac_folder.Append (reference.PublicKeyToken [i].ToString ("x2"));
return Path.Combine (
Path.Combine (
Path.Combine (gac, reference.Name), gac_folder.ToString ()),
reference.Name + ".dll");
}
#endregion
}
}

3
ILSpy/ILSpy.csproj

@ -138,6 +138,7 @@
<Compile Include="Controls\SearchBox.cs" /> <Compile Include="Controls\SearchBox.cs" />
<Compile Include="Controls\SortableGridViewColumn.cs" /> <Compile Include="Controls\SortableGridViewColumn.cs" />
<Compile Include="Controls\XamlResourceExtension.cs" /> <Compile Include="Controls\XamlResourceExtension.cs" />
<Compile Include="EntityReference.cs" />
<Compile Include="Metadata\CorTables\FieldRVATableTreeNode.cs"> <Compile Include="Metadata\CorTables\FieldRVATableTreeNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
@ -237,8 +238,6 @@
<Compile Include="DecompilationOptions.cs" /> <Compile Include="DecompilationOptions.cs" />
<Compile Include="ExtensionMethods.cs" /> <Compile Include="ExtensionMethods.cs" />
<Compile Include="FilterSettings.cs" /> <Compile Include="FilterSettings.cs" />
<Compile Include="Fusion.cs" />
<Compile Include="GacInterop.cs" />
<Compile Include="GuessFileType.cs" /> <Compile Include="GuessFileType.cs" />
<Compile Include="ContextMenuEntry.cs" /> <Compile Include="ContextMenuEntry.cs" />
<Compile Include="Languages\CSharpBracketSearcher.cs" /> <Compile Include="Languages\CSharpBracketSearcher.cs" />

19
ILSpy/Languages/CSharpLexer.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

26
ILSpy/LoadedAssembly.cs

@ -65,7 +65,7 @@ namespace ICSharpCode.ILSpy
public async Task<string> GetTargetFrameworkIdAsync() public async Task<string> GetTargetFrameworkIdAsync()
{ {
var assembly = await GetPEFileAsync().ConfigureAwait(false); var assembly = await GetPEFileAsync().ConfigureAwait(false);
return assembly.Reader.DetectTargetFrameworkId() ?? string.Empty; return assembly.DetectTargetFrameworkId() ?? string.Empty;
} }
public ReferenceLoadInfo LoadedAssemblyReferencesInfo { get; } = new ReferenceLoadInfo(); public ReferenceLoadInfo LoadedAssemblyReferencesInfo { get; } = new ReferenceLoadInfo();
@ -140,11 +140,15 @@ namespace ICSharpCode.ILSpy
public string Text { public string Text {
get { get {
if (IsLoaded && !HasLoadError) { if (IsLoaded && !HasLoadError) {
var metadata = GetPEFileOrNull()?.Metadata; PEFile module = GetPEFileOrNull();
var metadata = module?.Metadata;
string versionOrInfo = null; string versionOrInfo = null;
if (metadata != null) { if (metadata != null) {
if (metadata.IsAssembly) { if (metadata.IsAssembly) {
versionOrInfo = metadata.GetAssemblyDefinition().Version?.ToString(); versionOrInfo = metadata.GetAssemblyDefinition().Version?.ToString();
var tfId = GetTargetFrameworkIdAsync().Result;
if (!string.IsNullOrEmpty(tfId))
versionOrInfo += ", " + tfId.Replace("Version=", " ");
} else { } else {
versionOrInfo = ".netmodule"; versionOrInfo = ".netmodule";
} }
@ -277,14 +281,15 @@ namespace ICSharpCode.ILSpy
return debugInfoProvider; return debugInfoProvider;
} }
public LoadedAssembly LookupReferencedAssembly(Decompiler.Metadata.IAssemblyReference reference) public LoadedAssembly LookupReferencedAssembly(IAssemblyReference reference)
{ {
if (reference == null) if (reference == null)
throw new ArgumentNullException(nameof(reference)); throw new ArgumentNullException(nameof(reference));
var tfm = GetTargetFrameworkIdAsync().Result;
if (reference.IsWindowsRuntime) { if (reference.IsWindowsRuntime) {
return assemblyList.assemblyLookupCache.GetOrAdd((reference.Name, true), key => LookupReferencedAssemblyInternal(reference, true)); return assemblyList.assemblyLookupCache.GetOrAdd((reference.Name, true, tfm), key => LookupReferencedAssemblyInternal(reference, true, tfm));
} else { } else {
return assemblyList.assemblyLookupCache.GetOrAdd((reference.FullName, false), key => LookupReferencedAssemblyInternal(reference, false)); return assemblyList.assemblyLookupCache.GetOrAdd((reference.FullName, false, tfm), key => LookupReferencedAssemblyInternal(reference, false, tfm));
} }
} }
@ -308,19 +313,20 @@ namespace ICSharpCode.ILSpy
static readonly Dictionary<string, LoadedAssembly> loadingAssemblies = new Dictionary<string, LoadedAssembly>(); static readonly Dictionary<string, LoadedAssembly> loadingAssemblies = new Dictionary<string, LoadedAssembly>();
MyUniversalResolver universalResolver; MyUniversalResolver universalResolver;
LoadedAssembly LookupReferencedAssemblyInternal(Decompiler.Metadata.IAssemblyReference fullName, bool isWinRT) LoadedAssembly LookupReferencedAssemblyInternal(IAssemblyReference fullName, bool isWinRT, string tfm)
{ {
string GetName(Decompiler.Metadata.IAssemblyReference name) => isWinRT ? name.Name : name.FullName; string key = tfm + ";" + (isWinRT ? fullName.Name : fullName.FullName);
string file; string file;
LoadedAssembly asm; LoadedAssembly asm;
lock (loadingAssemblies) { lock (loadingAssemblies) {
foreach (LoadedAssembly loaded in assemblyList.GetAssemblies()) { foreach (LoadedAssembly loaded in assemblyList.GetAssemblies()) {
var reader = loaded.GetPEFileOrNull()?.Metadata; var module = loaded.GetPEFileOrNull();
var reader = module?.Metadata;
if (reader == null || !reader.IsAssembly) continue; if (reader == null || !reader.IsAssembly) continue;
var asmDef = reader.GetAssemblyDefinition(); var asmDef = reader.GetAssemblyDefinition();
var asmDefName = isWinRT ? reader.GetString(asmDef.Name) : reader.GetFullAssemblyName(); var asmDefName = loaded.GetTargetFrameworkIdAsync().Result + ";" + (isWinRT ? reader.GetString(asmDef.Name) : reader.GetFullAssemblyName());
if (GetName(fullName).Equals(asmDefName, StringComparison.OrdinalIgnoreCase)) { if (key.Equals(asmDefName, StringComparison.OrdinalIgnoreCase)) {
LoadedAssemblyReferencesInfo.AddMessageOnce(fullName.FullName, MessageKind.Info, "Success - Found in Assembly List"); LoadedAssemblyReferencesInfo.AddMessageOnce(fullName.FullName, MessageKind.Info, "Success - Found in Assembly List");
return loaded; return loaded;
} }

14
ILSpy/MainWindow.xaml.cs

@ -118,6 +118,8 @@ namespace ICSharpCode.ILSpy
AssemblyListManager = AssemblyListManager AssemblyListManager = AssemblyListManager
}; };
AssemblyListManager.CreateDefaultAssemblyLists();
DockWorkspace.Instance.LoadSettings(sessionSettings); DockWorkspace.Instance.LoadSettings(sessionSettings);
InitializeComponent(); InitializeComponent();
InitToolPanes(); InitToolPanes();
@ -883,22 +885,22 @@ namespace ICSharpCode.ILSpy
case Decompiler.Disassembler.OpCodeInfo opCode: case Decompiler.Disassembler.OpCodeInfo opCode:
OpenLink(opCode.Link); OpenLink(opCode.Link);
break; break;
case ValueTuple<string, PEFile, Handle> unresolvedEntity: case EntityReference unresolvedEntity:
string protocol = unresolvedEntity.Item1 ?? "decompile"; string protocol = unresolvedEntity.Protocol ?? "decompile";
PEFile file = unresolvedEntity.Item2; PEFile file = unresolvedEntity.Module;
if (protocol != "decompile") { if (protocol != "decompile") {
var protocolHandlers = App.ExportProvider.GetExports<IProtocolHandler>(); var protocolHandlers = App.ExportProvider.GetExports<IProtocolHandler>();
foreach (var handler in protocolHandlers) { foreach (var handler in protocolHandlers) {
var node = handler.Value.Resolve(protocol, file, unresolvedEntity.Item3, out bool newTabPage); var node = handler.Value.Resolve(protocol, file, unresolvedEntity.Handle, out bool newTabPage);
if (node != null) { if (node != null) {
SelectNode(node, newTabPage); SelectNode(node, newTabPage);
return decompilationTask; return decompilationTask;
} }
} }
} }
if (MetadataTokenHelpers.TryAsEntityHandle(MetadataTokens.GetToken(unresolvedEntity.Item3)) != null) { if (MetadataTokenHelpers.TryAsEntityHandle(MetadataTokens.GetToken(unresolvedEntity.Handle)) != null) {
var typeSystem = new DecompilerTypeSystem(file, file.GetAssemblyResolver(), TypeSystemOptions.Default | TypeSystemOptions.Uncached); var typeSystem = new DecompilerTypeSystem(file, file.GetAssemblyResolver(), TypeSystemOptions.Default | TypeSystemOptions.Uncached);
reference = typeSystem.MainModule.ResolveEntity((EntityHandle)unresolvedEntity.Item3); reference = typeSystem.MainModule.ResolveEntity((EntityHandle)unresolvedEntity.Handle);
goto default; goto default;
} }
break; break;

54
ILSpy/Properties/Resources.Designer.cs generated

@ -285,6 +285,15 @@ namespace ICSharpCode.ILSpy.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Add preconfigured list....
/// </summary>
public static string AddPreconfiguredList {
get {
return ResourceManager.GetString("AddPreconfiguredList", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Add shell integration. /// Looks up a localized string similar to Add shell integration.
/// </summary> /// </summary>
@ -504,6 +513,15 @@ namespace ICSharpCode.ILSpy.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Culture.
/// </summary>
public static string CultureLabel {
get {
return ResourceManager.GetString("CultureLabel", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to DEBUG -- Decompile All. /// Looks up a localized string similar to DEBUG -- Decompile All.
/// </summary> /// </summary>
@ -1397,15 +1415,6 @@ namespace ICSharpCode.ILSpy.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to New list.
/// </summary>
public static string List {
get {
return ResourceManager.GetString("List", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Are you sure that you want to delete the selected assembly list?. /// Looks up a localized string similar to Are you sure that you want to delete the selected assembly list?.
/// </summary> /// </summary>
@ -1515,6 +1524,15 @@ namespace ICSharpCode.ILSpy.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to New list.
/// </summary>
public static string NewList {
get {
return ResourceManager.GetString("NewList", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Nuget Package Browser. /// Looks up a localized string similar to Nuget Package Browser.
/// </summary> /// </summary>
@ -1641,6 +1659,15 @@ namespace ICSharpCode.ILSpy.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to R_ename.
/// </summary>
public static string R_ename {
get {
return ResourceManager.GetString("R_ename", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Reference Name. /// Looks up a localized string similar to Reference Name.
/// </summary> /// </summary>
@ -1715,6 +1742,15 @@ namespace ICSharpCode.ILSpy.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Rename list.
/// </summary>
public static string RenameList {
get {
return ResourceManager.GetString("RenameList", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Reset to defaults. /// Looks up a localized string similar to Reset to defaults.
/// </summary> /// </summary>

14
ILSpy/Properties/Resources.resx

@ -426,7 +426,7 @@
<data name="Create" xml:space="preserve"> <data name="Create" xml:space="preserve">
<value>Create</value> <value>Create</value>
</data> </data>
<data name="List" xml:space="preserve"> <data name="NewList" xml:space="preserve">
<value>New list</value> <value>New list</value>
</data> </data>
<data name="SelectAssembliesOpen" xml:space="preserve"> <data name="SelectAssembliesOpen" xml:space="preserve">
@ -855,4 +855,16 @@ Do you want to continue?</value>
<data name="DecompilerSettings.Ranges" xml:space="preserve"> <data name="DecompilerSettings.Ranges" xml:space="preserve">
<value>Ranges</value> <value>Ranges</value>
</data> </data>
<data name="AddPreconfiguredList" xml:space="preserve">
<value>Add preconfigured list...</value>
</data>
<data name="R_ename" xml:space="preserve">
<value>R_ename</value>
</data>
<data name="RenameList" xml:space="preserve">
<value>Rename list</value>
</data>
<data name="CultureLabel" xml:space="preserve">
<value>Culture</value>
</data>
</root> </root>

2
ILSpy/TextView/AvalonEditTextOutput.cs

@ -245,7 +245,7 @@ namespace ICSharpCode.ILSpy.TextView
if (isDefinition) { if (isDefinition) {
this.DefinitionLookup.AddDefinition((module, handle), this.TextLength); this.DefinitionLookup.AddDefinition((module, handle), this.TextLength);
} }
references.Add(new ReferenceSegment { StartOffset = start, EndOffset = end, Reference = (protocol, module, handle), IsDefinition = isDefinition }); references.Add(new ReferenceSegment { StartOffset = start, EndOffset = end, Reference = new EntityReference(protocol, module, handle), IsDefinition = isDefinition });
} }
public void WriteReference(IType type, string text, bool isDefinition = false) public void WriteReference(IType type, string text, bool isDefinition = false)

19
ILSpy/TextView/BracketHighlightRenderer.cs

@ -1,5 +1,20 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) //
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System; using System;
using System.Windows.Media; using System.Windows.Media;

7
ILSpy/TextView/DecompilerTextView.cs

@ -23,6 +23,7 @@ using System.ComponentModel.Composition;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection.Metadata;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
@ -362,10 +363,10 @@ namespace ICSharpCode.ILSpy.TextView
if (document == null) if (document == null)
return null; return null;
return new FlowDocumentTooltip(document); return new FlowDocumentTooltip(document);
} else if (segment.Reference is ValueTuple<PEFile, System.Reflection.Metadata.EntityHandle> unresolvedEntity) { } else if (segment.Reference is EntityReference unresolvedEntity) {
var typeSystem = new DecompilerTypeSystem(unresolvedEntity.Item1, unresolvedEntity.Item1.GetAssemblyResolver(), TypeSystemOptions.Default | TypeSystemOptions.Uncached); var typeSystem = new DecompilerTypeSystem(unresolvedEntity.Module, unresolvedEntity.Module.GetAssemblyResolver(), TypeSystemOptions.Default | TypeSystemOptions.Uncached);
try { try {
IEntity resolved = typeSystem.MainModule.ResolveEntity(unresolvedEntity.Item2); IEntity resolved = typeSystem.MainModule.ResolveEntity((EntityHandle)unresolvedEntity.Handle);
if (resolved == null) if (resolved == null)
return null; return null;
var document = CreateTooltipForEntity(resolved); var document = CreateTooltipForEntity(resolved);

2
ILSpy/ViewModels/DebugStepsPaneModel.cs

@ -20,7 +20,9 @@ using System.Windows;
namespace ICSharpCode.ILSpy.ViewModels namespace ICSharpCode.ILSpy.ViewModels
{ {
#if DEBUG
[ExportToolPane(ContentId = PaneContentId)] [ExportToolPane(ContentId = PaneContentId)]
#endif
public class DebugStepsPaneModel : ToolPaneModel public class DebugStepsPaneModel : ToolPaneModel
{ {
public const string PaneContentId = "debugStepsPane"; public const string PaneContentId = "debugStepsPane";

313
ILSpy/ViewModels/ManageAssemblyListsViewModel.cs

@ -16,11 +16,16 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.IO;
using System.Text.RegularExpressions;
using System.Windows; using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.ILSpy.Commands; using ICSharpCode.ILSpy.Commands;
using ICSharpCode.ILSpy.Properties;
namespace ICSharpCode.ILSpy.ViewModels namespace ICSharpCode.ILSpy.ViewModels
{ {
@ -31,20 +36,67 @@ namespace ICSharpCode.ILSpy.ViewModels
public const string ASPDotNetMVC3List = "ASP.NET (MVC3)"; public const string ASPDotNetMVC3List = "ASP.NET (MVC3)";
private readonly AssemblyListManager manager; private readonly AssemblyListManager manager;
private readonly Window parent;
public ManageAssemblyListsViewModel() public ManageAssemblyListsViewModel(Window parent)
{ {
this.manager = MainWindow.Instance.AssemblyListManager; this.manager = MainWindow.Instance.AssemblyListManager;
CreateDefaultAssemblyLists(); this.parent = parent;
NewCommand = new DelegateCommand<ManageAssemblyListsDialog>(ExecuteNew); NewCommand = new DelegateCommand(ExecuteNew);
CloneCommand = new DelegateCommand<ManageAssemblyListsDialog>(ExecuteClone, CanExecuteClone); CloneCommand = new DelegateCommand(ExecuteClone, CanExecuteClone);
ResetCommand = new DelegateCommand<ManageAssemblyListsDialog>(ExecuteReset); RenameCommand = new DelegateCommand(ExecuteRename, CanExecuteRename);
DeleteCommand = new DelegateCommand<ManageAssemblyListsDialog>(ExecuteDelete, CanExecuteDelete); ResetCommand = new DelegateCommand(ExecuteReset);
DeleteCommand = new DelegateCommand(ExecuteDelete, CanExecuteDelete);
CreatePreconfiguredAssemblyListCommand = new DelegateCommand<PreconfiguredAssemblyList>(ExecuteCreatePreconfiguredAssemblyList);
PreconfiguredAssemblyLists = new List<PreconfiguredAssemblyList>(ResolvePreconfiguredAssemblyLists());
}
IEnumerable<PreconfiguredAssemblyList> ResolvePreconfiguredAssemblyLists()
{
yield return new PreconfiguredAssemblyList(DotNet4List);
yield return new PreconfiguredAssemblyList(DotNet35List);
yield return new PreconfiguredAssemblyList(ASPDotNetMVC3List);
var basePath = DotNetCorePathFinder.FindDotNetExeDirectory();
if (basePath == null)
yield break;
Dictionary<string, string> foundVersions = new Dictionary<string, string>();
Dictionary<string, int> latestRevision = new Dictionary<string, int>();
foreach (var sdkDir in Directory.GetDirectories(Path.Combine(basePath, "shared"))) {
if (sdkDir.EndsWith(".Ref", StringComparison.OrdinalIgnoreCase))
continue;
foreach (var versionDir in Directory.GetDirectories(sdkDir)) {
var match = Regex.Match(versionDir, @"[/\\](?<name>[A-z0-9.]+)[/\\](?<version>\d+\.\d)+(.(?<revision>\d+))?$");
if (!match.Success)
continue;
string name = match.Groups["name"].Value;
int index = name.LastIndexOfAny(new[] { '/', '\\' });
if (index >= 0)
name = name.Substring(index + 1);
string text = name + " " + match.Groups["version"].Value;
if (!latestRevision.TryGetValue(text, out int revision))
revision = -1;
int newRevision = int.Parse(match.Groups["revision"].Value);
if (newRevision > revision) {
latestRevision[text] = newRevision;
foundVersions[text] = versionDir;
}
}
}
foreach (var pair in foundVersions) {
yield return new PreconfiguredAssemblyList(pair.Key + "(." + latestRevision[pair.Key] + ")", pair.Value);
}
} }
public ObservableCollection<string> AssemblyLists => manager.AssemblyLists; public ObservableCollection<string> AssemblyLists => manager.AssemblyLists;
public List<PreconfiguredAssemblyList> PreconfiguredAssemblyLists { get; }
private string selectedAssemblyList; private string selectedAssemblyList;
public string SelectedAssemblyList { public string SelectedAssemblyList {
@ -60,149 +112,228 @@ namespace ICSharpCode.ILSpy.ViewModels
public ICommand NewCommand { get; } public ICommand NewCommand { get; }
public ICommand CloneCommand { get; } public ICommand CloneCommand { get; }
public ICommand ResetCommand { get; } public ICommand ResetCommand { get; }
public ICommand RenameCommand { get; }
public ICommand DeleteCommand { get; } public ICommand DeleteCommand { get; }
public ICommand CreatePreconfiguredAssemblyListCommand { get; }
private void ExecuteNew(ManageAssemblyListsDialog dialog) private void ExecuteNew()
{ {
CreateListDialog dlg = new CreateListDialog(); CreateListDialog dlg = new CreateListDialog(Resources.NewList);
dlg.Owner = dialog; dlg.Owner = parent;
dlg.Closing += (s, args) => { dlg.Closing += (s, args) => {
if (dlg.DialogResult == true) { if (dlg.DialogResult == true) {
if (manager.AssemblyLists.Contains(dlg.NewListName)) { if (manager.AssemblyLists.Contains(dlg.ListName)) {
args.Cancel = true; args.Cancel = true;
MessageBox.Show(Properties.Resources.ListExistsAlready, null, MessageBoxButton.OK); MessageBox.Show(Properties.Resources.ListExistsAlready, null, MessageBoxButton.OK);
} }
} }
}; };
if (dlg.ShowDialog() == true) { if (dlg.ShowDialog() == true) {
manager.CreateList(new AssemblyList(dlg.NewListName)); manager.CreateList(new AssemblyList(dlg.ListName));
} }
} }
private bool CanExecuteClone(ManageAssemblyListsDialog _) private bool CanExecuteClone()
{ {
return selectedAssemblyList != null; return selectedAssemblyList != null;
} }
private void ExecuteClone(ManageAssemblyListsDialog dialog) private void ExecuteClone()
{ {
CreateListDialog dlg = new CreateListDialog(); CreateListDialog dlg = new CreateListDialog(Resources.NewList);
dlg.Owner = dialog; dlg.Owner = parent;
dlg.Closing += (s, args) => { dlg.Closing += (s, args) => {
if (dlg.DialogResult == true) { if (dlg.DialogResult == true) {
if (manager.AssemblyLists.Contains(dlg.NewListName)) { if (manager.AssemblyLists.Contains(dlg.ListName)) {
args.Cancel = true; args.Cancel = true;
MessageBox.Show(Properties.Resources.ListExistsAlready, null, MessageBoxButton.OK); MessageBox.Show(Properties.Resources.ListExistsAlready, null, MessageBoxButton.OK);
} }
} }
}; };
if (dlg.ShowDialog() == true) { if (dlg.ShowDialog() == true) {
manager.CloneList(SelectedAssemblyList, dlg.NewListName); manager.CloneList(SelectedAssemblyList, dlg.ListName);
} }
} }
private void ExecuteReset(ManageAssemblyListsDialog dialog) private void ExecuteReset()
{ {
if (MessageBox.Show(dialog, Properties.Resources.ListsResetConfirmation, if (MessageBox.Show(parent, Properties.Resources.ListsResetConfirmation,
"ILSpy", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No, MessageBoxOptions.None) != MessageBoxResult.Yes) "ILSpy", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No, MessageBoxOptions.None) != MessageBoxResult.Yes)
return; return;
manager.ClearAll(); manager.ClearAll();
CreateDefaultAssemblyLists(); manager.CreateDefaultAssemblyLists();
MainWindow.Instance.SessionSettings.ActiveAssemblyList = manager.AssemblyLists[0]; MainWindow.Instance.SessionSettings.ActiveAssemblyList = manager.AssemblyLists[0];
} }
private void ExecuteDelete(ManageAssemblyListsDialog dialog) private void ExecuteDelete()
{ {
if (MessageBox.Show(dialog, Properties.Resources.ListDeleteConfirmation, if (MessageBox.Show(parent, Properties.Resources.ListDeleteConfirmation,
"ILSpy", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No, MessageBoxOptions.None) != MessageBoxResult.Yes) "ILSpy", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No, MessageBoxOptions.None) != MessageBoxResult.Yes)
return; return;
manager.DeleteList(SelectedAssemblyList); manager.DeleteList(SelectedAssemblyList);
} }
private bool CanExecuteDelete(ManageAssemblyListsDialog _) private bool CanExecuteDelete()
{ {
return selectedAssemblyList != null; return selectedAssemblyList != null;
} }
private void CreateDefaultAssemblyLists() private bool CanExecuteRename()
{ {
if (!manager.AssemblyLists.Contains(DotNet4List)) { return selectedAssemblyList != null;
AssemblyList dotnet4 = new AssemblyList(DotNet4List); }
AddToList(dotnet4, "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToList(dotnet4, "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); private void ExecuteRename()
AddToList(dotnet4, "System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); {
AddToList(dotnet4, "System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); CreateListDialog dlg = new CreateListDialog(Resources.RenameList);
AddToList(dotnet4, "System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); dlg.Owner = parent;
AddToList(dotnet4, "System.Xaml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); dlg.ListName = selectedAssemblyList;
AddToList(dotnet4, "System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); dlg.ListNameBox.SelectAll();
AddToList(dotnet4, "System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); dlg.Closing += (s, args) => {
AddToList(dotnet4, "Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); if (dlg.DialogResult == true) {
AddToList(dotnet4, "PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); if (dlg.ListName == selectedAssemblyList) {
AddToList(dotnet4, "PresentationFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); args.Cancel = true;
AddToList(dotnet4, "WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); return;
}
if (dotnet4.assemblies.Count > 0) { if (manager.AssemblyLists.Contains(dlg.ListName)) {
manager.CreateList(dotnet4); args.Cancel = true;
MessageBox.Show(Properties.Resources.ListExistsAlready, null, MessageBoxButton.OK);
}
} }
};
if (dlg.ShowDialog() == true) {
manager.RenameList(selectedAssemblyList, dlg.ListName);
} }
}
if (!manager.AssemblyLists.Contains(DotNet35List)) { internal static AssemblyList CreateDefaultList(string name, string path = null, string newName = null)
AssemblyList dotnet35 = new AssemblyList(DotNet35List); {
AddToList(dotnet35, "mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); var list = new AssemblyList(newName ?? name);
AddToList(dotnet35, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); switch (name) {
AddToList(dotnet35, "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); case DotNet4List:
AddToList(dotnet35, "System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); AddToListFromGAC("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToList(dotnet35, "System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); AddToListFromGAC("System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToList(dotnet35, "System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); AddToListFromGAC("System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToList(dotnet35, "System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); AddToListFromGAC("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToList(dotnet35, "PresentationCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); AddToListFromGAC("System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToList(dotnet35, "PresentationFramework, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); AddToListFromGAC("System.Xaml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToList(dotnet35, "WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); AddToListFromGAC("System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
if (dotnet35.assemblies.Count > 0) { AddToListFromGAC("Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
manager.CreateList(dotnet35); AddToListFromGAC("PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
} AddToListFromGAC("PresentationFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
break;
case DotNet35List:
AddToListFromGAC("mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("PresentationCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("PresentationFramework, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("WindowsBase, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
break;
case ASPDotNetMVC3List:
AddToListFromGAC("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
AddToListFromGAC("System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
AddToListFromGAC("System.EnterpriseServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
AddToListFromGAC("System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
AddToListFromGAC("System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("System.Web.ApplicationServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("System.Web.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
AddToListFromGAC("System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToListFromGAC("System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
AddToListFromGAC("Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
break;
case object _ when path != null:
foreach (var file in Directory.GetFiles(path, "*.dll")) {
var dllname = Path.GetFileName(file);
if (DoIncludeFile(dllname))
AddToListFromDirectory(file);
}
break;
}
return list;
void AddToListFromGAC(string fullName)
{
AssemblyNameReference reference = AssemblyNameReference.Parse(fullName);
string file = UniversalAssemblyResolver.GetAssemblyInGac(reference);
if (file != null)
list.OpenAssembly(file);
}
void AddToListFromDirectory(string file)
{
if (File.Exists(file))
list.OpenAssembly(file);
} }
if (!manager.AssemblyLists.Contains(ASPDotNetMVC3List)) { bool DoIncludeFile(string fileName)
AssemblyList mvc = new AssemblyList(ASPDotNetMVC3List); {
AddToList(mvc, "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); if (fileName == "Microsoft.DiaSymReader.Native.amd64.dll")
AddToList(mvc, "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); return false;
AddToList(mvc, "System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); if (fileName.EndsWith("_cor3.dll", StringComparison.OrdinalIgnoreCase))
AddToList(mvc, "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); return false;
AddToList(mvc, "System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); if (char.IsUpper(fileName[0]))
AddToList(mvc, "System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); return true;
AddToList(mvc, "System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); if (fileName == "netstandard.dll")
AddToList(mvc, "System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); return true;
AddToList(mvc, "System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); if (fileName == "mscorlib.dll")
AddToList(mvc, "System.EnterpriseServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); return true;
AddToList(mvc, "System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); return false;
AddToList(mvc, "System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); }
AddToList(mvc, "System.Web.ApplicationServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); }
AddToList(mvc, "System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
AddToList(mvc, "System.Web.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); private void ExecuteCreatePreconfiguredAssemblyList(PreconfiguredAssemblyList config)
AddToList(mvc, "System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); {
AddToList(mvc, "System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); CreateListDialog dlg = new CreateListDialog(Resources.AddPreconfiguredList);
AddToList(mvc, "System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); dlg.Owner = parent;
AddToList(mvc, "System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); dlg.ListName = config.Name;
AddToList(mvc, "System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); dlg.ListNameBox.SelectAll();
AddToList(mvc, "System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"); dlg.Closing += (s, args) => {
AddToList(mvc, "System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); if (dlg.DialogResult == true) {
AddToList(mvc, "System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"); if (manager.AssemblyLists.Contains(dlg.ListName)) {
AddToList(mvc, "Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); args.Cancel = true;
MessageBox.Show(Properties.Resources.ListExistsAlready, null, MessageBoxButton.OK);
if (mvc.assemblies.Count > 0) { }
manager.CreateList(mvc); }
};
if (dlg.ShowDialog() == true) {
var list = CreateDefaultList(config.Name, config.Path, dlg.ListName);
if (list.assemblies.Count > 0) {
manager.CreateList(list);
} }
} }
} }
}
public class PreconfiguredAssemblyList
{
public string Name { get; }
public string Path { get; }
private void AddToList(AssemblyList list, string FullName) public PreconfiguredAssemblyList(string name, string path = null)
{ {
AssemblyNameReference reference = AssemblyNameReference.Parse(FullName); this.Name = name;
string file = GacInterop.FindAssemblyInNetGac(reference); this.Path = path;
if (file != null)
list.OpenAssembly(file);
} }
} }
} }

24
ILSpy/Views/CreateListDialog.xaml

@ -2,26 +2,24 @@
x:Class="ICSharpCode.ILSpy.CreateListDialog" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" x:Class="ICSharpCode.ILSpy.CreateListDialog" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties" xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties"
xmlns:controls="clr-namespace:ICSharpCode.ILSpy.Controls"
Title="{x:Static properties:Resources.List}"
Style="{DynamicResource DialogWindow}" Style="{DynamicResource DialogWindow}"
WindowStartupLocation="CenterOwner" WindowStartupLocation="CenterOwner"
ResizeMode="NoResize" ResizeMode="NoResize"
Width="300" Width="300"
Height="150" Height="150"
FocusManager.FocusedElement="{Binding ElementName=ListName}"> FocusManager.FocusedElement="{Binding ElementName=ListNameBox}">
<Grid Margin="12,8"> <Grid Margin="12,8">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel> <StackPanel>
<Label Content="{x:Static properties:Resources.EnterListName}"/> <Label Content="{x:Static properties:Resources.EnterListName}"/>
<TextBox Margin="8,8" Name="ListName" TextChanged="TextBox_TextChanged"></TextBox> <TextBox Margin="8,8" Name="ListNameBox" TextChanged="TextBox_TextChanged"></TextBox>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="8,0"> <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="8,0">
<Button IsDefault="True" Margin="2,0" IsEnabled="False" Name="okButton" Click="OKButton_Click" Content="{x:Static properties:Resources.Create}"/> <Button IsDefault="True" Margin="2,0" IsEnabled="False" Name="okButton" Click="OKButton_Click" Content="{x:Static properties:Resources.Create}"/>
<Button IsCancel="True" Margin="2,0" Content="{x:Static properties:Resources.Cancel}"/> <Button IsCancel="True" Margin="2,0" Content="{x:Static properties:Resources.Cancel}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Window> </Window>

16
ILSpy/Views/CreateListDialog.xaml.cs

@ -8,31 +8,29 @@ namespace ICSharpCode.ILSpy
/// </summary> /// </summary>
public partial class CreateListDialog : Window public partial class CreateListDialog : Window
{ {
public CreateListDialog() public CreateListDialog(string title)
{ {
InitializeComponent(); InitializeComponent();
this.Title = title;
} }
private void TextBox_TextChanged(object sender, TextChangedEventArgs e) private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
{ {
okButton.IsEnabled = !string.IsNullOrWhiteSpace(ListName.Text); okButton.IsEnabled = !string.IsNullOrWhiteSpace(ListNameBox.Text);
} }
private void OKButton_Click(object sender, RoutedEventArgs e) private void OKButton_Click(object sender, RoutedEventArgs e)
{ {
if (!string.IsNullOrWhiteSpace(ListName.Text)) if (!string.IsNullOrWhiteSpace(ListNameBox.Text))
{ {
this.DialogResult = true; this.DialogResult = true;
} }
} }
public string NewListName public string ListName
{ {
get get => ListNameBox.Text;
{ set => ListNameBox.Text = value;
return ListName.Text;
}
} }
} }
} }

12
ILSpy/Views/ManageAssemblyLIstsDialog.xaml.cs

@ -17,6 +17,8 @@
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using ICSharpCode.ILSpy.ViewModels; using ICSharpCode.ILSpy.ViewModels;
namespace ICSharpCode.ILSpy namespace ICSharpCode.ILSpy
@ -29,7 +31,15 @@ namespace ICSharpCode.ILSpy
public ManageAssemblyListsDialog() public ManageAssemblyListsDialog()
{ {
InitializeComponent(); InitializeComponent();
DataContext = new ManageAssemblyListsViewModel(); DataContext = new ManageAssemblyListsViewModel(this);
}
private void PreconfiguredAssemblyListsMenuClick(object sender, RoutedEventArgs e)
{
var menu = (ContextMenu)Resources["PreconfiguredAssemblyListsMenu"];
menu.PlacementTarget = (Button)sender;
menu.Placement = PlacementMode.Bottom;
menu.IsOpen = true;
} }
} }
} }

14
ILSpy/Views/ManageAssemblyListsDialog.xaml

@ -12,6 +12,16 @@
Height="350" Height="350"
Width="480" Width="480"
FocusManager.FocusedElement="{Binding ElementName=listView}"> FocusManager.FocusedElement="{Binding ElementName=listView}">
<Window.Resources>
<ContextMenu x:Key="PreconfiguredAssemblyListsMenu" ItemsSource="{Binding PreconfiguredAssemblyLists}" DisplayMemberPath="Name">
<ContextMenu.ItemContainerStyle>
<Style TargetType="MenuItem">
<Setter Property="Command" Value="{Binding DataContext.CreatePreconfiguredAssemblyListCommand, RelativeSource={RelativeSource AncestorType=Window}}" />
<Setter Property="CommandParameter" Value="{Binding}" />
</Style>
</ContextMenu.ItemContainerStyle>
</ContextMenu>
</Window.Resources>
<Grid Margin="12,8"> <Grid Margin="12,8">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*" /> <RowDefinition Height="*" />
@ -30,10 +40,12 @@
<StackPanel Grid.Column="5" Grid.RowSpan="2" Margin="4, 8"> <StackPanel Grid.Column="5" Grid.RowSpan="2" Margin="4, 8">
<Button Margin="2 2 2 10" Command="{Binding NewCommand}" CommandParameter="{Binding ., RelativeSource={RelativeSource AncestorType=Window}}" Content="{x:Static properties:Resources._New}"/> <Button Margin="2 2 2 10" Command="{Binding NewCommand}" CommandParameter="{Binding ., RelativeSource={RelativeSource AncestorType=Window}}" Content="{x:Static properties:Resources._New}"/>
<Button Margin="2" Command="{Binding CloneCommand}" CommandParameter="{Binding ., RelativeSource={RelativeSource AncestorType=Window}}" Content="{x:Static properties:Resources.C_lone}"/> <Button Margin="2" Command="{Binding CloneCommand}" CommandParameter="{Binding ., RelativeSource={RelativeSource AncestorType=Window}}" Content="{x:Static properties:Resources.C_lone}"/>
<Button Margin="2" Command="{Binding RenameCommand}" CommandParameter="{Binding ., RelativeSource={RelativeSource AncestorType=Window}}" Content="{x:Static properties:Resources.R_ename}"/>
<Button Margin="2" Command="{Binding DeleteCommand}" CommandParameter="{Binding ., RelativeSource={RelativeSource AncestorType=Window}}" Content="{x:Static properties:Resources.OpenListDialog__Delete}"/> <Button Margin="2" Command="{Binding DeleteCommand}" CommandParameter="{Binding ., RelativeSource={RelativeSource AncestorType=Window}}" Content="{x:Static properties:Resources.OpenListDialog__Delete}"/>
<Button Margin="2 10 2 2" Command="{Binding ResetCommand}" CommandParameter="{Binding ., RelativeSource={RelativeSource AncestorType=Window}}" Content="{x:Static properties:Resources._Reset}"/> <Button Margin="2 10 2 2" Command="{Binding ResetCommand}" CommandParameter="{Binding ., RelativeSource={RelativeSource AncestorType=Window}}" Content="{x:Static properties:Resources._Reset}"/>
</StackPanel> </StackPanel>
<Button IsCancel="True" Grid.Row="2" Margin="2,0" Content="{x:Static properties:Resources.Close}" /> <Button IsCancel="True" Grid.Row="2" Margin="2,0" Content="{x:Static properties:Resources.Close}" />
<Button Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Margin="2,0" Content="{x:Static properties:Resources.AddPreconfiguredList}" Click="PreconfiguredAssemblyListsMenuClick" />
</Grid> </Grid>
</Window> </Window>

2
ILSpy/Views/OpenFromGacDialog.xaml

@ -33,7 +33,7 @@
<GridView> <GridView>
<controls:SortableGridViewColumn x:Name="nameColumn" Width="300" Header="{x:Static properties:Resources.ReferenceName}" DisplayMemberBinding="{Binding ShortName}" /> <controls:SortableGridViewColumn x:Name="nameColumn" Width="300" Header="{x:Static properties:Resources.ReferenceName}" DisplayMemberBinding="{Binding ShortName}" />
<controls:SortableGridViewColumn Width="75" Header="{x:Static properties:Resources.Version}" DisplayMemberBinding="{Binding Version}" /> <controls:SortableGridViewColumn Width="75" Header="{x:Static properties:Resources.Version}" DisplayMemberBinding="{Binding Version}" />
<controls:SortableGridViewColumn Width="65" Header="{x:Static properties:Resources.Culture}" DisplayMemberBinding="{Binding Culture}" /> <controls:SortableGridViewColumn Width="65" Header="{x:Static properties:Resources.CultureLabel}" DisplayMemberBinding="{Binding Culture}" />
<controls:SortableGridViewColumn Width="115" Header="{x:Static properties:Resources.PublicToken}" DisplayMemberBinding="{Binding PublicKeyToken}" /> <controls:SortableGridViewColumn Width="115" Header="{x:Static properties:Resources.PublicToken}" DisplayMemberBinding="{Binding PublicKeyToken}" />
<controls:SortableGridViewColumn Width="1000" Header="{x:Static properties:Resources.Location}" DisplayMemberBinding="{Binding FileName}" /> <controls:SortableGridViewColumn Width="1000" Header="{x:Static properties:Resources.Location}" DisplayMemberBinding="{Binding FileName}" />
</GridView> </GridView>

16
ILSpy/Views/OpenFromGacDialog.xaml.cs

@ -95,7 +95,11 @@ namespace ICSharpCode.ILSpy
} }
public string Culture { public string Culture {
get { return r.Culture; } get {
if (string.IsNullOrEmpty(r.Culture))
return "neutral";
return r.Culture;
}
} }
public string PublicKeyToken { public string PublicKeyToken {
@ -116,21 +120,21 @@ namespace ICSharpCode.ILSpy
void FetchGacContents() void FetchGacContents()
{ {
HashSet<string> fullNames = new HashSet<string>(); HashSet<string> fullNames = new HashSet<string>();
UpdateProgressBar(pg => { pg.Visibility = System.Windows.Visibility.Visible; pg.IsIndeterminate = true; }); UpdateProgressBar(pg => { pg.Visibility = Visibility.Visible; pg.IsIndeterminate = true; });
var list = GacInterop.GetGacAssemblyFullNames().TakeWhile(_ => !cancelFetchThread).ToList(); var list = UniversalAssemblyResolver.EnumerateGac().TakeWhile(_ => !cancelFetchThread).ToList();
UpdateProgressBar(pg => { pg.IsIndeterminate = false; pg.Maximum = list.Count; }); UpdateProgressBar(pg => { pg.IsIndeterminate = false; pg.Maximum = list.Count; });
foreach (var r in list) { foreach (var r in list) {
if (cancelFetchThread) if (cancelFetchThread)
break; break;
if (fullNames.Add(r.FullName)) { // filter duplicates if (fullNames.Add(r.FullName)) { // filter duplicates
var file = GacInterop.FindAssemblyInNetGac(r); var file = UniversalAssemblyResolver.GetAssemblyInGac(r);
if (file != null) { if (file != null) {
var entry = new GacEntry(r, file); var entry = new GacEntry(r, file);
UpdateProgressBar(pg => { pg.Value = pg.Value + 1; AddNewEntry(entry); }); UpdateProgressBar(pg => { pg.Value++; AddNewEntry(entry); });
} }
} }
} }
UpdateProgressBar(pg => { pg.Visibility = System.Windows.Visibility.Hidden; }); UpdateProgressBar(pg => { pg.Visibility = Visibility.Hidden; });
} }
void UpdateProgressBar(Action<ProgressBar> updateAction) void UpdateProgressBar(Action<ProgressBar> updateAction)

Loading…
Cancel
Save