Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@@ -24,12 +24,12 @@ using System;
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly: AssemblyTitle ("netstandard.dll")]
[assembly: AssemblyDescription ("netstandard.dll")]
[assembly: AssemblyDefaultAlias ("netstandard.dll")]
[assembly: AssemblyCompany ("Xamarin, Inc.")]
[assembly: AssemblyTitle ("netstandard")]
[assembly: AssemblyDescription ("netstandard")]
[assembly: AssemblyDefaultAlias ("netstandard")]
[assembly: AssemblyCompany ("Mono development team")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("Copyright (c) 2016 Xamarin Inc. (http://www.xamarin.com)")]
[assembly: AssemblyCopyright ("(c) Various Mono authors")]
[assembly: AssemblyVersion ("2.0.0.0")]
[assembly: AssemblyInformationalVersion ("2.0.0.0")]
[assembly: AssemblyFileVersion ("2.0.0.0")]

View File

@@ -29,7 +29,7 @@ LIB_REFS += System.Web
endif
# profiles which build a System.Drawing.dll in the repo
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal, $(PROFILE))
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal wasm, $(PROFILE))
ifdef REPO_DRAWING_DEP
LIB_REFS += System.Drawing