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

Imported Upstream version 6.0.0.172

Browse Source 
Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/class/Facades/Makefile
View File

@@ -39,8 +39,8 @@ doc-update-recursive:
System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Numerics.Vectors System.Runtime.Serialization System.Transactions System.Xml \
System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.IO.Compression.FileSystem System.Runtime.InteropServices.RuntimeInformation \
System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression System.IdentityModel \
System.Web.Services:
System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression System.IdentityModel System.Web \
Facades/System.Drawing.Primitives Facades/System.Drawing.Common System.Drawing System.Web.Services:
all-local-aot:

29
mcs/class/Facades/System.Drawing.Primitives/Makefile
View File

@@ -14,33 +14,12 @@ SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
# xammac_net_4_5 and the testing_* profiles are special, they don't build
# System.Drawing.dll or equivalent neither in Mono nor in the XM repo.
# For now we embed the types directly here.
# TODO: find a better solution.
EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hybrid, $(PROFILE))
ifeq ($(PROFILE),monodroid)
# XA implements System.Drawing API inside Mono.Android
API_BIN_REFS := Mono.Android
LIB_REFS += Facades/System.Drawing.Common
else
ifndef EMBEDDED_DRAWING_DEP
# profiles which build a System.Drawing.dll in the repo
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal wasm, $(PROFILE))
ifdef REPO_DRAWING_DEP
ifneq (,$(filter build net_4_x, $(PROFILE)))
# drawing types are inside System.Drawing.dll
LIB_REFS += System.Drawing
else
# When System.Drawing.dll is not built in the Mono repo but in
# the product repo like in the XI case we need to pass in a reference
# to the assembly containing drawing types like Rectangle etc. from there.
# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE.
LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE)
endif
endif
# drawing types are inside System.Drawing.Common.dll
LIB_REFS += Facades/System.Drawing.Common
endif
PLATFORM_DEBUG_FLAGS =

12
mcs/class/Facades/System.Drawing.Primitives/embedded_System.Drawing.Primitives.dll.sources
View File

@@ -1,12 +0,0 @@
AssemblyInfo.cs
../../System.Drawing/System.Drawing/Point.cs
../../System.Drawing/System.Drawing/PointF.cs
../../System.Drawing/System.Drawing/Rectangle.cs
../../System.Drawing/System.Drawing/RectangleF.cs
../../System.Drawing/System.Drawing/Size.cs
../../System.Drawing/System.Drawing/SizeF.cs
../../System.Drawing/System.Drawing/Color.cs
../../System.Drawing/System.Drawing/KnownColor.cs
../../System.Drawing/System.Drawing/KnownColors.cs

1
mcs/class/Facades/System.Drawing.Primitives/testing_aot_full_System.Drawing.Primitives.dll.sources
View File

@@ -1 +0,0 @@
#include embedded_System.Drawing.Primitives.dll.sources

1
mcs/class/Facades/System.Drawing.Primitives/testing_aot_hybrid_System.Drawing.Primitives.dll.sources
View File

@@ -1 +0,0 @@
#include embedded_System.Drawing.Primitives.dll.sources

1
mcs/class/Facades/System.Drawing.Primitives/xammac_net_4_5_System.Drawing.Primitives.dll.sources
View File

@@ -1 +0,0 @@
#include embedded_System.Drawing.Primitives.dll.sources

42
mcs/class/Facades/netstandard/Makefile
View File

