diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 72d9c1c631..081708186d 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -1d308ffd3ebdc0530200bb4b02b177970f9b82b7 \ No newline at end of file +2f9aab488d9693102bd839af379a13a78a4ae23d \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 50bb48e5c0..de83ab4c10 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -29087718843a824dda1ded1bed2a03d021775679 \ No newline at end of file +1c9f6eaaaa26d36b69f66c399686242efa8fd7d6 \ No newline at end of file diff --git a/external/binary-reference-assemblies/Makefile b/external/binary-reference-assemblies/Makefile index e54e8b70ff..e770c98833 100644 --- a/external/binary-reference-assemblies/Makefile +++ b/external/binary-reference-assemblies/Makefile @@ -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 diff --git a/external/binary-reference-assemblies/build/monodroid/Makefile b/external/binary-reference-assemblies/build/monodroid/Makefile new file mode 100644 index 0000000000..ec756d9c7a --- /dev/null +++ b/external/binary-reference-assemblies/build/monodroid/Makefile @@ -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)))) diff --git a/external/binary-reference-assemblies/build/monodroid/System.Core.dll.REMOVED.git-id b/external/binary-reference-assemblies/build/monodroid/System.Core.dll.REMOVED.git-id index c097a5403f..f5110c38d1 100644 --- a/external/binary-reference-assemblies/build/monodroid/System.Core.dll.REMOVED.git-id +++ b/external/binary-reference-assemblies/build/monodroid/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -b7d5412e62d6c806925f45ce5333cfc86dd77d86 \ No newline at end of file +9e6dab74bb4e7f114920f63c92ca9c8882a98bc9 \ No newline at end of file diff --git a/external/binary-reference-assemblies/build/monodroid/System.Net.Http.dll b/external/binary-reference-assemblies/build/monodroid/System.Net.Http.dll index 07ea09b0f4..45009f8e5c 100644 Binary files a/external/binary-reference-assemblies/build/monodroid/System.Net.Http.dll and b/external/binary-reference-assemblies/build/monodroid/System.Net.Http.dll differ diff --git a/external/binary-reference-assemblies/build/monodroid/System.Numerics.dll b/external/binary-reference-assemblies/build/monodroid/System.Numerics.dll index b681a5d013..11d95ed27e 100644 Binary files a/external/binary-reference-assemblies/build/monodroid/System.Numerics.dll and b/external/binary-reference-assemblies/build/monodroid/System.Numerics.dll differ diff --git a/external/binary-reference-assemblies/build/monodroid/System.Xml.dll.REMOVED.git-id b/external/binary-reference-assemblies/build/monodroid/System.Xml.dll.REMOVED.git-id new file mode 100644 index 0000000000..6acbcbe69e --- /dev/null +++ b/external/binary-reference-assemblies/build/monodroid/System.Xml.dll.REMOVED.git-id @@ -0,0 +1 @@ +fda0b23237512ee638ff7f71d934b0c6ecc2ca4e \ No newline at end of file diff --git a/external/binary-reference-assemblies/build/monodroid/System.dll.REMOVED.git-id b/external/binary-reference-assemblies/build/monodroid/System.dll.REMOVED.git-id index aa150aa282..70e4d31e34 100644 --- a/external/binary-reference-assemblies/build/monodroid/System.dll.REMOVED.git-id +++ b/external/binary-reference-assemblies/build/monodroid/System.dll.REMOVED.git-id @@ -1 +1 @@ -e0ad6056d5db3df5d135a154b1b4008b6e6157b9 \ No newline at end of file +ab4c9433b3b63fe16e478cc37a18ea453bc19ff1 \ No newline at end of file diff --git a/external/binary-reference-assemblies/build/monodroid/mscorlib.dll.REMOVED.git-id b/external/binary-reference-assemblies/build/monodroid/mscorlib.dll.REMOVED.git-id index 8275521c4d..64ef4bdc44 100644 --- a/external/binary-reference-assemblies/build/monodroid/mscorlib.dll.REMOVED.git-id +++ b/external/binary-reference-assemblies/build/monodroid/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -aee20813f648653163f86ec38e8c8b07ab1e55bb \ No newline at end of file +477b92f02d4eed63e750f3a1300f658f6d35cd73 \ No newline at end of file diff --git a/external/binary-reference-assemblies/build/monotouch/Makefile b/external/binary-reference-assemblies/build/monotouch/Makefile new file mode 100644 index 0000000000..2966aace3a --- /dev/null +++ b/external/binary-reference-assemblies/build/monotouch/Makefile @@ -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)))) diff --git a/external/binary-reference-assemblies/build/monotouch/System.Core.dll.REMOVED.git-id b/external/binary-reference-assemblies/build/monotouch/System.Core.dll.REMOVED.git-id index fd4353694e..c166785b55 100644 --- a/external/binary-reference-assemblies/build/monotouch/System.Core.dll.REMOVED.git-id +++ b/external/binary-reference-assemblies/build/monotouch/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -ccbd12b051399f2f8e07bd15fef473c0e2479e5d \ No newline at end of file +017028776b0688971391ac5e1e75f5b90cbc3d6b \ No newline at end of file diff --git a/external/binary-reference-assemblies/build/monotouch/System.Net.Http.dll b/external/binary-reference-assemblies/build/monotouch/System.Net.Http.dll index 07ea09b0f4..45009f8e5c 100644 Binary files a/external/binary-reference-assemblies/build/monotouch/System.Net.Http.dll and b/external/binary-reference-assemblies/build/monotouch/System.Net.Http.dll differ diff --git a/external/binary-reference-assemblies/build/monotouch/System.Numerics.dll b/external/binary-reference-assemblies/build/monotouch/System.Numerics.dll index b681a5d013..11d95ed27e 100644 Binary files a/external/binary-reference-assemblies/build/monotouch/System.Numerics.dll and b/external/binary-reference-assemblies/build/monotouch/System.Numerics.dll differ diff --git a/external/binary-reference-assemblies/build/monotouch/System.Xml.dll.REMOVED.git-id b/external/binary-reference-assemblies/build/monotouch/System.Xml.dll.REMOVED.git-id new file mode 100644 index 0000000000..6acbcbe69e --- /dev/null +++ b/external/binary-reference-assemblies/build/monotouch/System.Xml.dll.REMOVED.git-id @@ -0,0 +1 @@ +fda0b23237512ee638ff7f71d934b0c6ecc2ca4e \ No newline at end of file diff --git a/external/binary-reference-assemblies/build/monotouch/System.dll.REMOVED.git-id b/external/binary-reference-assemblies/build/monotouch/System.dll.REMOVED.git-id index 13a35bb7d5..cb814ff5c6 100644 --- a/external/binary-reference-assemblies/build/monotouch/System.dll.REMOVED.git-id +++ b/external/binary-reference-assemblies/build/monotouch/System.dll.REMOVED.git-id @@ -1 +1 @@ -fc992f59d8a96ed747a04e484fe6a08cc23b8f2b \ No newline at end of file +c10bd54a5cd051a2a47e5599bb382bf9db02da79 \ No newline at end of file diff --git a/external/binary-reference-assemblies/build/monotouch/mscorlib.dll.REMOVED.git-id b/external/binary-reference-assemblies/build/monotouch/mscorlib.dll.REMOVED.git-id index 9f6a6f3891..64ef4bdc44 100644 --- a/external/binary-reference-assemblies/build/monotouch/mscorlib.dll.REMOVED.git-id +++ b/external/binary-reference-assemblies/build/monotouch/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -68b2f6d06b515d8cb9e48c7470402595924d35cf \ No newline at end of file +477b92f02d4eed63e750f3a1300f658f6d35cd73 \ No newline at end of file diff --git a/external/binary-reference-assemblies/src/monodroid/System.Xml.cs.REMOVED.git-id b/external/binary-reference-assemblies/src/monodroid/System.Xml.cs.REMOVED.git-id new file mode 100644 index 0000000000..d5e7ef0704 --- /dev/null +++ b/external/binary-reference-assemblies/src/monodroid/System.Xml.cs.REMOVED.git-id @@ -0,0 +1 @@ +18fd42f83e863e9a7bf87ab8602ee718cce6066a \ No newline at end of file diff --git a/external/binary-reference-assemblies/src/monodroid/System.cs.REMOVED.git-id b/external/binary-reference-assemblies/src/monodroid/System.cs.REMOVED.git-id index 871c923544..fe04a220c2 100644 --- a/external/binary-reference-assemblies/src/monodroid/System.cs.REMOVED.git-id +++ b/external/binary-reference-assemblies/src/monodroid/System.cs.REMOVED.git-id @@ -1 +1 @@ -6276c46020f5d881970a04b436c4d2f8285baf9c \ No newline at end of file +e52de27d8006a7d4bc6aae6c29fac35a4c0cd96e \ No newline at end of file diff --git a/external/binary-reference-assemblies/src/monotouch/System.Xml.cs.REMOVED.git-id b/external/binary-reference-assemblies/src/monotouch/System.Xml.cs.REMOVED.git-id new file mode 100644 index 0000000000..d5e7ef0704 --- /dev/null +++ b/external/binary-reference-assemblies/src/monotouch/System.Xml.cs.REMOVED.git-id @@ -0,0 +1 @@ +18fd42f83e863e9a7bf87ab8602ee718cce6066a \ No newline at end of file diff --git a/external/binary-reference-assemblies/src/monotouch/System.cs.REMOVED.git-id b/external/binary-reference-assemblies/src/monotouch/System.cs.REMOVED.git-id index eadc6ae9bf..7692f44a4c 100644 --- a/external/binary-reference-assemblies/src/monotouch/System.cs.REMOVED.git-id +++ b/external/binary-reference-assemblies/src/monotouch/System.cs.REMOVED.git-id @@ -1 +1 @@ -782919ed52352fcfea0615489852913a2cfde8fd \ No newline at end of file +c8312281b9f4eec2b32c0586b5c75058f1c83536 \ No newline at end of file diff --git a/external/binary-reference-assemblies/v4.7.1/Facades/System.IO.Compression.ZipFile.dll b/external/binary-reference-assemblies/v4.7.1/Facades/System.IO.Compression.ZipFile.dll index 320c63573b..4eb833f615 100644 Binary files a/external/binary-reference-assemblies/v4.7.1/Facades/System.IO.Compression.ZipFile.dll and b/external/binary-reference-assemblies/v4.7.1/Facades/System.IO.Compression.ZipFile.dll differ diff --git a/external/binary-reference-assemblies/v4.7.1/Facades/System.ValueTuple.dll b/external/binary-reference-assemblies/v4.7.1/Facades/System.ValueTuple.dll index 1f3c3ab659..afd095c51c 100644 Binary files a/external/binary-reference-assemblies/v4.7.1/Facades/System.ValueTuple.dll and b/external/binary-reference-assemblies/v4.7.1/Facades/System.ValueTuple.dll differ diff --git a/external/binary-reference-assemblies/v4.7.1/Facades/netstandard.dll b/external/binary-reference-assemblies/v4.7.1/Facades/netstandard.dll index 293b336228..46384410b0 100644 Binary files a/external/binary-reference-assemblies/v4.7.1/Facades/netstandard.dll and b/external/binary-reference-assemblies/v4.7.1/Facades/netstandard.dll differ diff --git a/external/binary-reference-assemblies/v4.7.1/Makefile b/external/binary-reference-assemblies/v4.7.1/Makefile index 47e22f78af..1ef6753373 100644 --- a/external/binary-reference-assemblies/v4.7.1/Makefile +++ b/external/binary-reference-assemblies/v4.7.1/Makefile @@ -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)))) diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index fddb8c7dd0..1ae8e89d7a 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -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"; diff --git a/mcs/class/System.Data/corefx.unix.sources b/mcs/class/System.Data/corefx.unix.sources index 0bb6229574..71c996f892 100644 --- a/mcs/class/System.Data/corefx.unix.sources +++ b/mcs/class/System.Data/corefx.unix.sources @@ -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 diff --git a/mcs/class/System.Data/corefx/Interop.NetSecurityNative.cs b/mcs/class/System.Data/corefx/Interop.NetSecurityNative.cs new file mode 100644 index 0000000000..4fc99ddf2c --- /dev/null +++ b/mcs/class/System.Data/corefx/Interop.NetSecurityNative.cs @@ -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 + } + } +} diff --git a/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs b/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs index b6384d1116..fbf436cb3b 100644 --- a/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs +++ b/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs @@ -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 diff --git a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id index dc8bbe674e..6461e276ab 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e117a95f92777b26fd2d1298fbce8d3d80e7b11d \ No newline at end of file +22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id index 66cbfe5d60..f0ac12d454 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -88276368473e9573399ca3df2baee284f1215f68 \ No newline at end of file +aeaf953be4227f3fa4aed27009a3c61cce142e08 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id index f04055a349..b5c99c0246 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -ac4327db48f5eb59dbf26f72caa5710e179675cb \ No newline at end of file +521445c1f364c498c2a4a278187fea80c0bc92b7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id index 5df3da0626..820ed90e15 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -91cac790950b1627448157528f3f8949946c90a0 \ No newline at end of file +91d0de0de103bc0ddf25a470b305072cce7006dc \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id index f0bcc12547..62c4755068 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -4891bd2b96920ca353f0ae80e626100da295715c \ No newline at end of file +4642459db67e852d384e2b69d3bea4ef8137e408 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id index 7e8d7468af..1799e95e59 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -956a59b4433bd96d75836cbd1bbac8396bec5050 \ No newline at end of file +ac921af4bce9163df2f1a3bd36362db9c48a1003 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id index 6c9906b124..2098c85e58 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1a7558b1fb4a467c985ec6e856be5afc1a0eb535 \ No newline at end of file +befa7b6561e99234f70a32950f98512a4d9c29c8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id index dc8bbe674e..6461e276ab 100644 --- a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e117a95f92777b26fd2d1298fbce8d3d80e7b11d \ No newline at end of file +22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id index 66cbfe5d60..f0ac12d454 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -88276368473e9573399ca3df2baee284f1215f68 \ No newline at end of file +aeaf953be4227f3fa4aed27009a3c61cce142e08 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id index f04055a349..b5c99c0246 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -ac4327db48f5eb59dbf26f72caa5710e179675cb \ No newline at end of file +521445c1f364c498c2a4a278187fea80c0bc92b7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id index 5df3da0626..820ed90e15 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -91cac790950b1627448157528f3f8949946c90a0 \ No newline at end of file +91d0de0de103bc0ddf25a470b305072cce7006dc \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id index f0bcc12547..62c4755068 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -4891bd2b96920ca353f0ae80e626100da295715c \ No newline at end of file +4642459db67e852d384e2b69d3bea4ef8137e408 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id index 7e8d7468af..1799e95e59 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -956a59b4433bd96d75836cbd1bbac8396bec5050 \ No newline at end of file +ac921af4bce9163df2f1a3bd36362db9c48a1003 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id index 6c9906b124..2098c85e58 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1a7558b1fb4a467c985ec6e856be5afc1a0eb535 \ No newline at end of file +befa7b6561e99234f70a32950f98512a4d9c29c8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id index dc8bbe674e..6461e276ab 100644 --- a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e117a95f92777b26fd2d1298fbce8d3d80e7b11d \ No newline at end of file +22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id index 66cbfe5d60..f0ac12d454 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -88276368473e9573399ca3df2baee284f1215f68 \ No newline at end of file +aeaf953be4227f3fa4aed27009a3c61cce142e08 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id index f04055a349..b5c99c0246 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -ac4327db48f5eb59dbf26f72caa5710e179675cb \ No newline at end of file +521445c1f364c498c2a4a278187fea80c0bc92b7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id index 5df3da0626..820ed90e15 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -91cac790950b1627448157528f3f8949946c90a0 \ No newline at end of file +91d0de0de103bc0ddf25a470b305072cce7006dc \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id index f0bcc12547..62c4755068 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -4891bd2b96920ca353f0ae80e626100da295715c \ No newline at end of file +4642459db67e852d384e2b69d3bea4ef8137e408 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id index 7e8d7468af..1799e95e59 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -956a59b4433bd96d75836cbd1bbac8396bec5050 \ No newline at end of file +ac921af4bce9163df2f1a3bd36362db9c48a1003 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id index 6c9906b124..2098c85e58 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -1a7558b1fb4a467c985ec6e856be5afc1a0eb535 \ No newline at end of file +befa7b6561e99234f70a32950f98512a4d9c29c8 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 95afc4ca6d..5c0f6c91e2 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/1420478" +#define FULL_VERSION "explicit/f5e8783" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 975f6f62a7..5a95934f80 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 69259e39cd..07f713c029 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -20d450e83a2ffd5481e366ffd8408e3099b8d049 \ No newline at end of file +e66b326eae1afe9d2ee9446be255281b998c4bf1 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 51dd29b305..68de6df6c8 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 6cbdd8e2f3..725edc4b2d 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -71daebff0ad6fb1c19c7af42781de25ef441d88d \ No newline at end of file +9b3caa26926933e058493040b539fba2bf962ecc \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 7e5de0f475..d143a1a27c 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 02e0606bc1..f544d3289b 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -d9661873bd8a29a6d60edd4d3ffaf75e19faf615 \ No newline at end of file +6aab38cf25b4aa3a99cb06f8325c44de73e07d3b \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index d8e41fa3ad..3f6a0056df 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -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 \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index d9e52f7dbd..a96b1c3e9e 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 6a68a0d7ce..004c031c7b 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -f3c367901deaecb753930f0bb6b856a910eaec7d \ No newline at end of file +f7015989de1c8fafcbf9757eeda7e4ed9a75bbb0 \ No newline at end of file