From 9a3e8fa3c7fd63d240b68a7364e427cb30c52d32 Mon Sep 17 00:00:00 2001 From: ta264 Date: Thu, 17 Oct 2019 21:42:49 +0100 Subject: [PATCH] Fixed: Ensure mono compatible facades are present at build --- .../Mono/System.Globalization.Extensions.dll | Bin 0 -> 6144 bytes ...ime.InteropServices.RuntimeInformation.dll | Bin 0 -> 7168 bytes .../Mono/System.Text.Encoding.CodePages.dll | Bin 0 -> 5120 bytes .../Mono/System.Threading.Overlapped.dll | Bin 0 -> 4608 bytes src/Libraries/Mono/readme.txt | 3 ++ src/MonoFacades.targets | 35 +++++++++++------- 6 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 src/Libraries/Mono/System.Globalization.Extensions.dll create mode 100644 src/Libraries/Mono/System.Runtime.InteropServices.RuntimeInformation.dll create mode 100644 src/Libraries/Mono/System.Text.Encoding.CodePages.dll create mode 100644 src/Libraries/Mono/System.Threading.Overlapped.dll create mode 100644 src/Libraries/Mono/readme.txt diff --git a/src/Libraries/Mono/System.Globalization.Extensions.dll b/src/Libraries/Mono/System.Globalization.Extensions.dll new file mode 100644 index 0000000000000000000000000000000000000000..8c0861579e934bf6c285d54aea26f14559e2545e GIT binary patch literal 6144 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 E0%~bA2LJ#7 literal 0 HcmV?d00001 diff --git a/src/Libraries/Mono/System.Runtime.InteropServices.RuntimeInformation.dll b/src/Libraries/Mono/System.Runtime.InteropServices.RuntimeInformation.dll new file mode 100644 index 0000000000000000000000000000000000000000..e55b5eb23a927d37141e2fdb219f16ddcc51d72a GIT binary patch literal 7168 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 Z{vR&5(D*y?!v&e@e|R_lSN#+%@Nc{TN0k5o literal 0 HcmV?d00001 diff --git a/src/Libraries/Mono/System.Text.Encoding.CodePages.dll b/src/Libraries/Mono/System.Text.Encoding.CodePages.dll new file mode 100644 index 0000000000000000000000000000000000000000..414770bc096f591deb3b2473b719e19d3c9d6cbd GIT binary patch literal 5120 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 literal 0 HcmV?d00001 diff --git a/src/Libraries/Mono/readme.txt b/src/Libraries/Mono/readme.txt new file mode 100644 index 000000000..f1251a98f --- /dev/null +++ b/src/Libraries/Mono/readme.txt @@ -0,0 +1,3 @@ +Copied from mono/4.5/Facades of the mono 5.4 release. +These are the mono version of the dotnet Core TypeForwardedTo assemblies. +Using these assemblies is no longer necessary once we reach mono 5.18 as minimum version \ No newline at end of file diff --git a/src/MonoFacades.targets b/src/MonoFacades.targets index 733bd3b6d..6e1cc5484 100644 --- a/src/MonoFacades.targets +++ b/src/MonoFacades.targets @@ -7,36 +7,45 @@ Warning: We ONLY support facades that reside directly in MonoFacadesPath, otherwise the joining of items becomes complicated. Any MonoFacade listed that doesn't exist on disk will be removed instead of replaced. + + See: https://github.com/mono/mono/blob/master/tools/nuget-hash-extractor/download.sh + That list defines assemblies that are prohibited from being loaded from the appdir, instead loading from mono GAC. --> $(MSBuildThisFileDirectory)Libraries\Mono\ + + $(ResolveReferencesDependsOn); + SubstituteMonoFacadesBuild + + + + + + - - - - - + - - - %(ResolvedFileToPublish.Identity) + + + + %(ReferenceCopyLocalPaths.Identity) $(MonoFacadesPath)%(Filename)%(Extension) - - - + + +