@@ -11,12 +11,16 @@ LIBRARY = netstandard.dll
KEYFILE = ../../Open.snk
LIBRARY_SNK = $(KEYFILE)
SIGN_FLAGS = /delaysign /nowarn:1616,1699 /nowarn:618
LIB_REFS = System System.Xml System.Xml.Linq System.Runtime.Serialization System.Core System.Numerics System.Numerics.Vectors System.Net.Http System.Transactions \
System.IO.Compression System.Data System.ComponentModel.Composition System.IO.Compression.FileSystem
SIGN_FLAGS = /delaysign /nowarn:1616,1699,618
LIB_REFS = System System.Xml System.Xml.Linq System.Core System.Numerics System.Net.Http \
System.IO.Compression System.ComponentModel.Composition System.IO.Compression.FileSystem
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
ifneq ($(PROFILE),build)
# for the build profile we include stubs for these types directly in netstandard.dll
LIB_REFS += System.Transactions System.Runtime.Serialization System.Data
ifeq ($(PROFILE),xammac_net_4_5)
LIB_REFS += System.Web.Services
else ifeq (2.1, $(FRAMEWORK_VERSION))
@@ -25,36 +29,14 @@ else
LIB_REFS += System.Web
endif
ifeq ($(PROFILE),monodroid)
# XA implements System.Drawing API inside Mono.Android
API_BIN_REFS := Mono.Android
LIB_REFS += Facades/System.Drawing.Common
else
endif
# profiles which build a System.Drawing.dll in the repo
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal wasm, $(PROFILE))
ifdef REPO_DRAWING_DEP
ifneq (,$(filter build net_4_x, $(PROFILE)))
# drawing types are inside System.Drawing.dll
LIB_REFS += System.Drawing
else
# xammac_net_4_5 and the testing_* profiles are special, they don't build
# System.Drawing.dll or equivalent neither in Mono nor in the XM repo.
# For now we typeforward the drawing types to the System.Drawing.Primitives.dll
# facade where they are embedded.
# TODO: find a better solution.
EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hybrid, $(PROFILE))
ifdef EMBEDDED_DRAWING_DEP
LIB_REFS += Facades/System.Drawing.Primitives
else
# When System.Drawing.dll is not built in the Mono repo but in
# the product repo like in the XI/XA case we need to pass in a reference
# to the assembly containing drawing types like Rectangle etc. from there.
# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE.
LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE)
endif
endif
# drawing types are inside System.Drawing.Common.dll
LIB_REFS += Facades/System.Drawing.Common
endif
PLATFORM_DEBUG_FLAGS =

1
mcs/class/Facades/netstandard/Stubs.build.cs.REMOVED.git-id Normal file
View File

@@ -0,0 +1 @@
8533f7d365c30d5e5f6b42b717fafbdba994aad4

2
mcs/class/Facades/netstandard/TypeForwarders.cs.REMOVED.git-id
View File

@@ -1 +1 @@
dcddd3e6e9324e60f390e4106860c5e02972cb55
59b3dcecc32112251e24265fd95f9355b25a037d

2
mcs/class/Facades/netstandard/build_netstandard.dll.sources Normal file
View File

@@ -0,0 +1,2 @@
#include netstandard.dll.sources
Stubs.build.cs

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

