mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: d1e5542df8ecb2c28d9ec37908019a17ce71474b
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2016-07-29 09:41:50 +00:00
commit b432114865
22 changed files with 30 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mcs/class/Facades/System.IO.Compression/AssemblyInfo.cs
View File

@ -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]

23
mcs/class/Facades/System.IO.Compression/Makefile
View File

@ -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

40
mcs/class/Facades/System.IO.Compression/Missing.cs
View File

@ -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<System.IO.Compression.ZipArchiveEntry> Entries { get { return default(System.Collections.ObjectModel.ReadOnlyCollection<System.IO.Compression.ZipArchiveEntry>); } }
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,
}
}

3
mcs/class/Facades/System.IO.Compression/System.IO.Compression.dll.sources
View File

@ -1,3 +0,0 @@
TypeForwarders.cs
AssemblyInfo.cs
Missing.cs

28
mcs/class/Facades/System.IO.Compression/TypeForwarders.cs
View File

@ -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))]

20
mcs/class/Facades/System.Text.Encoding.CodePages/CodePagesEncodingProvider.cs
View File

@ -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;
}
}
}

2
mcs/class/Facades/subdirs.make
View File

@ -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

1
mcs/class/System.Core/common_System.Core.dll.sources
View File

@ -1,4 +1,5 @@
../../build/common/SR.cs
../../build/common/MonoTODOAttribute.cs
Assembly/AssemblyInfo.cs
System/Util.cs

2
mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
c6e7083792005968025f4c042f5f4a3e0c78da07
72c4a5b3321dedebb7545dee4fbc4843119edbc5

2
mono/mini/Makefile.am
View File

@ -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:

2
mono/mini/Makefile.am.in
View File

@ -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:

2
mono/mini/Makefile.in.REMOVED.git-id
View File

@ -1 +1 @@
3aaf7c80ccd98cebb57a8ccc2edaae35be2685c6
0a4ebda97cd3ed50265afd60cdd79a2834e10400

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "Stable 4.4.2.8/b430435"
#define FULL_VERSION "Stable 4.4.2.11/f72fe45"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
3e14d187d24477dad777bf70d778c896db832389
9022e9b2c989f03b8d78027e5e60fd452f7e0a76

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
62e818c3e7d3b5082ebb570a97196f5b21c15dbe
0160c007efe4028f88e8849dcda91d49787c33a8

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
5e6566da5c9c4636f01b19f26738b878c60c9722
69ad8d04396a6ca819c7573b2208c86a1d1b9d96

2
po/mcs/mcs.pot
View File

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
8b8c1f7baa12d244f43716e816c8a3a30101007f
6f7709eef2f31ae72fac8b30d4e69c409ecd85ed