From 502deb1a24285da30d175f3bfc4380fd6f4243b8 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 22 Dec 2020 20:25:44 +0000 Subject: [PATCH] Add additional dlls referenced by by netstandard 2.1 --- package-mono.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package-mono.sh b/package-mono.sh index e18854a..959708e 100755 --- a/package-mono.sh +++ b/package-mono.sh @@ -20,11 +20,14 @@ cp bin/mono "${BUILDDIR}" sed "s|\$mono_libdir/||g" etc/mono/config > "${BUILDDIR}/etc/mono/config" cp etc/mono/4.5/machine.config "${BUILDDIR}/etc/mono/4.5/" -# libmono-native-compat.dylib and netstandard.dll aren't packaged in the mkbundle runtime +# libmono-native-compat.dylib and several facade dlls aren't packaged in the mkbundle runtime # Copy it from the native mono installation (from travis-ci) instead cp "/Library/Frameworks/Mono.framework/Versions/${MONO_VERSION}/lib/libmono-native-compat.dylib" "${BUILDDIR}/lib/mono/4.5/" cp "/Library/Frameworks/Mono.framework/Versions/${MONO_VERSION}/lib/mono/4.5/Facades/netstandard.dll" "${BUILDDIR}/lib/mono/4.5/" -pwd + +pushd "/Library/Frameworks/Mono.framework/Versions/${MONO_VERSION}/lib/mono/4.5/Facades" > /dev/null +cp Microsoft.Win32.Registry.dll netstandard.dll System.Security.AccessControl.dll System.Security.Principal.Windows.dll "${BUILDDIR}/lib/mono/4.5/" +popd > /dev/null # Runtime dependencies # The required files can be found by running the following in the OpenRA engine directory: @@ -36,7 +39,7 @@ pwd # and looking for extension-less names that are then mapped in etc/mono/config or names that list a .so extension directly. pushd "lib/mono/4.5" > /dev/null -cp Mono.Security.dll mscorlib.dll System.Configuration.dll System.Core.dll System.dll System.Numerics.dll System.Security.dll System.Xml.dll "${BUILDDIR}/lib/mono/4.5/" +cp Mono.Security.dll mscorlib.dll System.Configuration.dll System.Core.dll System.dll System.Numerics.dll System.Runtime.Serialization.dll System.Security.dll System.Xml.dll System.Xml.Linq.dll "${BUILDDIR}/lib/mono/4.5/" popd > /dev/null popd