diff --git a/mcs/class/Facades/System.IO.Compression/AssemblyInfo.cs b/mcs/class/Facades/System.IO.Compression/AssemblyInfo.cs deleted file mode 100644 index 08e157f660..0000000000 --- a/mcs/class/Facades/System.IO.Compression/AssemblyInfo.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com) -// -// 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.IO.Compression.dll")] -[assembly: AssemblyDescription ("System.IO.Compression.dll")] -[assembly: AssemblyDefaultAlias ("System.IO.Compression.dll")] -[assembly: AssemblyCompany ("Xamarin, Inc.")] -[assembly: AssemblyProduct ("Mono Common Language Infrastructure")] -[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] -[assembly: AssemblyInformationalVersion ("4.0.0.0")] -[assembly: AssemblyFileVersion ("4.0.0.0")] -[assembly: AssemblyDelaySign (true)] -[assembly: AssemblyKeyFile ("../../msfinal.pub")] - -[assembly: ReferenceAssembly] - - diff --git a/mcs/class/Facades/System.IO.Compression/Makefile b/mcs/class/Facades/System.IO.Compression/Makefile deleted file mode 100644 index 4fbfc5625b..0000000000 --- a/mcs/class/Facades/System.IO.Compression/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -MCS_BUILD_DIR = ../../../build - -thisdir = class/Facades/System.IO.Compression -SUBDIRS = -include $(MCS_BUILD_DIR)/rules.make - -LIBRARY_SUBDIR = Facades -LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades - -LIBRARY = System.IO.Compression.dll - -KEY_FILE = ../../msfinal.pub -SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 -LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) - -PLATFORM_DEBUG_FLAGS = - -NO_TEST = yes - -include $(MCS_BUILD_DIR)/library.make - - diff --git a/mcs/class/Facades/System.IO.Compression/Missing.cs b/mcs/class/Facades/System.IO.Compression/Missing.cs deleted file mode 100644 index cd06b1c684..0000000000 --- a/mcs/class/Facades/System.IO.Compression/Missing.cs +++ /dev/null @@ -1,40 +0,0 @@ -// This is stub only. The implementation should come from https://github.com/dotnet/corefx/tree/master/src/System.IO.Compression/src/System/IO/Compression - -namespace System.IO.Compression -{ - public class ZipArchive : System.IDisposable - { - public ZipArchive(System.IO.Stream stream) { } - public ZipArchive(System.IO.Stream stream, System.IO.Compression.ZipArchiveMode mode) { } - public ZipArchive(System.IO.Stream stream, System.IO.Compression.ZipArchiveMode mode, bool leaveOpen) { } - public ZipArchive(System.IO.Stream stream, System.IO.Compression.ZipArchiveMode mode, bool leaveOpen, System.Text.Encoding entryNameEncoding) { } - public System.Collections.ObjectModel.ReadOnlyCollection Entries { get { return default(System.Collections.ObjectModel.ReadOnlyCollection); } } - public System.IO.Compression.ZipArchiveMode Mode { get { return default(System.IO.Compression.ZipArchiveMode); } } - public System.IO.Compression.ZipArchiveEntry CreateEntry(string entryName) { return default(System.IO.Compression.ZipArchiveEntry); } - public System.IO.Compression.ZipArchiveEntry CreateEntry(string entryName, System.IO.Compression.CompressionLevel compressionLevel) { return default(System.IO.Compression.ZipArchiveEntry); } - public void Dispose() { } - protected virtual void Dispose(bool disposing) { } - public System.IO.Compression.ZipArchiveEntry GetEntry(string entryName) { return default(System.IO.Compression.ZipArchiveEntry); } - } - - public partial class ZipArchiveEntry - { - internal ZipArchiveEntry() { } - public System.IO.Compression.ZipArchive Archive { get { return default(System.IO.Compression.ZipArchive); } } - public long CompressedLength { get { return default(long); } } - public string FullName { get { return default(string); } } - public System.DateTimeOffset LastWriteTime { get { return default(System.DateTimeOffset); } set { } } - public long Length { get { return default(long); } } - public string Name { get { return default(string); } } - public void Delete() { } - public System.IO.Stream Open() { return default(System.IO.Stream); } - public override string ToString() { return default(string); } - } - - public enum ZipArchiveMode - { - Create = 1, - Read = 0, - Update = 2, - } -} \ No newline at end of file diff --git a/mcs/class/Facades/System.IO.Compression/System.IO.Compression.dll.sources b/mcs/class/Facades/System.IO.Compression/System.IO.Compression.dll.sources deleted file mode 100644 index 402d066e4c..0000000000 --- a/mcs/class/Facades/System.IO.Compression/System.IO.Compression.dll.sources +++ /dev/null @@ -1,3 +0,0 @@ -TypeForwarders.cs -AssemblyInfo.cs -Missing.cs diff --git a/mcs/class/Facades/System.IO.Compression/TypeForwarders.cs b/mcs/class/Facades/System.IO.Compression/TypeForwarders.cs deleted file mode 100644 index 5eaf037320..0000000000 --- a/mcs/class/Facades/System.IO.Compression/TypeForwarders.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com) -// -// 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.TypeForwardedToAttribute(typeof(System.IO.Compression.CompressionLevel))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Compression.CompressionMode))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Compression.DeflateStream))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Compression.GZipStream))] - - diff --git a/mcs/class/Facades/System.Text.Encoding.CodePages/CodePagesEncodingProvider.cs b/mcs/class/Facades/System.Text.Encoding.CodePages/CodePagesEncodingProvider.cs index d97ad54eb8..11214d2825 100644 --- a/mcs/class/Facades/System.Text.Encoding.CodePages/CodePagesEncodingProvider.cs +++ b/mcs/class/Facades/System.Text.Encoding.CodePages/CodePagesEncodingProvider.cs @@ -22,16 +22,32 @@ namespace System.Text { - public sealed partial class CodePagesEncodingProvider + public sealed partial class CodePagesEncodingProvider : EncodingProvider { + static CodePagesEncodingProvider instance = new CodePagesEncodingProvider (); + private CodePagesEncodingProvider () { } public static System.Text.EncodingProvider Instance { get { - throw new NotImplementedException (); + return instance; } } + + public override Encoding GetEncoding (string name) + { + // MSDN: "if name is not the name of an encoding that you support, the method should return null." + // We do this here since all our encodings are already supported by the main Encoding class + return null; + } + + public override Encoding GetEncoding (int codepage) + { + // MSDN: "if codepage is not the code page identifier of an encoding that you support, the method should return null." + // We do this here since all our encodings are already supported by the main Encoding class + return null; + } } } \ No newline at end of file diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make index e1f56af6a2..244a64dbf5 100644 --- a/mcs/class/Facades/subdirs.make +++ b/mcs/class/Facades/subdirs.make @@ -25,7 +25,7 @@ System.Security.Cryptography.Hashing.Algorithms System.Security.Cryptography.RSA System.Security.Principal.Windows System.Threading.Thread System.Threading.ThreadPool \ System.Xml.XPath System.Xml.XmlDocument System.Xml.Xsl.Primitives Microsoft.Win32.Registry.AccessControl System.Diagnostics.StackTrace System.Globalization.Extensions \ System.IO.FileSystem.AccessControl System.Private.CoreLib.InteropServices System.Private.CoreLib.Threading System.Reflection.TypeExtensions \ -System.Security.SecureString System.Threading.AccessControl System.Threading.Overlapped System.Xml.XPath.XDocument System.IO.Compression \ +System.Security.SecureString System.Threading.AccessControl System.Threading.Overlapped System.Xml.XPath.XDocument \ System.Security.Cryptography.Algorithms System.Security.Cryptography.Primitives System.Text.Encoding.CodePages System.IO.FileSystem.Watcher \ System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes diff --git a/mcs/class/System.Core/common_System.Core.dll.sources b/mcs/class/System.Core/common_System.Core.dll.sources index 808d7108c9..b903cf3ded 100644 --- a/mcs/class/System.Core/common_System.Core.dll.sources +++ b/mcs/class/System.Core/common_System.Core.dll.sources @@ -1,4 +1,5 @@ ../../build/common/SR.cs +../../build/common/MonoTODOAttribute.cs Assembly/AssemblyInfo.cs System/Util.cs diff --git a/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id index a01cea0c98..315833c554 100644 --- a/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c6e7083792005968025f4c042f5f4a3e0c78da07 \ No newline at end of file +72c4a5b3321dedebb7545dee4fbc4843119edbc5 \ No newline at end of file diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index f0a23ef6ba..211fe39b71 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -801,7 +801,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.4.2.8/b430435\"" > version.h + echo "#define FULL_VERSION \"Stable 4.4.2.11/f72fe45\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index f0a23ef6ba..211fe39b71 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -801,7 +801,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.4.2.8/b430435\"" > version.h + echo "#define FULL_VERSION \"Stable 4.4.2.11/f72fe45\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index f6f94d7da4..b07265c7ce 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -3aaf7c80ccd98cebb57a8ccc2edaae35be2685c6 \ No newline at end of file +0a4ebda97cd3ed50265afd60cdd79a2834e10400 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 44d1dc6e5c..a7485a402b 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.4.2.8/b430435" +#define FULL_VERSION "Stable 4.4.2.11/f72fe45" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index bcda54348f..1a4b272fe1 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 87896c753b..6a41a64998 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -3e14d187d24477dad777bf70d778c896db832389 \ No newline at end of file +9022e9b2c989f03b8d78027e5e60fd452f7e0a76 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 5683e9d3ef..14fef5077d 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 9b92ef7428..6cccd26395 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -62e818c3e7d3b5082ebb570a97196f5b21c15dbe \ No newline at end of file +0160c007efe4028f88e8849dcda91d49787c33a8 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index d74f104019..f45051ffbb 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index cfd3b4df92..cd6e34a412 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -5e6566da5c9c4636f01b19f26738b878c60c9722 \ No newline at end of file +69ad8d04396a6ca819c7573b2208c86a1d1b9d96 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index d87c109822..b83eebcfda 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mono 4.4.2\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2016-07-26 08:41+0000\n" +"POT-Creation-Date: 2016-07-29 09:28+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 8ea7de5452..78e7514ddb 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 8361cca3ce..c112ea50db 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -8b8c1f7baa12d244f43716e816c8a3a30101007f \ No newline at end of file +6f7709eef2f31ae72fac8b30d4e69c409ecd85ed \ No newline at end of file