[Pkg-mono-svn-commits] [mono] 01/01: Merge branch 'upstream' into master-patches/debian_version
Jo Shields
directhex at moszumanska.debian.org
Tue Sep 1 09:32:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to branch master-patches/debian_version
in repository mono.
commit 73e1c62d513ea334e65ef4e1d86945d41b247401
Merge: 4129230 fab431e
Author: Jo Shields <jo.shields at xamarin.com>
Date: Tue Sep 1 10:21:57 2015 +0100
Merge branch 'upstream' into master-patches/debian_version
Conflicts:
mono/mini/Makefile.am
Makefile.in | 2 +-
configure | 20 +-
configure.ac | 2 +-
docs/deploy/mono-api-codegen.html | 4 +-
docs/deploy/mono-api-internal.html | 34 +
docs/deploy/mono-api-jit.html | 2 +-
docs/deploy/mono-api-object.html | 8 +
docs/deploy/mono-api-profiler.html | 4 +-
mcs/Makefile | 2 +
mcs/build/common/Consts.cs | 2 +-
mcs/build/common/SR.cs | 1 -
mcs/class/Facades/Makefile | 1 +
.../System.ServiceModel.Security/TypeForwarders.cs | 2 +
mcs/class/Makefile | 45 +-
.../System.ComponentModel.Composition.4.5/Makefile | 2 +-
.../xammac_net_4_5_System.Core.dll.sources | 1 +
mcs/class/System.Data.Linq/Makefile | 2 +-
mcs/class/System.Data.Services.Client/Makefile | 2 +
...net_4_5_System.Data.Services.Client.dll.sources | 1 +
mcs/class/System.Data/Makefile | 4 +-
mcs/class/System.Data/ReferenceSources/Bid.cs | 6 +-
.../ReferenceSources/DbConnectionStringDefaults.cs | 57 ++
.../System.Data/ReferenceSources/OdbcHandle.cs | 16 -
mcs/class/System.Data/ReferenceSources/Res.cs | 4 +-
.../ReferenceSources/ResCategoryAttribute.cs | 12 -
.../System.Data.Common/DataColumnMapping.cs | 131 ++++
.../DataColumnMappingCollection.cs | 338 +++++++++
.../DataColumnMappingConverter.cs} | 24 +-
.../System.Data.Common/DataTableMapping.cs | 159 ++++
.../DataTableMappingCollection.cs | 326 +++++++++
.../DataTableMappingConverter.cs} | 24 +-
.../System.Data.Common/DbConnectionOptions.cs | 257 +++++++
.../System.Data.Common/DbConnectionString.cs | 113 +++
.../DbConnectionStringBuilder.cs | 802 +++++++++++++++++++++
.../System.Data.Common/DbDataPermission.cs | 317 ++++++++
.../DbDataPermissionAttribute.cs | 113 +++
.../System.Data/System.Data.Odbc/OdbcConnection.cs | 4 +-
.../OdbcConnectionStringBuilder.cs | 219 ++++++
.../System.Data/System.Data.Odbc/OdbcError.cs | 104 +++
.../System.Data/System.Data.Odbc/OdbcPermission.cs | 87 +++
.../System.Data.Odbc/OdbcPermissionAttribute.cs} | 51 +-
.../SqlConnectionStringBuilder.cs | 4 +-
mcs/class/System.Data/System.Data.dll.sources | 37 +-
.../System.Data/KeyRestrictionBehavior.cs} | 38 +-
.../System.Data.Common/DBDataPermissionTest.cs | 2 +-
.../DbConnectionStringBuilderTest.cs | 2 +-
.../System.Data/mobile_System.Data.dll.sources | 28 +-
.../xammac_net_4_5_System.Data.dll.sources | 1 +
mcs/class/System.IdentityModel.Selectors/Makefile | 2 +-
mcs/class/System.IdentityModel/Makefile | 9 +-
.../CustomUserNameSecurityTokenAuthenticator.cs | 2 +
.../UserNamePasswordValidator.cs | 2 +
mcs/class/System.Messaging/Makefile | 11 +-
.../System.Messaging.Design/QueuePathEditor.cs | 2 +
.../System.Messaging/MessageQueue.cs | 6 +
.../System.Messaging/MessageQueueInstaller.cs | 8 +-
.../System.Net.Http/HttpClientHandler.cs | 2 +
.../System.Net.Http/System.Net.Http/HttpContent.cs | 6 +
...et_4_5_System.Runtime.Serialization.dll.sources | 1 +
mcs/class/System.ServiceModel.Web/Makefile | 10 +-
.../WebMessageEncodingBindingElement.cs | 2 +-
.../WebHttpBehavior.cs | 6 +-
.../System.ServiceModel/WebHttpBinding.cs | 4 +-
...mac_net_4_5_System.ServiceModel.Web.dll.sources | 39 +
mcs/class/System.ServiceModel/Dummy_2_1.cs | 2 +
mcs/class/System.ServiceModel/Dummy_XM_4_5.cs | 69 ++
mcs/class/System.ServiceModel/Makefile | 27 +-
.../BinaryMessageEncodingBindingElement.cs | 2 +-
.../System.ServiceModel.Channels/FaultConverter.cs | 2 +-
.../HttpTransportBindingElement.cs | 6 +-
.../HttpsTransportBindingElement.cs | 4 +-
.../MessageEncodingBindingElement.cs | 2 +-
.../ReliableSessionBindingElement.cs | 2 +-
.../SecurityBindingElement.cs | 20 +-
.../TextMessageEncodingBindingElement.cs | 2 +-
.../TransportBindingElement.cs | 2 +-
.../TransportSecurityBindingElement.cs | 2 +-
.../ConfigUtil.cs | 6 +
.../ClientCredentials.cs | 4 +-
.../DataContractSerializerOperationBehavior.cs | 2 +-
.../MessagePartDescription.cs | 2 +-
.../XmlSerializerOperationBehavior.cs | 2 +-
.../MessageLoggingSettings.cs | 2 +-
.../DispatchOperation.cs | 2 +-
.../DispatchRuntime.cs | 4 +-
.../System.ServiceModel/BasicHttpBinding_4_5.cs | 10 +-
.../System.ServiceModel/BasicHttpsBinding.cs | 9 +-
.../System.ServiceModel/ChannelFactory.cs | 4 +-
.../System.ServiceModel/OperationContext.cs | 4 +-
.../SilverlightClientConfigLoader.cs | 3 +-
.../xammac_net_4_5_System.ServiceModel.dll.sources | 64 ++
mcs/class/System.Web.Services/Makefile | 7 +-
.../ExtensionManager.cs | 4 +-
.../ServiceDescriptionImporter.cs | 5 +-
.../System.Web.Services.Protocols/Methods.cs | 2 +-
.../System.Web.Services.Protocols/ServerType.cs | 2 +-
.../System.Web.Services.Protocols/SoapExtension.cs | 2 +-
.../xammac_net_4_5_System.Web.Services.dll.sources | 3 +
.../System.Web/System.Web.Util/HttpEncoder.cs | 4 +-
mcs/class/System.Web/System.Web/HttpUtility.cs | 2 +-
mcs/class/System/System.Diagnostics/Process.cs | 19 +-
mcs/class/System/System.IO/KeventWatcher.cs | 5 +-
mcs/class/System/System.Net/HttpWebRequest.cs | 44 +-
.../System/Test/System.Diagnostics/ProcessTest.cs | 14 +
.../System.IO.Compression/DeflateStreamTest.cs | 35 +
mcs/class/WindowsBase/ZipSharp/NativeUnzip.cs | 12 +-
mcs/class/lib/monolite/Mono.Security.dll | Bin 297984 -> 297984 bytes
mcs/class/lib/monolite/System.Configuration.dll | Bin 128512 -> 128512 bytes
mcs/class/lib/monolite/System.Core.dll | Bin 872960 -> 872960 bytes
mcs/class/lib/monolite/System.Security.dll | Bin 132608 -> 132608 bytes
mcs/class/lib/monolite/System.Xml.dll | Bin 1327616 -> 1327616 bytes
mcs/class/lib/monolite/System.dll | Bin 2056192 -> 2056192 bytes
mcs/class/lib/monolite/basic.exe | Bin 1819648 -> 1819648 bytes
mcs/class/lib/monolite/mscorlib.dll | Bin 3425792 -> 3425792 bytes
mono-core.spec | 2 +-
mono/metadata/class.c | 5 +
mono/metadata/debug-helpers.c | 8 +-
mono/metadata/image.c | 5 +-
mono/metadata/loader.c | 10 +-
mono/mini/Makefile.am | 9 +-
mono/mini/Makefile.am.in | 11 +-
mono/mini/Makefile.in | 11 +-
mono/mini/aot-compiler.c | 59 +-
mono/mini/aot-runtime.c | 23 +-
mono/mini/basic-float.cs | 8 +
mono/mini/cpu-arm.md | 2 +-
mono/mini/emitnunit.pl | 76 ++
mono/mini/jit-icalls.c | 6 +
mono/mini/jit-icalls.h | 2 +
mono/mini/mini-arm.h | 4 +-
mono/mini/mini.c | 1 +
mono/mini/mini.h | 2 +
mono/mini/seq-points.c | 10 +-
mono/mini/version.h | 2 +-
mono/tests/Makefile.am | 2 +-
mono/tests/Makefile.in | 11 +-
mono/tests/test-runner.cs | 469 ++++++++++++
mono/utils/mach-support-amd64.c | 21 +
mono/utils/mach-support-x86.c | 22 +
mono/utils/mono-dl-darwin.c | 11 +
mono/utils/mono-dl-posix.c | 7 +
mono/utils/mono-dl-windows.c | 6 +
mono/utils/mono-dl.h | 2 +-
po/mcs/de.gmo | Bin 5406 -> 5406 bytes
po/mcs/de.po | 2 +-
po/mcs/es.gmo | Bin 16329 -> 16329 bytes
po/mcs/es.po | 2 +-
po/mcs/ja.gmo | Bin 20863 -> 20863 bytes
po/mcs/ja.po | 2 +-
po/mcs/mcs.pot | 4 +-
po/mcs/pt_BR.gmo | Bin 73398 -> 73398 bytes
po/mcs/pt_BR.po | 2 +-
runtime/Makefile.am | 2 +-
runtime/Makefile.in | 2 +-
support/zlib-helper.c | 4 +-
winconfig.h | 2 +-
156 files changed, 4447 insertions(+), 331 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/mono.git
More information about the Pkg-mono-svn-commits
mailing list