diff options
author | Marek Safar <marek.safar@gmail.com> | 2018-09-03 19:05:03 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-09-03 19:05:03 +0300 |
commit | 066a7c206e132a1e1eb8f18b6abac5ccf40bc392 (patch) | |
tree | d3f06b40aac236590a813dcb2d7fa0295689c5a5 /mcs/class/Facades | |
parent | 19fef52c186716b7a34e5255a08e4a5a69ed069f (diff) |
[Facades] Clean up no longer needed references (#10434)
and build more facades in parallel
Diffstat (limited to 'mcs/class/Facades')
10 files changed, 15 insertions, 32 deletions
diff --git a/mcs/class/Facades/Makefile b/mcs/class/Facades/Makefile index 4de8b1f6b79..0248cc3a206 100644 --- a/mcs/class/Facades/Makefile +++ b/mcs/class/Facades/Makefile @@ -39,7 +39,7 @@ doc-update-recursive: System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Numerics.Vectors System.Runtime.Serialization System.Transactions System.XML \ System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.IO.Compression.FileSystem System.Runtime.InteropServices.RuntimeInformation \ -System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression \ +System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression System.IdentityModel \ System.Web.Services: all-local-aot: diff --git a/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj b/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj index 4a24c60d0f3..f84e9aae08c 100644 --- a/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj +++ b/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj @@ -111,7 +111,6 @@ <ProjectReference Include="../../System/System.csproj" />
<ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization.csproj" />
<ProjectReference Include="../../System.XML/System.Xml.csproj" />
- <ProjectReference Include="../System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj" />
<ProjectReference Include="../../corlib/corlib.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile b/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile index 33067e02f90..92ad2df241c 100644 --- a/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile +++ b/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile @@ -11,7 +11,7 @@ LIBRARY = System.Runtime.Serialization.Xml.dll KEYFILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /nowarn:1616,1699 -LIB_REFS = System System.Runtime.Serialization System.Xml Facades/System.Runtime.Serialization.Primitives +LIB_REFS = System System.Runtime.Serialization System.Xml LIB_MCS_FLAGS = $(SIGN_FLAGS) PLATFORM_DEBUG_FLAGS = diff --git a/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Facades_System.Security.Cryptography.OpenSsl.csproj b/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Facades_System.Security.Cryptography.OpenSsl.csproj index a1979660f26..16a1a753866 100644 --- a/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Facades_System.Security.Cryptography.OpenSsl.csproj +++ b/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Facades_System.Security.Cryptography.OpenSsl.csproj @@ -101,7 +101,6 @@ <!-- @ALL_SOURCES@ -->
<ItemGroup>
<ProjectReference Include="../../System.Core/System.Core.csproj" />
- <ProjectReference Include="../System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj" />
<ProjectReference Include="../../corlib/corlib.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
diff --git a/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Makefile b/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Makefile index 84f6c2d338b..e76512f5c60 100644 --- a/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Makefile +++ b/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Makefile @@ -11,7 +11,7 @@ LIBRARY = System.Security.Cryptography.OpenSsl.dll KEYFILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /nowarn:1616,1699 -LIB_REFS = System.Core Facades/System.Security.Cryptography.Algorithms +LIB_REFS = System.Core LIB_MCS_FLAGS = $(SIGN_FLAGS) NO_TEST = yes diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj b/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj index 1b0d200e9bc..bc61e53c275 100644 --- a/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj +++ b/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj @@ -112,7 +112,6 @@ <ProjectReference Include="../../System.ServiceModel/System.ServiceModel.csproj" />
<ProjectReference Include="../../System.XML/System.Xml.csproj" />
<ProjectReference Include="../../System.IdentityModel/System.IdentityModel.csproj" />
- <ProjectReference Include="../System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates.csproj" />
<ProjectReference Include="../../corlib/corlib.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/Makefile b/mcs/class/Facades/System.ServiceModel.Primitives/Makefile index 14d3275d717..dc15771f8df 100644 --- a/mcs/class/Facades/System.ServiceModel.Primitives/Makefile +++ b/mcs/class/Facades/System.ServiceModel.Primitives/Makefile @@ -11,7 +11,7 @@ LIBRARY = System.ServiceModel.Primitives.dll KEYFILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /nowarn:1616,1699 -LIB_REFS = System System.ServiceModel System.Xml System.IdentityModel Facades/System.Security.Cryptography.X509Certificates +LIB_REFS = System System.ServiceModel System.Xml System.IdentityModel LIB_MCS_FLAGS = $(SIGN_FLAGS) diff --git a/mcs/class/Facades/netstandard/Facades_netstandard.csproj b/mcs/class/Facades/netstandard/Facades_netstandard.csproj index 5ce41cd0de5..05648f19945 100644 --- a/mcs/class/Facades/netstandard/Facades_netstandard.csproj +++ b/mcs/class/Facades/netstandard/Facades_netstandard.csproj @@ -121,16 +121,6 @@ <ProjectReference Include="../../System.Data/System.Data.csproj" />
<ProjectReference Include="../../System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj" />
<ProjectReference Include="../../System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj" />
- <ProjectReference Include="../System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation.csproj" />
- <ProjectReference Include="../System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj" />
- <ProjectReference Include="../System.Globalization.Extensions/Facades_System.Globalization.Extensions.csproj" />
- <ProjectReference Include="../System.Data.Common/Facades_System.Data.Common.csproj" />
- <ProjectReference Include="../System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace.csproj" />
- <ProjectReference Include="../System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj" />
- <ProjectReference Include="../System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj" />
- <ProjectReference Include="../System.Security.SecureString/Facades_System.Security.SecureString.csproj" />
- <ProjectReference Include="../System.Threading.Overlapped/Facades_System.Threading.Overlapped.csproj" />
- <ProjectReference Include="../System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument.csproj" />
<ProjectReference Include="../../corlib/corlib.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Facades/netstandard/Makefile b/mcs/class/Facades/netstandard/Makefile index b9974695d6d..bf2e9c4c344 100644 --- a/mcs/class/Facades/netstandard/Makefile +++ b/mcs/class/Facades/netstandard/Makefile @@ -13,10 +13,7 @@ KEYFILE = ../../Open.snk LIBRARY_SNK = $(KEYFILE) SIGN_FLAGS = /delaysign /nowarn:1616,1699 /nowarn:618 LIB_REFS = System System.Xml System.Xml.Linq System.Runtime.Serialization System.Core System.Numerics System.Numerics.Vectors System.Net.Http System.Transactions \ -System.IO.Compression System.Data System.ComponentModel.Composition System.IO.Compression.FileSystem Facades/System.Runtime.InteropServices.RuntimeInformation \ -Facades/System.Security.Cryptography.Algorithms Facades/System.Globalization.Extensions Facades/System.Data.Common \ -Facades/System.Diagnostics.StackTrace Facades/System.Runtime.Serialization.Xml Facades/System.Runtime.Serialization.Primitives \ -Facades/System.Security.SecureString Facades/System.Threading.Overlapped Facades/System.Xml.XPath.XDocument +System.IO.Compression System.Data System.ComponentModel.Composition System.IO.Compression.FileSystem LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS) diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make index 6fbe74daa20..1417b8fb485 100644 --- a/mcs/class/Facades/subdirs.make +++ b/mcs/class/Facades/subdirs.make @@ -28,12 +28,13 @@ System.IO.FileSystem.AccessControl System.Reflection.TypeExtensions System.Refle System.Threading.AccessControl System.ValueTuple \ System.Security.Cryptography.Primitives System.Text.Encoding.CodePages System.IO.FileSystem.Watcher \ System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes \ -System.Net.Ping System.Resources.Reader System.Resources.Writer System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp +System.Net.Ping System.Resources.Reader System.Resources.Writer System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp \ +System.Runtime.InteropServices.RuntimeInformation System.Xml.XPath.XDocument System.Threading.Overlapped System.Security.SecureString \ +System.Diagnostics.StackTrace System.Data.Common System.Globalization.Extensions System.Runtime.Serialization.Xml System.ServiceModel.Primitives \ +System.Security.Cryptography.X509Certificates System.Runtime.Serialization.Primitives System.Security.Cryptography.Algorithms # common_SUBDIRS dependencies -common_DEPS_SUBDIRS = System.Security.Cryptography.X509Certificates System.ServiceModel.Primitives System.Runtime.Serialization.Primitives \ -System.Runtime.Serialization.Xml System.Security.Cryptography.Algorithms System.Globalization.Extensions System.Data.Common \ -System.Diagnostics.StackTrace System.Security.SecureString System.Threading.Overlapped System.Xml.XPath.XDocument System.Runtime.InteropServices.RuntimeInformation +common_DEPS_SUBDIRS := netstandard_drawing_SUBDIRS = System.Drawing.Primitives netstandard @@ -78,21 +79,19 @@ monotouch_watch_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS) monotouch_tv_SUBDIRS = $(monotouch_SUBDIRS) monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS) -winaot_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS) +winaot_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) -orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS) +orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) -unreal_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS) +unreal_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) -wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS) +wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_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.Security.Cryptography.OpenSsl System.Threading.Tasks.Extensions \ 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 - PROFILE_PARALLEL_SUBDIRS = $(net_4_x_PARALLEL_SUBDIRS) |