Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2018-09-12 15:52:52 +0300
committerMarek Safar <marek.safar@gmail.com>2018-09-13 10:37:14 +0300
commitb84f201e1bb2d56aabbfa7fb098721f5dbd147d7 (patch)
tree8d0cccf87a14c5ba3ddcae269d591c42a6043f8d
parente6e4f154742e038a4d4e3870acac854e3cc254f8 (diff)
[Facades] Adds System.Buffers mobile facade
and sets up facades without corresponding nuget _._ for conflict resolution done by msbuild
-rw-r--r--mcs/class/Facades/System.Buffers/AssemblyInfo.cs35
-rw-r--r--mcs/class/Facades/System.Buffers/Makefile24
-rw-r--r--mcs/class/Facades/System.Buffers/System.Buffers.dll.sources3
-rw-r--r--mcs/class/Facades/System.Buffers/TypeForwarders.cs23
-rw-r--r--mcs/class/Facades/System.Memory/AssemblyInfo.cs6
-rw-r--r--mcs/class/Facades/subdirs.make2
6 files changed, 89 insertions, 4 deletions
diff --git a/mcs/class/Facades/System.Buffers/AssemblyInfo.cs b/mcs/class/Facades/System.Buffers/AssemblyInfo.cs
new file mode 100644
index 00000000000..0eed9fb878b
--- /dev/null
+++ b/mcs/class/Facades/System.Buffers/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+//
+// Copyright (c) 2018 Microsoft
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle ("System.Buffers")]
+[assembly: AssemblyDescription ("System.Buffers")]
+[assembly: AssemblyDefaultAlias ("System.Buffers")]
+[assembly: AssemblyCompany ("Mono development team")]
+[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
+[assembly: AssemblyCopyright ("(c) Various Mono authors")]
+[assembly: AssemblyVersion ("4.0.99.0")]
+[assembly: AssemblyInformationalVersion ("4.0.99.0")]
+[assembly: AssemblyFileVersion ("4.0.99.0")]
diff --git a/mcs/class/Facades/System.Buffers/Makefile b/mcs/class/Facades/System.Buffers/Makefile
new file mode 100644
index 00000000000..a3ea07bd5f2
--- /dev/null
+++ b/mcs/class/Facades/System.Buffers/Makefile
@@ -0,0 +1,24 @@
+MCS_BUILD_DIR = ../../../build
+
+thisdir = class/Facades/System.Buffers
+SUBDIRS =
+include $(MCS_BUILD_DIR)/rules.make
+
+LIBRARY_SUBDIR = Facades
+LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
+
+LIBRARY = System.Buffers.dll
+
+KEYFILE = ../../Open.snk
+LIBRARY_SNK = $(KEYFILE)
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
+LIB_REFS =
+LIB_MCS_FLAGS = $(SIGN_FLAGS)
+
+PLATFORM_DEBUG_FLAGS =
+
+NO_TEST = yes
+
+include $(MCS_BUILD_DIR)/library.make
+
+
diff --git a/mcs/class/Facades/System.Buffers/System.Buffers.dll.sources b/mcs/class/Facades/System.Buffers/System.Buffers.dll.sources
new file mode 100644
index 00000000000..8e33d4ddeae
--- /dev/null
+++ b/mcs/class/Facades/System.Buffers/System.Buffers.dll.sources
@@ -0,0 +1,3 @@
+TypeForwarders.cs
+AssemblyInfo.cs
+
diff --git a/mcs/class/Facades/System.Buffers/TypeForwarders.cs b/mcs/class/Facades/System.Buffers/TypeForwarders.cs
new file mode 100644
index 00000000000..ff8e49a5d28
--- /dev/null
+++ b/mcs/class/Facades/System.Buffers/TypeForwarders.cs
@@ -0,0 +1,23 @@
+//
+// Copyright (c) 2018 Microsoft
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ArrayPool<>))]
diff --git a/mcs/class/Facades/System.Memory/AssemblyInfo.cs b/mcs/class/Facades/System.Memory/AssemblyInfo.cs
index c26c7bca7ae..66a56012e0c 100644
--- a/mcs/class/Facades/System.Memory/AssemblyInfo.cs
+++ b/mcs/class/Facades/System.Memory/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCompany ("Mono development team")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("(c) Various Mono authors")]
-[assembly: AssemblyVersion ("4.0.1.0")]
-[assembly: AssemblyInformationalVersion ("4.0.0.0")]
-[assembly: AssemblyFileVersion ("4.0.0.0")]
+[assembly: AssemblyVersion ("4.0.99.0")]
+[assembly: AssemblyInformationalVersion ("4.0.99.0")]
+[assembly: AssemblyFileVersion ("4.0.99.0")]
diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make
index 6fbe74daa20..5767b9693c0 100644
--- a/mcs/class/Facades/subdirs.make
+++ b/mcs/class/Facades/subdirs.make
@@ -90,7 +90,7 @@ unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
-mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs System.Threading.Tasks.Extensions \
+mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs System.Threading.Tasks.Extensions System.Memory System.Buffers \
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy System.Memory System.Drawing.Common
mobile_only_DEPS_SUBDIRS = System.Security.Cryptography.OpenSsl