diff options
| author | Rolf Bjarne Kvinge <rolf@xamarin.com> | 2016-10-03 14:00:16 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2016-10-03 14:00:16 +0300 |
| commit | 5780d872ad5c32a1fcfa84c8e86af5ee73e50e9c (patch) | |
| tree | ebcb5521a960ff6c213de200c123bdcbde85672b /mcs/class/Makefile | |
| parent | 166830635e6c8ed89a2da3e18d43a3251b8a6a2b (diff) | |
[System*] Throw a PlatformNotSupported exception when using the managed networking stack on watchOS. (#3683)
* [System.Data] System.Data.SqlClient is not supported in watchOS.
System.Data.SqlClient is not supported in watchOS, because it depends on a
working managed networking stack, which we don't have on watchOS.
* [System] Throw PlatformNotSupportedExceptions in the networking stack for watchOS.
* [System] Don't reference/build Mono.Security.dll when building for watchOS.
This means we can't build Mono.Data.Tds.dll either, since it uses
Mono.Security.dll extensively. In any case Mono.Data.Tds.dll is useless
without a working networking stack, and since it's a Mono-only dll (i.e. not
part of netstandard or facades), just remove the entire assembly from the
watchOS profile.
System.Security.dll uses Mono.Security.dll as well, but the required classes
are available inside mscorlib.dll (as internal classes), so just open up
mscorlib internals to System.Security.dll.
* [System] Update tests after API change for watchOS.
* [System.Data] Update tests after API change in watchOS.
* Revert "Fix build break from 81fb20737f810def6dde88d87a1b2f23cdb736c3"
This reverts commit f4475ff01358f8490e7cd0878e8b39bed2a0def7.
* Fix missing trailing newline in monotouch_watch_System.dll.sources
It breaks the build on Linux if the newline is missing.
Diffstat (limited to 'mcs/class/Makefile')
| -rw-r--r-- | mcs/class/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/Makefile b/mcs/class/Makefile index ef78dfed837..f8f0b0a9396 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -83,7 +83,7 @@ monodroid_dirs := \ monotouch_dirs := \ $(mobile_static_dirs) -monotouch_watch_dirs := $(monotouch_dirs) +monotouch_watch_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs)) monotouch_tv_dirs := $(monotouch_dirs) monotouch_runtime_dirs := \ @@ -94,7 +94,7 @@ monotouch_runtime_dirs := \ System.XML \ Mono.CSharp -monotouch_watch_runtime_dirs := $(monotouch_runtime_dirs) +monotouch_watch_runtime_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_runtime_dirs)) monotouch_tv_runtime_dirs := $(monotouch_runtime_dirs) xammac_4_5_dirs := \ |