@@ -31,46 +31,33 @@ System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceControll
System.Net.Ping System.Resources.Reader System.Resources.Writer System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp \
System.Runtime.InteropServices.RuntimeInformation System.Xml.XPath.XDocument System.Threading.Overlapped System.Security.SecureString \
System.Diagnostics.StackTrace System.Data.Common System.Globalization.Extensions System.Runtime.Serialization.Xml System.ServiceModel.Primitives \
System.Security.Cryptography.X509Certificates System.Runtime.Serialization.Primitives System.Security.Cryptography.Algorithms
System.Security.Cryptography.X509Certificates System.Runtime.Serialization.Primitives System.Security.Cryptography.Algorithms netstandard System.Drawing.Primitives
# common_SUBDIRS dependencies
common_DEPS_SUBDIRS :=
netstandard_drawing_SUBDIRS = System.Drawing.Common System.Drawing.Primitives netstandard
monotouch_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
monotouch_SUBDIRS = $(common_DEPS_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
monodroid_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
monodroid_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
monodroid_SUBDIRS = $(monotouch_SUBDIRS) $(netstandard_drawing_SUBDIRS)
monodroid_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
# We don't build netstandard/System.Drawing.Primitives on monotouch etc. profiles by default,
# except when EXTERNAL_FACADE_DRAWING_REFERENCE is defined which allows us to build it in Mono CI
# (since the dependent drawing types are normally built in the product repos).
ifdef EXTERNAL_FACADE_DRAWING_REFERENCE
monotouch_SUBDIRS += $(netstandard_drawing_SUBDIRS)
endif
testing_aot_full_SUBDIRS = $(monotouch_SUBDIRS)
testing_aot_full_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Primitives netstandard
net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS)
net_4_x_PARALLEL_SUBDIRS = $(common_SUBDIRS) System.Net.Http.Rtc
basic_PARALLEL_SUBDIRS = System.Runtime System.Reflection System.Collections System.Resources.ResourceManager System.Globalization \
build_PARALLEL_SUBDIRS = System.Runtime System.Reflection System.Collections System.Resources.ResourceManager System.Globalization \
System.Threading.Tasks System.Collections.Concurrent System.Text.Encoding System.IO System.Threading System.Diagnostics.Debug \
System.Linq.Expressions System.Dynamic.Runtime System.Linq System.Threading.Tasks.Parallel System.Xml.ReaderWriter \
System.Diagnostics.Tools System.Reflection.Primitives System.Runtime.Extensions System.Runtime.InteropServices System.Text.Encoding.Extensions \
System.Runtime.Numerics System.Xml.XDocument System.Reflection.Extensions System.IO.FileSystem.Primitives System.IO.FileSystem \
System.Diagnostics.FileVersionInfo System.Security.Cryptography.Primitives System.Security.Cryptography.Algorithms System.ValueTuple \
System.Text.Encoding.CodePages
build_PARALLEL_SUBDIRS = $(basic_PARALLEL_SUBDIRS) System.Text.RegularExpressions System.Diagnostics.Contracts
System.Text.Encoding.CodePages System.Text.RegularExpressions System.Diagnostics.Contracts \
System.Diagnostics.Tracing System.Net.Primitives netstandard
xammac_SUBDIRS = $(monotouch_SUBDIRS)
xammac_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
xammac_net_4_5_SUBDIRS = $(net_4_x_SUBDIRS)
xammac_net_4_5_SUBDIRS = $(net_4_x_SUBDIRS) System.Drawing.Common
xammac_net_4_5_PARALLEL_SUBDIRS = $(net_4_x_PARALLEL_SUBDIRS)
monotouch_watch_SUBDIRS = $(monotouch_SUBDIRS)
@@ -79,17 +66,23 @@ monotouch_watch_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
monotouch_tv_SUBDIRS = $(monotouch_SUBDIRS)
monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
winaot_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
winaot_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
orbis_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
unreal_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
unreal_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
wasm_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
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_hybrid_SUBDIRS = $(common_DEPS_SUBDIRS) System.Drawing.Common
testing_aot_hybrid_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs System.Security.Cryptography.OpenSsl System.Threading.Tasks.Extensions \
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy System.Memory \

73
mcs/class/Makefile
View File

