Use NETFRAMEWORK

ramzezzz · Nov 14, 2018 · 5109679 · 5109679
1 parent 13358a4
commit 5109679
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/AssemblyData/AssemblyServer.cs b/AssemblyData/AssemblyServer.cs
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if NET35
+#if NETFRAMEWORK
 using System;
 using System.Collections;
 using System.Runtime.Remoting;

diff --git a/De4DotCommon.props b/De4DotCommon.props
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
     <De4DotNetFramework>false</De4DotNetFramework>

diff --git a/de4dot.code/AssemblyClient/AssemblyClient.cs b/de4dot.code/AssemblyClient/AssemblyClient.cs
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 using System.Threading;
 using AssemblyData;
 
-#if !NET35
+#if !NETFRAMEWORK
 namespace System.Runtime.Remoting {
 	class RemotingException : SystemException {
 	}

diff --git a/de4dot.code/AssemblyClient/AssemblyClientFactory.cs b/de4dot.code/AssemblyClient/AssemblyClientFactory.cs
@@ -31,7 +31,7 @@ public class SameAppDomainAssemblyClientFactory : IAssemblyClientFactory {
 
 	public class NewAppDomainAssemblyClientFactory : IAssemblyClientFactory {
 		public IAssemblyClient Create(AssemblyServiceType serviceType) =>
-#if NET35
+#if NETFRAMEWORK
 			new AssemblyClient(new NewAppDomainAssemblyServerLoader(serviceType));
 #else
 			new AssemblyClient(new SameAppDomainAssemblyServerLoader(serviceType));
@@ -45,14 +45,14 @@ public class NewProcessAssemblyClientFactory : IAssemblyClientFactory {
 		public NewProcessAssemblyClientFactory(ServerClrVersion serverVersion) => this.serverVersion = serverVersion;
 
 		public IAssemblyClient Create(AssemblyServiceType serviceType, ModuleDef module) =>
-#if NET35
+#if NETFRAMEWORK
 			new AssemblyClient(new NewProcessAssemblyServerLoader(serviceType, GetServerClrVersion(module)));
 #else
 			new AssemblyClient(new SameAppDomainAssemblyServerLoader(serviceType));
 #endif
 
 		public IAssemblyClient Create(AssemblyServiceType serviceType) =>
-#if NET35
+#if NETFRAMEWORK
 			new AssemblyClient(new NewProcessAssemblyServerLoader(serviceType, serverVersion));
 #else
 			new AssemblyClient(new SameAppDomainAssemblyServerLoader(serviceType));

diff --git a/de4dot.code/AssemblyClient/IpcAssemblyServerLoader.cs b/de4dot.code/AssemblyClient/IpcAssemblyServerLoader.cs
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if NET35
+#if NETFRAMEWORK
 using System;
 using AssemblyData;
 

diff --git a/de4dot.code/AssemblyClient/NewAppDomainAssemblyServerLoader.cs b/de4dot.code/AssemblyClient/NewAppDomainAssemblyServerLoader.cs
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if NET35
+#if NETFRAMEWORK
 using System;
 using System.Threading;
 using AssemblyData;

diff --git a/de4dot.code/AssemblyClient/NewProcessAssemblyServerLoader.cs b/de4dot.code/AssemblyClient/NewProcessAssemblyServerLoader.cs
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if NET35
+#if NETFRAMEWORK
 using System;
 using System.Diagnostics;
 using AssemblyData;

diff --git a/de4dot.code/deobfuscators/CodeFort/AssemblyData.cs b/de4dot.code/deobfuscators/CodeFort/AssemblyData.cs
@@ -438,7 +438,7 @@ void InitializeTypes() {
 		void CreateTypes() {
 			foreach (var info in enumInfos) {
 				var builder = enumBuilders[info.name];
-#if NET35
+#if NETFRAMEWORK
 				var type = builder.CreateType();
 #else
 				var type = builder.CreateTypeInfo();

diff --git a/de4dot.code/deobfuscators/CodeFort/PasswordFinder.cs b/de4dot.code/deobfuscators/CodeFort/PasswordFinder.cs
@@ -85,7 +85,7 @@ static List<Obj> ConvertList(System.Collections.IList inList) {
 		public void Find(out PasswordInfo mainAsmPassword, out PasswordInfo embedPassword) {
 			var asmName = new AssemblyName("asm");
 			const AssemblyBuilderAccess BuilderAccess = AssemblyBuilderAccess.Run;
-#if NET35
+#if NETFRAMEWORK
 			var asmBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(asmName, BuilderAccess);
 #else
 			var asmBuilder = AssemblyBuilder.DefineDynamicAssembly(asmName, BuilderAccess);