Trim unused assemblies to reduce packaged size further.

.github/workflows/packaging.yml

@@ -39,6 +39,11 @@ jobs:
       - name: Clone Repository
         uses: actions/checkout@v2
 
+      - name: Install .NET 5
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'
+
       - name: Prepare Environment
         run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}
 

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;

OpenRA.Launcher/OpenRA.Launcher.csproj

@@ -65,4 +65,8 @@
       <Analyzer Remove="@(Analyzer)" />
     </ItemGroup>
   </Target>
+  <ItemGroup>
+    <TrimmerRootAssembly Include="netstandard" />
+    <TrimmerRootAssembly Include="System.IO.Pipes" />
+  </ItemGroup>
 </Project>

OpenRA.Server/OpenRA.Server.csproj

@@ -40,4 +40,8 @@
       <Analyzer Remove="@(Analyzer)" />
     </ItemGroup>
   </Target>
+  <ItemGroup>
+    <TrimmerRootAssembly Include="netstandard" />
+    <TrimmerRootAssembly Include="System.IO.Pipes" />
+  </ItemGroup>
 </Project>

OpenRA.Utility/OpenRA.Utility.csproj

@@ -40,4 +40,8 @@
       <Analyzer Remove="@(Analyzer)" />
     </ItemGroup>
   </Target>
+  <ItemGroup>
+    <TrimmerRootAssembly Include="netstandard" />
+    <TrimmerRootAssembly Include="System.IO.Pipes" />
+  </ItemGroup>
 </Project>

OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj

@@ -58,4 +58,8 @@
       <Analyzer Remove="@(Analyzer)" />
     </ItemGroup>
   </Target>
+  <ItemGroup>
+    <TrimmerRootAssembly Include="netstandard" />
+    <TrimmerRootAssembly Include="System.IO.Pipes" />
+  </ItemGroup>
 </Project>

packaging/functions.sh

@@ -118,7 +118,7 @@ install_assemblies() {
 	ORIG_PWD=$(pwd)
 	cd "${SRC_PATH}" || exit 1
 
-	dotnet publish -c Release -p:TargetPlatform="${TARGETPLATFORM}" -p:CopyGenericLauncher="${COPY_GENERIC_LAUNCHER}" -p:CopyCncDll="${COPY_CNC_DLL}" -p:CopyD2kDll="${COPY_D2K_DLL}" -r "${TARGETPLATFORM}" -o "${DEST_PATH}"
+	dotnet publish -c Release -p:TargetPlatform="${TARGETPLATFORM}" -p:PublishTrimmed=true -p:CopyGenericLauncher="${COPY_GENERIC_LAUNCHER}" -p:CopyCncDll="${COPY_CNC_DLL}" -p:CopyD2kDll="${COPY_D2K_DLL}" -r "${TARGETPLATFORM}" -o "${DEST_PATH}"
 
 	cd "${ORIG_PWD}" || exit 1
 }
@@ -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

packaging/macos/Info.plist.in

@@ -7,7 +7,7 @@
 	<key>CFBundleDisplayName</key>
 	<string>{MOD_NAME}</string>
 	<key>CFBundleExecutable</key>
-	<string>OpenRA</string>
+	<string>Launcher</string>
 	<key>CFBundleIconFile</key>
 	<string>{MOD_ID}.icns</string>
 	<key>CFBundleIdentifier</key>

packaging/macos/buildpackage.sh

