Merge pull request #47 from telerik/DecompileDangerousResourcesWithUserConsent

atdimitrov · web-flow · commit 5f5eeac0d0f7 · 2018-08-06T12:12:44.000+03:00
Fixed incorrect reading of old assembly
diff --git a/UI/JustAssembly/Nodes/AssemblyNode.cs b/UI/JustAssembly/Nodes/AssemblyNode.cs
@@ -150,7 +150,7 @@ public Task LoadItemsAsync(Action cancelAction = null)
 					{
 						progressNotifier.LoadingMessage = string.Format("Loading assembly {0} of {1}", assemblyNumber, assemblyCount);
 
-                        AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(TypesMap.NewType, new ReaderParameters(GlobalAssemblyResolver.Instance));
+                        AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(TypesMap.OldType, new ReaderParameters(GlobalAssemblyResolver.Instance));
                         bool shouldDecompileDangerousResources = this.ShouldDecompileDangerousResources(assembly, TypesMap.OldType, AssemblyType.Old);
 
                         IAssemblyDecompilationResults r1 = Decompiler.GenerateFiles(TypesMap.OldType,

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public Task LoadItemsAsync(Action cancelAction = null)`
`150`	`150`	`{`
`151`	`151`	`progressNotifier.LoadingMessage = string.Format("Loading assembly {0} of {1}", assemblyNumber, assemblyCount);`
`152`	`152`
`153`		`- AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(TypesMap.NewType, new ReaderParameters(GlobalAssemblyResolver.Instance));`
	`153`	`+ AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(TypesMap.OldType, new ReaderParameters(GlobalAssemblyResolver.Instance));`
`154`	`154`	`bool shouldDecompileDangerousResources = this.ShouldDecompileDangerousResources(assembly, TypesMap.OldType, AssemblyType.Old);`
`155`	`155`
`156`	`156`	`IAssemblyDecompilationResults r1 = Decompiler.GenerateFiles(TypesMap.OldType,`