@@ -1,6 +1,6 @@
thisdir = class
NO_FACADES_PROFILE := $(filter monodroid_tools binary_reference_assemblies xbuild_12 xbuild_14, $(PROFILE))
NO_FACADES_PROFILE := $(filter monodroid_tools monotouch_tools wasm_tools binary_reference_assemblies xbuild_12 xbuild_14 netcore, $(PROFILE))
ifndef NO_FACADES_PROFILE
FACADES_FOLDER := Facades
@@ -12,25 +12,6 @@ ifdef MCS_MODE
MCS_MODE_dirs := Mono.Cecil.Mdb
endif
# The minimal set of csc dependencies
basic_SUBDIRS := \
Mono.Cecil \
$(MCS_MODE_dirs) \
../tools/cil-stringreplacer \
corlib \
Mono.Security \
System \
System.XML \
System.Security \
System.Core \
System.ComponentModel.Composition.4.5 \
System.Numerics \
System.Xml.Linq \
Mono.CompilerServices.SymbolWriter \
PEAPI \
../ilasm \
corlib/il
# Tooling dependencies of mscorlib, we build them to /tmp folder for MONO_PATH to work
# reliably for clean and update builds. All deps are built against stable API to run with
# range of boostrap versions and .NET at the same time
@@ -38,6 +19,8 @@ build_SUBDIRS = \
Mono.Cecil \
$(MCS_MODE_dirs) \
../tools/cil-stringreplacer \
PEAPI \
../ilasm \
corlib
build_PARALLEL_SUBDIRS = \
@@ -52,12 +35,12 @@ build_PARALLEL_SUBDIRS = \
System.Numerics \
System.Xml.Linq \
System.IO.Compression \
System.Drawing \
Mono.CompilerServices.SymbolWriter \
PEAPI
System.IO.Compression.FileSystem \
System.Net.Http \
System.Net.Http.WebRequest \
System.Drawing
ifdef MCS_MODE
basic_PARALLEL_SUBDIRS := ../mcs
build_SUBDIRS += \
Mono.Security \
@@ -65,7 +48,8 @@ build_SUBDIRS += \
System.XML \
System.Security \
Mono.Posix \
System.Core
System.Core \
Mono.CompilerServices.SymbolWriter
build_PARALLEL_SUBDIRS += ../mcs
endif
@@ -113,6 +97,8 @@ testing_aot_full_dirs_parallel := \
Mono.Simd \
Mono.CSharp
testing_aot_full_interp_dirs_parallel := $(testing_aot_full_dirs_parallel)
testing_aot_hybrid_dirs_parallel := $(testing_aot_full_dirs_parallel)
xammac_dirs_parallel := \
@@ -129,9 +115,14 @@ monodroid_dirs_parallel := \
monodroid_tools_dirs_parallel := \
Mono.Cecil \
Mono.CompilerServices.SymbolWriter \
ICSharpCode.SharpZipLib \
monodoc
monotouch_tools_dirs_parallel := \
Mono.Cecil \
Mono.Cecil.Mdb
monotouch_dirs_parallel := \
$(mobile_common_dirs_parallel) \
Mono.Simd \
@@ -163,19 +154,19 @@ monotouch_tv_runtime_dirs := \
winaot_dirs_parallel := \
$(mobile_common_dirs_parallel) \
System.Drawing
Mono.Simd
unreal_dirs_parallel := \
$(mobile_common_dirs_parallel) \
System.Drawing
$(mobile_common_dirs_parallel)
wasm_dirs_parallel := \
$(mobile_common_dirs_parallel) \
System.Drawing
$(mobile_common_dirs_parallel)
wasm_tools_dirs_parallel := \
Mono.Cecil
orbis_dirs_parallel := \
$(filter-out Microsoft.CSharp Mono.Data.Sqlite,$(mobile_common_dirs_parallel)) \
System.Drawing
$(filter-out Microsoft.CSharp Mono.Data.Sqlite,$(mobile_common_dirs_parallel))
xammac_4_5_dirs_parallel := \
Mono.Security \
@@ -392,7 +383,11 @@ monotouch_watch_runtime_SUBDIRS := $(mobile_common_dirs)
monotouch_watch_runtime_PARALLEL_SUBDIRS := $(monotouch_watch_runtime_dirs_parallel)
monotouch_tv_runtime_SUBDIRS := $(mobile_common_dirs)
monotouch_tv_runtime_PARALLEL_SUBDIRS := $(monotouch_tv_runtime_dirs_parallel)
monotouch_tools_SUBDIRS :=
monotouch_tools_PARALLEL_SUBDIRS := $(monotouch_tools_dirs_parallel)
testing_aot_full_interp_SUBDIRS := $(mobile_common_dirs)
testing_aot_full_interp_PARALLEL_SUBDIRS := $(testing_aot_full_interp_dirs_parallel)
testing_aot_full_SUBDIRS := $(mobile_common_dirs)
testing_aot_full_PARALLEL_SUBDIRS := $(testing_aot_full_dirs_parallel)
testing_aot_hybrid_SUBDIRS := $(mobile_common_dirs)
@@ -420,13 +415,18 @@ unreal_PARALLEL_SUBDIRS := $(unreal_dirs_parallel)
wasm_SUBDIRS := $(mobile_common_dirs)
wasm_PARALLEL_SUBDIRS := $(wasm_dirs_parallel)
wasm_tools_SUBDIRS :=
wasm_tools_PARALLEL_SUBDIRS := $(wasm_tools_dirs_parallel)
netcore_SUBDIRS := System.Private.CoreLib
netcore_PARALLEL_SUBDIRS :=
include ../build/rules.make
DIST_SUBDIRS = $(testing_aot_full_dirs_parallel) $(testing_aot_hybrid_dirs_parallel) $(monotouch_dirs_parallel) \
DIST_SUBDIRS = $(testing_aot_full_dirs_parallel) $(testing_aot_hybrid_dirs_parallel) $(monotouch_dirs_parallel) $(monotouch_tools_dirs_parallel) \
$(monodroid_dirs_parallel) $(monodroid_tools_dirs_parallel) $(xammac_dirs_parallel) $(net_4_x_dirs) $(net_4_x_parallel_dirs) \
$(xammac_4_5_dirs_parallel) $(unreal_dirs_parallel) $(wasm_dirs_parallel) $(xbuild_14_SUBDIRS) \
dlr aot-compiler reference-assemblies Facades
$(xammac_4_5_dirs_parallel) $(unreal_dirs_parallel) $(wasm_dirs_parallel) $(wasm_tools_dirs_parallel) $(xbuild_14_SUBDIRS) \
$(testing_aot_full_interp_dirs_parallel) $(netcore_SUBDIRS) dlr aot-compiler reference-assemblies Facades
# No new makefiles for: System.Messaging, System.Web.Mobile,
# System.ServiceProcess
@@ -457,6 +457,7 @@ DISTFILES = \
test-helpers/RemoteExecutorTestBase.Mono.cs \
test-helpers/SocketResponder.cs \
test-helpers/TestResourceHelper.cs \
test-helpers/PathHelpers.cs \
$(foreach HOST_PLATFORM,macos linux win32 unix,lib/$(monolite_dir)/mcs.exe $(monolite_files))
.PHONY: all-local $(STD_TARGETS:=-local)
@@ -478,7 +479,7 @@ build_files := mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.C
Facades/System.IO.dll Facades/System.Runtime.InteropServices.dll Facades/System.Xml.ReaderWriter.dll Facades/System.Linq.Expressions.dll \
Facades/System.Runtime.Numerics.dll Facades/System.Xml.XDocument.dll Facades/System.IO.FileSystem.Primitives.dll Facades/System.IO.FileSystem.dll \
Facades/System.Diagnostics.FileVersionInfo.dll Facades/System.Security.Cryptography.Primitives.dll Facades/System.Security.Cryptography.Algorithms.dll \
Facades/System.ValueTuple.dll Facades/System.Text.Encoding.CodePages.dll \
Facades/System.ValueTuple.dll Facades/System.Text.Encoding.CodePages.dll Facades/netstandard.dll \
Mono.Cecil.dll
monolite_files = $(build_files:%=lib/$(monolite_dir)/%)

