You've already forked linux-packaging-mono
Imported Upstream version 6.4.0.137
Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
parent
e9207cf623
commit
ef583813eb
@@ -33,6 +33,7 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.IComponent))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.IContainer))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.ISite))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.ISupportInitialize))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.ImmutableObjectAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.InitializationEventAttribute))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.LocalizableAttribute))]
|
||||
|
||||
@@ -76,6 +76,8 @@
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.UInt16Converter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.UInt32Converter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.UInt64Converter))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ComponentModel.Container))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.UriTypeConverter))]
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ LIBRARY = System.Reflection.DispatchProxy.dll
|
||||
|
||||
KEYFILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_REFS = System System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
../../../build/common/MonoTODOAttribute.cs
|
||||
AssemblyInfo.cs
|
||||
System.Reflection/DispatchProxy.cs
|
||||
TypeForwarders.cs
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
//
|
||||
// DispatchProxy.cs
|
||||
//
|
||||
// Author:
|
||||
// Alexander Köplinger (alexander.koeplinger@xamarin.com)
|
||||
//
|
||||
// (C) 2016 Xamarin, Inc.
|
||||
//
|
||||
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
|
||||
namespace System.Reflection
|
||||
{
|
||||
public abstract class DispatchProxy
|
||||
{
|
||||
[MonoTODO]
|
||||
protected DispatchProxy()
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public static T Create<T, TProxy> () where TProxy : DispatchProxy
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
protected abstract object Invoke (MethodInfo targetMethod, object[] args);
|
||||
}
|
||||
}
|
||||
@@ -1,36 +1,23 @@
|
||||
#region MIT license
|
||||
//
|
||||
// MIT license
|
||||
//
|
||||
// Copyright (c) 2007-2008 Jiri Moudry, Pascal Craponne
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
#endregion
|
||||
|
||||
namespace System.Data.Linq
|
||||
{
|
||||
public enum ChangeAction
|
||||
{
|
||||
None,
|
||||
Delete,
|
||||
Insert,
|
||||
Update
|
||||
}
|
||||
}
|
||||
//
|
||||
// Copyright (c) 2019 Microsoft
|
||||
//
|
||||
// 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.Reflection.DispatchProxy))]
|
||||
@@ -1,6 +1,2 @@
|
||||
TypeForwarders.cs
|
||||
AssemblyInfo.cs
|
||||
|
||||
corefx/SR.cs
|
||||
../../../../external/corefx/src/System.Reflection.TypeExtensions/src/System/Reflection/Requires.cs
|
||||
../../../../external/corefx/src/System.Reflection.TypeExtensions/src/System/Reflection/TypeExtensions.cs
|
||||
|
||||
@@ -20,5 +20,11 @@
|
||||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.AssemblyExtensions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.BindingFlags))]
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.EventInfoExtensions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MemberInfoExtensions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.MethodInfoExtensions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.ModuleExtensions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.PropertyInfoExtensions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.TypeExtensions))]
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
//
|
||||
// This file was generated by resx2sr tool
|
||||
//
|
||||
|
||||
partial class SR
|
||||
{
|
||||
public const string NoMetadataTokenAvailable = "There is no metadata token available for the given member.";
|
||||
}
|
||||
@@ -30,6 +30,6 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyCompany ("Mono development team")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("(c) Various Mono authors")]
|
||||
[assembly: AssemblyVersion ("2.0.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("2.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("2.0.0.0")]
|
||||
[assembly: AssemblyVersion ("2.1.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("2.1.0.0")]
|
||||
[assembly: AssemblyFileVersion ("2.1.0.0")]
|
||||
|
||||
@@ -1 +1 @@
|
||||
8533f7d365c30d5e5f6b42b717fafbdba994aad4
|
||||
6682277b38d4af097e1f315ef0a7eaf9080a6481
|
||||
@@ -1 +1 @@
|
||||
59b3dcecc32112251e24265fd95f9355b25a037d
|
||||
8342a6a8454aecca51da2612b8d0ab24295206bd
|
||||
@@ -81,6 +81,9 @@ wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
testing_aot_full_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
|
||||
testing_aot_full_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
testing_aot_full_interp_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
|
||||
testing_aot_full_interp_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
testing_aot_hybrid_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
|
||||
testing_aot_hybrid_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
|
||||
@@ -187,8 +187,10 @@ namespace I18N.CJK
|
||||
startIgnore = m.GEnd + 1;
|
||||
}
|
||||
}
|
||||
// return ToUcsRaw ((int) (linear - gbxBase));
|
||||
throw new SystemException (String.Format ("GB18030 INTERNAL ERROR (should not happen): GBX {0:x02} {1:x02} {2:x02} {3:x02}", b1, b2, b3, b4));
|
||||
|
||||
// All 4 bytes look valid but we didn't find any appropriate range.
|
||||
// So just return negative result for it.
|
||||
return -4;
|
||||
}
|
||||
|
||||
public static long FromUCSSurrogate (int cp)
|
||||
@@ -212,7 +214,9 @@ namespace I18N.CJK
|
||||
startIgnore = m.UEnd + 1;
|
||||
}
|
||||
}
|
||||
throw new SystemException (String.Format ("GB18030 INTERNAL ERROR (should not happen): UCS {0:x06}", cp));
|
||||
|
||||
// Consider it as invalid character
|
||||
return -1;
|
||||
}
|
||||
|
||||
static long FromGBXRaw (
|
||||
|
||||
@@ -597,5 +597,13 @@ namespace MonoTests.I18N.CJK
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
[Test]
|
||||
public void Bug13144 ()
|
||||
{
|
||||
var encoding = Encoding.GetEncoding ("GB18030");
|
||||
var str = encoding.GetString (new byte[] { 0x84, 0x32, 0x81, 0x30 });
|
||||
Assert.AreEqual ("?", str);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,13 +111,18 @@ monodroid_dirs_parallel := \
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
Mono.Btls.Interface \
|
||||
Mono.Posix \
|
||||
Mono.CSharp
|
||||
Mono.CSharp \
|
||||
Mono.Debugger.Soft \
|
||||
Mono.Runtime.Tests
|
||||
|
||||
monodroid_tools_dirs_parallel := \
|
||||
Mono.Cecil \
|
||||
Mono.Cecil.Mdb \
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
ICSharpCode.SharpZipLib \
|
||||
monodoc
|
||||
monodoc \
|
||||
Mono.Debugger.Soft \
|
||||
Mono.Profiler.Log
|
||||
|
||||
monotouch_tools_dirs_parallel := \
|
||||
Mono.Cecil \
|
||||
|
||||
@@ -41,7 +41,7 @@ endif
|
||||
EXTRA_DISTFILES = $(filter-out Test/resources/test.dll, $(TEST_RESOURCE_FILES))
|
||||
|
||||
Test/resources/test.dll: Test/resources/test.cs
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -target:library /out:$@ $<
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)mscorlib.dll -target:library /out:$@ $<
|
||||
|
||||
clean-test-resources:
|
||||
rm -f Test/resources/test.dll
|
||||
|
||||
@@ -29,6 +29,8 @@ using System;
|
||||
using System.IO;
|
||||
using System.Xml;
|
||||
using System.Linq;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.Versioning;
|
||||
|
||||
namespace Microsoft.Build.Utilities
|
||||
{
|
||||
@@ -270,5 +272,26 @@ namespace Microsoft.Build.Utilities
|
||||
return Path.Combine (lib_mono_dir, "xbuild", toolsVersion, "bin");
|
||||
}
|
||||
#endif
|
||||
|
||||
// These have no meaning in mono except to exist, so return empty lists for each.
|
||||
public static IList<string> GetPathToReferenceAssemblies(string targetFrameworkIdentifier, string targetFrameworkVersion, string targetFrameworkProfile)
|
||||
{
|
||||
return new List<string>();
|
||||
}
|
||||
|
||||
public static IList<string> GetPathToReferenceAssemblies(FrameworkName frameworkName)
|
||||
{
|
||||
return new List<string>();
|
||||
}
|
||||
|
||||
public static IList<string> GetPathToReferenceAssemblies(string targetFrameworkRootPath, FrameworkName frameworkName)
|
||||
{
|
||||
return new List<string>();
|
||||
}
|
||||
|
||||
public static IList<string> GetSupportedTargetFrameworks()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,6 +177,7 @@ namespace MonoTests.EvaluatorTest
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category("AndroidSdksNotWorking")]
|
||||
public void DynamicStatement ()
|
||||
{
|
||||
Evaluator.Run ("dynamic d = 1;");
|
||||
|
||||
@@ -14,7 +14,7 @@ TARGET_NET_REFERENCE = $(BOOTSTRAP_BIN_PROFILE)
|
||||
LIBRARY_USE_INTERMEDIATE_FILE = 1
|
||||
endif
|
||||
|
||||
LIB_MCS_FLAGS = -d:NET_4_0
|
||||
LIB_MCS_FLAGS = -d:NET_4_0 -unsafe
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user