Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -164,7 +164,7 @@ namespace System.Xml.Xsl.XsltOld {
// The World of Compile
//
internal void Compile(NavigatorInput input, XmlResolver xmlResolver, Evidence evidence) {
#if !FEATURE_MONO_CAS
#if !MONO_FEATURE_CAS
evidence = null;
#endif
Debug.Assert(input != null);
@@ -800,7 +800,7 @@ namespace System.Xml.Xsl.XsltOld {
compilParams.Evidence = evidence;
#pragma warning restore 618
compilParams.ReferencedAssemblies.Add(typeof(XPathNavigator).Module.FullyQualifiedName);
compilParams.ReferencedAssemblies.Add("system.dll");
compilParams.ReferencedAssemblies.Add("System.dll");
#if !FEATURE_PAL // visualbasic
if (lang == ScriptingLanguage.VisualBasic) {
compilParams.ReferencedAssemblies.Add("microsoft.visualbasic.dll");