1
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CreateItemTest.cs
View File

@@ -293,7 +293,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
Assert.Fail ("Build failed");
string full_base_dir = Path.GetFullPath (basedir);
logger.CheckLoggedAny ("CI1: " + String.Join (";", files), MessageImportance.Normal, "A1");
} catch (AssertionException) {
logger.DumpMessages ();
throw;

3
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/MakeDirTest.cs
View File

@@ -94,9 +94,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
project.Build ("1");
Assert.AreEqual (3, Directory.GetDirectories (path).Length, "A1");
Assert.AreEqual (Path.Combine (path, "A"), Directory.GetDirectories (path) [0], "A2");
Assert.AreEqual (Path.Combine (path, "B"), Directory.GetDirectories (path) [1], "A3");
Assert.AreEqual (Path.Combine (path, "C"), Directory.GetDirectories (path) [2], "A4");
BuildItemGroup output = project.GetEvaluatedItemsByName ("Out");
Assert.AreEqual (Path.Combine (path, "A"), output [0].FinalItemSpec, "A5");

2
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/TestMessageLogger.cs
View File

@@ -229,7 +229,7 @@ namespace MonoTests.Microsoft.Build.Tasks
if (result == 1)
Assert.Fail ("{0}: Expected message '{1}' was not emitted.", id, expected);
if (result == 2)
Assert.AreEqual (expected, actual, id);
return;
}
public void CheckLoggedAny (string expected, MessageImportance importance, string id)

