Add support for dotnet core for Windows

OpenRA.Game/ObjectCreator.cs

@@ -42,8 +42,14 @@ namespace OpenRA
 				var resolvedPath = FileSystem.FileSystem.ResolveAssemblyPath(path, manifest, mods);
 				if (resolvedPath == null)
 					throw new FileNotFoundException("Assembly `{0}` not found.".F(path));
+#if !MONO
+				var loader = new AssemblyLoader(resolvedPath);
+				var platformType = loader.LoadDefaultAssembly();
+				assemblyList.Add(platformType);
 
+#else
 				LoadAssembly(assemblyList, resolvedPath);
+#endif
 			}
 
 			AppDomain.CurrentDomain.AssemblyResolve += ResolveAssembly;
@@ -60,7 +66,6 @@ namespace OpenRA
 
 			if (!ResolvedAssemblies.TryGetValue(hash, out var assembly))
 			{
-#if MONO
 				assembly = Assembly.LoadFile(resolvedPath);
 				ResolvedAssemblies.Add(hash, assembly);
 
@@ -75,11 +80,6 @@ namespace OpenRA
 							LoadAssembly(assemblyList, depedencyPath);
 					}
 				}
-#else
-				var loader = new AssemblyLoader(resolvedPath);
-				assembly = loader.LoadDefaultAssembly();
-				ResolvedAssemblies.Add(hash, assembly);
-#endif
 			}
 
 			assemblyList.Add(assembly);

OpenRA.Game/Support/AssemblyLoader.cs

@@ -9,8 +9,7 @@
  */
 #endregion
 
-// Not used/usable on Mono. Only used for Dotnet Core.
-// Based on https://github.com/natemcmaster/DotNetCorePlugins and used under the terms of the Apache 2.0 license
+// Not used/usable on Mono. Only used for Dotnet Core. Based on https://github.com/natemcmaster/DotNetCorePlugins
 #if !MONO
 using System;
 using System.Collections.Generic;

packaging/functions.sh

@@ -141,7 +141,7 @@ install_data() {
 	DEST_PATH="${2}"
 	shift 2
 
-	"${SRC_PATH}"/fetch-geoip.sh
+  "${SRC_PATH}"/fetch-geoip.sh
 
 	echo "Installing engine files to ${DEST_PATH}"
 	for FILE in VERSION AUTHORS COPYING IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP "global mix database.dat"; do