Imported Upstream version 5.10.0.97

Former-commit-id: 342b95328bb2df3d11df4dc7b0c4bfd8ea99763a
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-02-08 19:41:13 +00:00
parent 06a4bb97d8
commit 2f56126bcb
60 changed files with 300 additions and 42 deletions

View File

@ -1 +1 @@
1d308ffd3ebdc0530200bb4b02b177970f9b82b7
2f9aab488d9693102bd839af379a13a78a4ae23d

View File

@ -1 +1 @@
29087718843a824dda1ded1bed2a03d021775679
1c9f6eaaaa26d36b69f66c399686242efa8fd7d6

View File

@ -11,6 +11,8 @@ all:
$(MAKE) -C v4.7
$(MAKE) -C v4.7.1
$(MAKE) -C mono
$(MAKE) -C build/monotouch clean
$(MAKE) -C build/monodroid clean
clean:
$(MAKE) -C v2.0 clean
@ -25,5 +27,7 @@ clean:
$(MAKE) -C v4.7 clean
$(MAKE) -C v4.7.1 clean
$(MAKE) -C mono clean
$(MAKE) -C build/monotouch clean
$(MAKE) -C build/monodroid clean
.PHONY: all clean

View File

@ -0,0 +1,48 @@
PROFILE := monodroid
SOURCEDIR := ../../src/$(PROFILE)/
CSC ?= csc
CSC_COMMON_ARGS := -nologo -noconfig -optimize -nostdlib -unsafe -deterministic -publicsign -debug- -target:library -nowarn:612,618,809
Q_CSC = $(if $(V),,@echo "CSC [$(PROFILE)] $(1)";)
ASSEMBLIES := mscorlib System System.Xml System.Numerics System.Core System.Net.Http
ASSEMBLIES += bare/System bare/System.Xml
# generated with (and then slightly tweaked):
# for i in *.dll; do ikdasm --assemblyref $i | grep Name= | sed 's/.*Name=//g' | sed -e $'s/$/\\\n/g' | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/ /g' -e "s/^/${i%.*}_REFS := /"; done
System.Core_REFS := mscorlib System
System.Net.Http_REFS := mscorlib System
System.Numerics_REFS := mscorlib
System_REFS := mscorlib bare/System.Xml
System.Xml_REFS := mscorlib System
bare/System_REFS := mscorlib
bare/System.Xml_REFS := mscorlib bare/System
mscorlib_CSC_ARGS := -runtimemetadataversion:v4.0.30319
ECMA_KEY := ../../../mono/mcs/class/ecma.pub # Public Key Token: b77a5c561934e089
ECMA_KEY_ASSEMBLIES := System.Core System.Net.Http System.Numerics System.Xml System mscorlib \
bare/System bare/System.Xml
all: $(addsuffix .dll, $(ASSEMBLIES))
clean:
rm -f *.dll
rm -f bare/*.dll
define KEYFILE_TEMPLATE
$(1)_KEYFILE := $(2)
endef
define ASSEMBLY_TEMPLATE
$(1).dll: $(addprefix $(SOURCEDIR),$(subst bare/,,$(1)).cs) $(wildcard $(SOURCEDIR)$(1).extra.cs) $(addsuffix .dll, $($(1)_REFS)) $($(1)_KEYFILE)
@mkdir -p bare/
$(Q_CSC) $(CSC) -out:$(1).dll $(CSC_COMMON_ARGS) -keyfile:$($(1)_KEYFILE) $($(1)_CSC_ARGS) $(addprefix -r:, $(addsuffix .dll, $($(1)_REFS))) $(wildcard $(SOURCEDIR)$(1).extra.cs) $$<
endef
$(foreach asm, $(ECMA_KEY_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(ECMA_KEY))))
$(foreach asm, $(ASSEMBLIES), $(eval $(call ASSEMBLY_TEMPLATE,$(asm))))

View File

@ -1 +1 @@
b7d5412e62d6c806925f45ce5333cfc86dd77d86
9e6dab74bb4e7f114920f63c92ca9c8882a98bc9

View File

@ -0,0 +1 @@
fda0b23237512ee638ff7f71d934b0c6ecc2ca4e

View File

@ -1 +1 @@
e0ad6056d5db3df5d135a154b1b4008b6e6157b9
ab4c9433b3b63fe16e478cc37a18ea453bc19ff1

View File

@ -1 +1 @@
aee20813f648653163f86ec38e8c8b07ab1e55bb
477b92f02d4eed63e750f3a1300f658f6d35cd73

View File

@ -0,0 +1,48 @@
PROFILE := monotouch
SOURCEDIR := ../../src/$(PROFILE)/
CSC ?= csc
CSC_COMMON_ARGS := -nologo -noconfig -optimize -nostdlib -unsafe -deterministic -publicsign -debug- -target:library -nowarn:612,618,809
Q_CSC = $(if $(V),,@echo "CSC [$(PROFILE)] $(1)";)
ASSEMBLIES := mscorlib System System.Xml System.Numerics System.Core System.Net.Http
ASSEMBLIES += bare/System bare/System.Xml
# generated with (and then slightly tweaked):
# for i in *.dll; do ikdasm --assemblyref $i | grep Name= | sed 's/.*Name=//g' | sed -e $'s/$/\\\n/g' | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/ /g' -e "s/^/${i%.*}_REFS := /"; done
System.Core_REFS := mscorlib System
System.Net.Http_REFS := mscorlib System
System.Numerics_REFS := mscorlib
System_REFS := mscorlib bare/System.Xml
System.Xml_REFS := mscorlib System
bare/System_REFS := mscorlib
bare/System.Xml_REFS := mscorlib bare/System
mscorlib_CSC_ARGS := -runtimemetadataversion:v4.0.30319
ECMA_KEY := ../../../mono/mcs/class/ecma.pub # Public Key Token: b77a5c561934e089
ECMA_KEY_ASSEMBLIES := System.Core System.Net.Http System.Numerics System.Xml System mscorlib \
bare/System bare/System.Xml
all: $(addsuffix .dll, $(ASSEMBLIES))
clean:
rm -f *.dll
rm -f bare/*.dll
define KEYFILE_TEMPLATE
$(1)_KEYFILE := $(2)
endef
define ASSEMBLY_TEMPLATE
$(1).dll: $(addprefix $(SOURCEDIR),$(subst bare/,,$(1)).cs) $(wildcard $(SOURCEDIR)$(1).extra.cs) $(addsuffix .dll, $($(1)_REFS)) $($(1)_KEYFILE)
@mkdir -p bare/
$(Q_CSC) $(CSC) -out:$(1).dll $(CSC_COMMON_ARGS) -keyfile:$($(1)_KEYFILE) $($(1)_CSC_ARGS) $(addprefix -r:, $(addsuffix .dll, $($(1)_REFS))) $(wildcard $(SOURCEDIR)$(1).extra.cs) $$<
endef
$(foreach asm, $(ECMA_KEY_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(ECMA_KEY))))
$(foreach asm, $(ASSEMBLIES), $(eval $(call ASSEMBLY_TEMPLATE,$(asm))))

View File

@ -1 +1 @@
ccbd12b051399f2f8e07bd15fef473c0e2479e5d
017028776b0688971391ac5e1e75f5b90cbc3d6b

View File

@ -0,0 +1 @@
fda0b23237512ee638ff7f71d934b0c6ecc2ca4e

View File

@ -1 +1 @@
fc992f59d8a96ed747a04e484fe6a08cc23b8f2b
c10bd54a5cd051a2a47e5599bb382bf9db02da79

View File

@ -1 +1 @@
68b2f6d06b515d8cb9e48c7470402595924d35cf
477b92f02d4eed63e750f3a1300f658f6d35cd73

View File

@ -0,0 +1 @@
18fd42f83e863e9a7bf87ab8602ee718cce6066a

View File

@ -1 +1 @@
6276c46020f5d881970a04b436c4d2f8285baf9c
e52de27d8006a7d4bc6aae6c29fac35a4c0cd96e

View File

@ -0,0 +1 @@
18fd42f83e863e9a7bf87ab8602ee718cce6066a

View File

@ -1 +1 @@
782919ed52352fcfea0615489852913a2cfde8fd
c8312281b9f4eec2b32c0586b5c75058f1c83536

View File

@ -267,6 +267,7 @@ System.Web_CSC_ARGS := -d:SERVICES_DEP
ECMA_KEY := ../../../mcs/class/ecma.pub # Public Key Token: b77a5c561934e089
WINFX_KEY := ../../../mcs/class/winfx.pub # Public Key Token: 31bf3856ad364e35
MSFINAL_KEY := ../../../mcs/class/msfinal.pub # Public Key Token: b03f5f7f11d50a3a
OPEN_KEY := ../../../mcs/class/Open.snk # Public Key Token: cc7b13ffcd2ddd51
ECMA_KEY_ASSEMBLIES := System.ComponentModel.Composition System.Core System.Data.DataSetExtensions \
System.Data.Entity System.Data.Linq System.Data.OracleClient System.Data.Services.Client System.Data.Services \
@ -290,6 +291,11 @@ MSFINAL_KEY_ASSEMBLIES := Accessibility CustomMarshalers Microsoft.Build.Engine
System.Runtime.Serialization.Formatters.Soap System.Security System.ServiceProcess System.Web.Services \
System.Web System.Web.Mobile System.Web.RegularExpressions System.Windows bare/System.Configuration bare/System.Web
# most Facades have the msfinal key, but some don't
MSFINAL_KEY_ASSEMBLIES += $(filter-out Facades/netstandard Facades/System.ValueTuple Facades/System.IO.Compression.ZipFile, $(FACADE_ASSEMBLIES))
OPEN_KEY_ASSEMBLIES := Facades/netstandard Facades/System.ValueTuple
ECMA_KEY_ASSEMBLIES += Facades/System.IO.Compression.ZipFile
all: $(addsuffix .dll, $(ASSEMBLIES))
clean:
@ -311,6 +317,6 @@ endef
$(foreach asm, $(ECMA_KEY_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(ECMA_KEY))))
$(foreach asm, $(WINFX_KEY_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(WINFX_KEY))))
$(foreach asm, $(MSFINAL_KEY_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(MSFINAL_KEY))))
$(foreach asm, $(FACADE_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(MSFINAL_KEY))))
$(foreach asm, $(OPEN_KEY_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(OPEN_KEY))))
$(foreach asm, $(ASSEMBLIES), $(eval $(call ASSEMBLY_TEMPLATE,$(asm))))

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.10.0.94";
public const string MonoVersion = "5.10.0.97";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -4,7 +4,8 @@
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeDeleteContext.cs
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeFreeCredentials.cs
../../../external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
corefx/Interop.NetSecurityNative.cs
#../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs
../../../external/corefx/src/Common/src/Interop/Unix/Interop.Libraries.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs

View File

@ -0,0 +1,147 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Text;
using Microsoft.Win32.SafeHandles;
// stubs for external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
// needed for https://github.com/mono/mono/issues/6766
// or can be implemented via pal_gssapi (see https://github.com/mono/mono/pull/6806)
static partial class Interop
{
static partial class NetSecurityNative
{
internal static void ReleaseGssBuffer (
IntPtr bufferPtr,
UInt64 length) => throw new NotSupportedException ();
internal static Status DisplayMinorStatus (
out Status minorStatus,
Status statusValue,
ref GssBuffer buffer) => throw new NotSupportedException ();
internal static Status DisplayMajorStatus (
out Status minorStatus,
Status statusValue,
ref GssBuffer buffer) => throw new NotSupportedException ();
internal static Status ImportUserName (
out Status minorStatus,
string inputName,
int inputNameByteCount,
out SafeGssNameHandle outputName) => throw new NotSupportedException ();
internal static Status ImportPrincipalName (
out Status minorStatus,
string inputName,
int inputNameByteCount,
out SafeGssNameHandle outputName) => throw new NotSupportedException ();
internal static Status ReleaseName (
out Status minorStatus,
ref IntPtr inputName) => throw new NotSupportedException ();
internal static Status InitiateCredSpNego (
out Status minorStatus,
SafeGssNameHandle desiredName,
out SafeGssCredHandle outputCredHandle) => throw new NotSupportedException ();
internal static Status InitiateCredWithPassword (
out Status minorStatus,
bool isNtlm,
SafeGssNameHandle desiredName,
string password,
int passwordLen,
out SafeGssCredHandle outputCredHandle) => throw new NotSupportedException ();
internal static Status ReleaseCred (
out Status minorStatus,
ref IntPtr credHandle) => throw new NotSupportedException ();
internal static Status InitSecContext (
out Status minorStatus,
SafeGssCredHandle initiatorCredHandle,
ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
SafeGssNameHandle targetName,
uint reqFlags,
byte[] inputBytes,
int inputLength,
ref GssBuffer token,
out uint retFlags,
out int isNtlmUsed) => throw new NotSupportedException ();
internal static Status AcceptSecContext (
out Status minorStatus,
ref SafeGssContextHandle acceptContextHandle,
byte[] inputBytes,
int inputLength,
ref GssBuffer token) => throw new NotSupportedException ();
internal static Status DeleteSecContext (
out Status minorStatus,
ref IntPtr contextHandle) => throw new NotSupportedException ();
static Status Wrap(
out Status minorStatus,
SafeGssContextHandle contextHandle,
bool isEncrypt,
byte[] inputBytes,
int offset,
int count,
ref GssBuffer outBuffer) => throw new NotSupportedException ();
static Status Unwrap (
out Status minorStatus,
SafeGssContextHandle contextHandle,
byte[] inputBytes,
int offset,
int count,
ref GssBuffer outBuffer) => throw new NotSupportedException ();
internal static Status WrapBuffer (
out Status minorStatus,
SafeGssContextHandle contextHandle,
bool isEncrypt,
byte[] inputBytes,
int offset,
int count,
ref GssBuffer outBuffer) => throw new NotSupportedException ();
internal static Status UnwrapBuffer (
out Status minorStatus,
SafeGssContextHandle contextHandle,
byte[] inputBytes,
int offset,
int count,
ref GssBuffer outBuffer) => throw new NotSupportedException ();
internal enum Status : uint
{
GSS_S_COMPLETE = 0,
GSS_S_CONTINUE_NEEDED = 1
}
[Flags]
internal enum GssFlags : uint
{
GSS_C_DELEG_FLAG = 0x1,
GSS_C_MUTUAL_FLAG = 0x2,
GSS_C_REPLAY_FLAG = 0x4,
GSS_C_SEQUENCE_FLAG = 0x8,
GSS_C_CONF_FLAG = 0x10,
GSS_C_INTEG_FLAG = 0x20,
GSS_C_ANON_FLAG = 0x40,
GSS_C_PROT_READY_FLAG = 0x80,
GSS_C_TRANS_FLAG = 0x100,
GSS_C_DCE_STYLE = 0x1000,
GSS_C_IDENTIFY_FLAG = 0x2000,
GSS_C_EXTENDED_ERROR_FLAG = 0x4000,
GSS_C_DELEG_POLICY_FLAG = 0x8000
}
}
}

View File

@ -124,7 +124,7 @@ namespace MonoTests.System
} catch (DllNotFoundException e) {
return;
}
#if !MONOTOUCH && !XAMMAC
#if !MONOTOUCH && !XAMMAC && !XAMMAC_4_5
// this assumption is incorrect for iOS, tvO, watchOS and OSX
Assert.IsTrue (TimeZoneInfo.Local.Id != "Local", "Local timezone id should not be \"Local\"");
#endif

View File

@ -1 +1 @@
e117a95f92777b26fd2d1298fbce8d3d80e7b11d
22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb

View File

@ -1 +1 @@
88276368473e9573399ca3df2baee284f1215f68
aeaf953be4227f3fa4aed27009a3c61cce142e08

View File

@ -1 +1 @@
ac4327db48f5eb59dbf26f72caa5710e179675cb
521445c1f364c498c2a4a278187fea80c0bc92b7

View File

@ -1 +1 @@
91cac790950b1627448157528f3f8949946c90a0
91d0de0de103bc0ddf25a470b305072cce7006dc

View File

@ -1 +1 @@
4891bd2b96920ca353f0ae80e626100da295715c
4642459db67e852d384e2b69d3bea4ef8137e408

View File

@ -1 +1 @@
956a59b4433bd96d75836cbd1bbac8396bec5050
ac921af4bce9163df2f1a3bd36362db9c48a1003

View File

@ -1 +1 @@
1a7558b1fb4a467c985ec6e856be5afc1a0eb535
befa7b6561e99234f70a32950f98512a4d9c29c8

View File

@ -1 +1 @@
e117a95f92777b26fd2d1298fbce8d3d80e7b11d
22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb

View File

@ -1 +1 @@
88276368473e9573399ca3df2baee284f1215f68
aeaf953be4227f3fa4aed27009a3c61cce142e08

View File

@ -1 +1 @@
ac4327db48f5eb59dbf26f72caa5710e179675cb
521445c1f364c498c2a4a278187fea80c0bc92b7

View File

@ -1 +1 @@
91cac790950b1627448157528f3f8949946c90a0
91d0de0de103bc0ddf25a470b305072cce7006dc

View File

@ -1 +1 @@
4891bd2b96920ca353f0ae80e626100da295715c
4642459db67e852d384e2b69d3bea4ef8137e408

View File

@ -1 +1 @@
956a59b4433bd96d75836cbd1bbac8396bec5050
ac921af4bce9163df2f1a3bd36362db9c48a1003

View File

@ -1 +1 @@
1a7558b1fb4a467c985ec6e856be5afc1a0eb535
befa7b6561e99234f70a32950f98512a4d9c29c8

View File

@ -1 +1 @@
e117a95f92777b26fd2d1298fbce8d3d80e7b11d
22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb

View File

@ -1 +1 @@
88276368473e9573399ca3df2baee284f1215f68
aeaf953be4227f3fa4aed27009a3c61cce142e08

View File

@ -1 +1 @@
ac4327db48f5eb59dbf26f72caa5710e179675cb
521445c1f364c498c2a4a278187fea80c0bc92b7

View File

@ -1 +1 @@
91cac790950b1627448157528f3f8949946c90a0
91d0de0de103bc0ddf25a470b305072cce7006dc

View File

@ -1 +1 @@
4891bd2b96920ca353f0ae80e626100da295715c
4642459db67e852d384e2b69d3bea4ef8137e408

View File

@ -1 +1 @@
956a59b4433bd96d75836cbd1bbac8396bec5050
ac921af4bce9163df2f1a3bd36362db9c48a1003

View File

@ -1 +1 @@
1a7558b1fb4a467c985ec6e856be5afc1a0eb535
befa7b6561e99234f70a32950f98512a4d9c29c8

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/1420478"
#define FULL_VERSION "explicit/f5e8783"

Binary file not shown.

View File

@ -1 +1 @@
20d450e83a2ffd5481e366ffd8408e3099b8d049
e66b326eae1afe9d2ee9446be255281b998c4bf1

Binary file not shown.

View File

@ -1 +1 @@
71daebff0ad6fb1c19c7af42781de25ef441d88d
9b3caa26926933e058493040b539fba2bf962ecc

Binary file not shown.

View File

@ -1 +1 @@
d9661873bd8a29a6d60edd4d3ffaf75e19faf615
6aab38cf25b4aa3a99cb06f8325c44de73e07d3b

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.94\n"
"Project-Id-Version: mono 5.10.0.97\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-02-07 19:01+0000\n"
"POT-Creation-Date: 2018-02-08 18:58+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"

Binary file not shown.

View File

@ -1 +1 @@
f3c367901deaecb753930f0bb6b856a910eaec7d
f7015989de1c8fafcbf9757eeda7e4ed9a75bbb0