1
mcs/class/Microsoft.CSharp/xammac_Microsoft.CSharp_xtest.dll.exclude.sources Normal file
View File

@@ -0,0 +1 @@
#include monotouch_Microsoft.CSharp_xtest.dll.exclude.sources

6
mcs/class/Mono.Btls.Interface/Mono.Btls.Interface/BtlsProvider.cs
View File

@@ -50,17 +50,17 @@ namespace Mono.Btls.Interface
public static X509Certificate CreateCertificate (byte[] data, BtlsX509Format format, bool disallowFallback = false)
{
return MonoBtlsProvider.CreateCertificate (data, (MonoBtlsX509Format)format, disallowFallback);
return MonoBtlsProvider.CreateCertificate (data, (MonoBtlsX509Format)format);
}
public static X509Certificate2 CreateCertificate2 (byte[] data, BtlsX509Format format, bool disallowFallback = false)
{
return MonoBtlsProvider.CreateCertificate2 (data, (MonoBtlsX509Format)format, disallowFallback);
return MonoBtlsProvider.CreateCertificate (data, (MonoBtlsX509Format)format);
}
public static X509Certificate2 CreateCertificate2 (byte[] data, string password, bool disallowFallback = false)
{
return MonoBtlsProvider.CreateCertificate2 (data, password, disallowFallback);
return MonoBtlsProvider.CreateCertificate (data, password);
}
public static BtlsX509Chain CreateNativeChain ()

3
mcs/class/Mono.Btls.Interface/Mono.Btls.Interface/BtlsX509.cs
View File

@@ -100,7 +100,8 @@ namespace Mono.Btls.Interface
public Oid GetSignatureAlgorithm ()
{
return Instance.GetSignatureAlgorithm ();
var algorithm = Instance.GetSignatureAlgorithm ();
return Oid.FromOidValue (algorithm, OidGroup.SignatureAlgorithm);
}
public AsnEncodedData GetPublicKeyAsn1 ()

9
mcs/class/Mono.Cecil.Mdb/Makefile
View File

@@ -5,17 +5,14 @@ LIBRARY = Mono.Cecil.Mdb.dll
KEYFILE = ../mono.snk
LIBRARY_PACKAGE = none
API_BUILD := $(filter basic build, $(PROFILE))
API_BUILD := $(filter build, $(PROFILE))
ifdef API_BUILD
DEFAULT_REFERENCES =
API_BIN_REFS = System mscorlib
TARGET_NET_REFERENCE = $(BOOTSTRAP_BIN_PROFILE)
LIBRARY_USE_INTERMEDIATE_FILE = 1
else
LIB_REFS = System
endif
LIB_REFS += Mono.Cecil
LIB_REFS = System Mono.Cecil
LIB_MCS_FLAGS = -d:CECIL

9
mcs/class/Mono.Cecil/Makefile
View File

@@ -5,14 +5,13 @@ LIBRARY = Mono.Cecil.dll
KEYFILE = ../mono.snk
LIBRARY_PACKAGE = none
API_BUILD := $(filter basic build, $(PROFILE))
LIB_REFS = System.Core System
API_BUILD := $(filter build, $(PROFILE))
ifdef API_BUILD
DEFAULT_REFERENCES =
API_BIN_REFS = System.Core System mscorlib
TARGET_NET_REFERENCE = $(BOOTSTRAP_BIN_PROFILE)
LIBRARY_USE_INTERMEDIATE_FILE = 1
else
LIB_REFS = System.Core System
endif
LIB_MCS_FLAGS = -d:NET_4_0

Some files were not shown because too many files have changed in this diff Show More