diff options
| author | Egor Bogatov <egorbo@gmail.com> | 2018-10-23 18:25:30 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-10-23 18:25:30 +0300 |
| commit | 4693c9775c07cc3d0e7de373818b962f38a371d6 (patch) | |
| tree | fee17b1c11f316229e5d33c235e78ca6f22be718 /mcs/class/System.XML | |
| parent | 109563930d6559e3ade2c8f652f21574ea43ad1d (diff) | |
[corlib] DateTime, TimeSpan and TimeZone from CoreFX (#11232)
* DateTime from corefx
* TimeZone and TimeSpan from corefx
* bump corefx
* remove some reflection tests temporarily (due to corefx bump)
* ignore "Obsolete" warrning-error in System.XML (because of TimeZone)
* undo submodules
* remove TimeZone.cs
* Add tests
* clean up
* fix failing TZ tests
* Add HebrewCalendar as optional to "he" culture
* ignore failing tests
* Bump API snapshot submodule
* [csproj] Update project files
Diffstat (limited to 'mcs/class/System.XML')
| -rw-r--r-- | mcs/class/System.XML/Makefile | 2 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.csproj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile index 9afb68bccdb..8d157d86956 100644 --- a/mcs/class/System.XML/Makefile +++ b/mcs/class/System.XML/Makefile @@ -10,7 +10,7 @@ TXT_RESOURCE_STRINGS = \ RESX_RESOURCE_STRING = \ ../../../external/corefx/src/System.Private.Xml/src/Resources/Strings.resx -LIB_MCS_FLAGS = -nowarn:219,414,649,1717 -unsafe -d:ASYNC +LIB_MCS_FLAGS = -nowarn:219,414,618,649,1717 -unsafe -d:ASYNC ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:AGCLR -d:DISABLE_XSLT_COMPILER -d:DISABLE_XSLT_SCRIPT,MONO_HYBRID_SYSTEM_XML -d:DISABLE_CAS_USE diff --git a/mcs/class/System.XML/System.Xml.csproj b/mcs/class/System.XML/System.Xml.csproj index 149332d2b99..43da7bd60ad 100644 --- a/mcs/class/System.XML/System.Xml.csproj +++ b/mcs/class/System.XML/System.Xml.csproj @@ -6,7 +6,7 @@ <Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
<ProjectGuid>{1F165EE1-C483-4ACE-BD45-31074A9F735F}</ProjectGuid>
<OutputType>Library</OutputType>
- <NoWarn>1699,219,414,649,1717</NoWarn>
+ <NoWarn>1699,219,414,618,649,1717</NoWarn>
<LangVersion>latest</LangVersion>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
|