@@ -55,13 +55,15 @@ modify_plist() {
 
 # Copies the game files and sets metadata
 build_app() {
-	TEMPLATE_DIR="${1}"
-	LAUNCHER_DIR="${2}"
-	MOD_ID="${3}"
-	MOD_NAME="${4}"
-	DISCORD_APPID="${5}"
+	PLATFORM="${1}"
+	TEMPLATE_DIR="${2}"
+	LAUNCHER_DIR="${3}"
+	MOD_ID="${4}"
+	MOD_NAME="${5}"
+	DISCORD_APPID="${6}"
 
 	LAUNCHER_CONTENTS_DIR="${LAUNCHER_DIR}/Contents"
+	LAUNCHER_ASSEMBLY_DIR="${LAUNCHER_CONTENTS_DIR}/MacOS"
 	LAUNCHER_RESOURCES_DIR="${LAUNCHER_CONTENTS_DIR}/Resources"
 
 	cp -r "${TEMPLATE_DIR}" "${LAUNCHER_DIR}"
@@ -72,7 +74,12 @@ build_app() {
 	fi
 
 	# Install engine and mod files
-	install_assemblies_mono "${SRCDIR}" "${LAUNCHER_RESOURCES_DIR}" "osx-x64" "True" "True" "${IS_D2K}"
+	if [ "${PLATFORM}" = "compat" ]; then
+		install_assemblies_mono "${SRCDIR}" "${LAUNCHER_ASSEMBLY_DIR}" "osx-x64" "True" "True" "${IS_D2K}"
+	else
+		install_assemblies "${SRCDIR}" "${LAUNCHER_ASSEMBLY_DIR}" "osx-x64" "True" "True" "${IS_D2K}"
+	fi
+
 	install_data "${SRCDIR}" "${LAUNCHER_RESOURCES_DIR}" "${MOD_ID}"
 	set_engine_version "${TAG}" "${LAUNCHER_RESOURCES_DIR}"
 	set_mod_version "${TAG}" "${LAUNCHER_RESOURCES_DIR}/mods/${MOD_ID}/mod.yaml" "${LAUNCHER_RESOURCES_DIR}/mods/modcontent/mod.yaml"
@@ -99,7 +106,6 @@ build_app() {
 
 	# Sign binaries with developer certificate
 	if [ -n "${MACOS_DEVELOPER_IDENTITY}" ]; then
-		codesign -s "${MACOS_DEVELOPER_IDENTITY}" --timestamp --options runtime -f --entitlements entitlements.plist "${LAUNCHER_RESOURCES_DIR}/"*.dylib
 		codesign -s "${MACOS_DEVELOPER_IDENTITY}" --timestamp --options runtime -f --entitlements entitlements.plist --deep "${LAUNCHER_DIR}"
 	fi
 }
@@ -120,23 +126,15 @@ build_platform() {
 
 	if [ "${PLATFORM}" = "compat" ]; then
 		modify_plist "{MINIMUM_SYSTEM_VERSION}" "10.9" "${TEMPLATE_DIR}/Contents/Info.plist"
-		clang -m64 launcher-mono.m -o "${TEMPLATE_DIR}/Contents/MacOS/OpenRA" -framework AppKit -mmacosx-version-min=10.9
+		clang -m64 launcher-mono.m -o "${TEMPLATE_DIR}/Contents/MacOS/Launcher" -framework AppKit -mmacosx-version-min=10.9
 	else
 		modify_plist "{MINIMUM_SYSTEM_VERSION}" "10.13" "${TEMPLATE_DIR}/Contents/Info.plist"
-		clang -m64 launcher.m -o "${TEMPLATE_DIR}/Contents/MacOS/OpenRA" -framework AppKit -mmacosx-version-min=10.13
-
-		curl -s -L -O https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${MONO_TAG}/mono.zip || exit 3
-		unzip -qq -d "${BUILTDIR}/mono" mono.zip
-		mv "${BUILTDIR}/mono/mono" "${TEMPLATE_DIR}/Contents/MacOS/"
-		mv "${BUILTDIR}/mono/etc" "${TEMPLATE_DIR}/Contents/Resources"
-		mv "${BUILTDIR}/mono/lib" "${TEMPLATE_DIR}/Contents/Resources"
-		rm mono.zip
-		rmdir "${BUILTDIR}/mono"
+		clang -m64 launcher.m -o "${TEMPLATE_DIR}/Contents/MacOS/Launcher" -framework AppKit -mmacosx-version-min=10.13
 	fi
 
-	build_app "${TEMPLATE_DIR}" "${BUILTDIR}/OpenRA - Red Alert.app" "ra" "Red Alert" "699222659766026240"
-	build_app "${TEMPLATE_DIR}" "${BUILTDIR}/OpenRA - Tiberian Dawn.app" "cnc" "Tiberian Dawn" "699223250181292033"
-	build_app "${TEMPLATE_DIR}" "${BUILTDIR}/OpenRA - Dune 2000.app" "d2k" "Dune 2000" "712711732770111550"
+	build_app "${PLATFORM}" "${TEMPLATE_DIR}" "${BUILTDIR}/OpenRA - Red Alert.app" "ra" "Red Alert" "699222659766026240"
+	build_app "${PLATFORM}" "${TEMPLATE_DIR}" "${BUILTDIR}/OpenRA - Tiberian Dawn.app" "cnc" "Tiberian Dawn" "699223250181292033"
+	build_app "${PLATFORM}" "${TEMPLATE_DIR}" "${BUILTDIR}/OpenRA - Dune 2000.app" "d2k" "Dune 2000" "712711732770111550"
 
 	rm -rf "${TEMPLATE_DIR}"
 
@@ -183,6 +181,25 @@ build_platform() {
 	SetFile -c icnC "/Volumes/OpenRA/.VolumeIcon.icns"
 	SetFile -a C "/Volumes/OpenRA"
 
+	# Replace duplicate .NET runtime files with hard links to improve compression
+	if [ "${PLATFORM}" != "compat" ]; then
+		OIFS="$IFS"
+		IFS=$'\n'
+		for MOD in "Red Alert" "Tiberian Dawn"; do
+			for f in $(find /Volumes/OpenRA/OpenRA\ -\ ${MOD}.app/Contents/MacOS/*); do
+				g="/Volumes/OpenRA/OpenRA - Dune 2000.app/Contents/MacOS/"$(basename "${f}")
+				hashf=$(shasum "${f}" | awk '{ print $1 }')
+				hashg=$(shasum "${g}" | awk '{ print $1 }')
+				if [ "${hashf}" = "${hashg}" ]; then
+					echo "Deduplicating ${f}"
+					rm "${f}"
+					ln "${g}" "${f}"
+				fi
+			done
+		done
+		IFS="$OIFS"
+	fi
+
 	chmod -Rf go-w /Volumes/OpenRA
 	sync
 	sync

packaging/macos/launcher-mono.m

@@ -262,8 +262,9 @@ static int check_mono_version(const char *version, const char *req_version)
 
 	NSMutableArray *launchArgs = [NSMutableArray arrayWithCapacity: [gameArgs count] + 2];
 	[launchArgs addObject: @"--debug"];
-	[launchArgs addObject: [gamePath stringByAppendingPathComponent: gameName]];
+	[launchArgs addObject: [exePath stringByAppendingPathComponent: gameName]];
 	[launchArgs addObject: [NSString stringWithFormat:@"Engine.LaunchPath=\"%@\"", engineLaunchPath]];
+	[launchArgs addObject: [NSString stringWithFormat:@"Engine.EngineDir=../Resources"]];
 
 	if (modId)
 		[launchArgs addObject: [NSString stringWithFormat:@"Game.Mod=%@", modId]];

packaging/macos/launcher.m

@@ -131,16 +131,11 @@ NSTask *gameTask;
 	launched = YES;
 
 	// Default values - can be overriden by setting certain keys Info.plist
-	NSString *gameName = @"OpenRA.dll";
 	NSString *modId = nil;
 
 	NSDictionary *plist = [[NSBundle mainBundle] infoDictionary];
 	if (plist)
 	{
-		NSString *exeValue = [plist objectForKey:@"MonoGameExe"];
-		if (exeValue && [exeValue length] > 0)
-			gameName = exeValue;
-
 		NSString *modIdValue = [plist objectForKey:@"ModId"];
 		if (modIdValue && [modIdValue length] > 0)
 			modId = modIdValue;
@@ -149,21 +144,20 @@ NSTask *gameTask;
 	NSString *exePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"Contents/MacOS/"];
 	NSString *gamePath = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"Contents/Resources/"];
 
-	NSString *launchPath = [exePath stringByAppendingPathComponent: @"mono"];
-	NSString *appPath = [exePath stringByAppendingPathComponent: @"OpenRA"];
+	NSString *launchPath = [exePath stringByAppendingPathComponent: @"OpenRA"];
+	NSString *appPath = [exePath stringByAppendingPathComponent: @"Launcher"];
 	NSString *engineLaunchPath = [self resolveTranslocatedPath: appPath];
 
 	NSMutableArray *launchArgs = [NSMutableArray arrayWithCapacity: [gameArgs count] + 2];
-	[launchArgs addObject: @"--debug"];
-	[launchArgs addObject: [gamePath stringByAppendingPathComponent: gameName]];
 	[launchArgs addObject: [NSString stringWithFormat:@"Engine.LaunchPath=\"%@\"", engineLaunchPath]];
+	[launchArgs addObject: [NSString stringWithFormat:@"Engine.EngineDir=../Resources"]];
 
 	if (modId)
 		[launchArgs addObject: [NSString stringWithFormat:@"Game.Mod=%@", modId]];
 
 	[launchArgs addObjectsFromArray: gameArgs];
 
-	NSLog(@"Running mono with arguments:");
+	NSLog(@"Running OpenRA with arguments:");
 	for (size_t i = 0; i < [launchArgs count]; i++)
 		NSLog(@"%@", [launchArgs objectAtIndex: i]);
 
@@ -172,12 +166,6 @@ NSTask *gameTask;
 	[gameTask setLaunchPath: launchPath];
 	[gameTask setArguments: launchArgs];
 
-	NSMutableDictionary *environment = [NSMutableDictionary dictionaryWithDictionary: [[NSProcessInfo processInfo] environment]];
-	[environment setObject: [gamePath stringByAppendingPathComponent: @"lib/mono/4.5"] forKey: @"MONO_PATH"];
-	[environment setObject: [gamePath stringByAppendingPathComponent: @"etc"] forKey: @"MONO_CFG_DIR"];
-	[environment setObject: [gamePath stringByAppendingPathComponent: @"etc/mono/config"] forKey: @"MONO_CONFIG"];
-	[gameTask setEnvironment: environment];
-
 	[[NSNotificationCenter defaultCenter]
 		addObserver: self
 		selector: @selector(taskExited:)