Merge pull request #141 from nooperation/develop

dev to master
nooperation · Jan 17, 2019 · 9bb5fa5 · 9bb5fa5
2 parents 887416a + d86e880
commit 9bb5fa5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 33 deletions.
diff --git a/AtlasView/App.config b/AtlasView/App.config
@@ -3,12 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>
diff --git a/CommonUI/ViewModels/ResourceViewModels/ScriptMetaDataResourceviewModel.cs b/CommonUI/ViewModels/ResourceViewModels/ScriptMetaDataResourceviewModel.cs
@@ -224,12 +224,25 @@ public async void Disassemble()
 
                 var decompiler = new CSharpDecompiler(peFile, resolver, settings);
 
-                var viewModel = new RawTextResourceViewModel
+                RawTextResourceViewModel viewModel;
+
+                if(CurrentScript.ClassName != null)
                 {
-                    CurrentText = decompiler.DecompileTypeAsString(
-                        new FullTypeName(CurrentScript.ClassName)
-                    )
-                };
+                    viewModel = new RawTextResourceViewModel
+                    {
+                        CurrentText = decompiler.DecompileTypeAsString(
+                            new FullTypeName(CurrentScript.ClassName)
+                        )
+                    };
+                }
+                else
+                {
+                    viewModel = new RawTextResourceViewModel
+                    {
+                        CurrentText = decompiler.DecompileWholeModuleAsString()
+                    };
+                }
+
                 CurrentResourceView = new RawTextResourceView
                 {
                     DataContext = viewModel

diff --git a/CommonUI/app.config b/CommonUI/app.config
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+  </startup>
+</configuration>
diff --git a/SanBag/App.config b/SanBag/App.config
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
-    </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+  </startup>
 </configuration>