Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/tools/Makefile

@@ -49,7 +49,7 @@ net_4_5_dirs := \
 	mono-symbolicate	\
 	linker-analyzer
 
-build_SUBDIRS = gacutil security culevel cil-stringreplacer commoncryptogenerator
+build_SUBDIRS = resgen gacutil security culevel cil-stringreplacer commoncryptogenerator
 net_4_5_SUBDIRS = gacutil
 net_4_5_PARALLEL_SUBDIRS = $(net_4_5_dirs)
 

mcs/tools/corcompare/AssemblyResolver.cs

@@ -44,7 +44,7 @@ namespace GuiCompare {
 		AssemblyDefinition ProcessFile (string file)
 		{
 			AddSearchDirectory (Path.GetDirectoryName (file));
-			var assembly = AssemblyDefinition.ReadAssembly (file, new ReaderParameters { AssemblyResolver = this });
+			var assembly = AssemblyDefinition.ReadAssembly (file, new ReaderParameters { AssemblyResolver = this, InMemory = true });
 			RegisterAssembly (assembly);
 
 			return assembly;

mcs/tools/corcompare/mono-api-info.cs

@@ -1377,10 +1377,18 @@ namespace CorCompare
 				if (ca.Count != 1)
 					break;
 
+				if (mapping == null)
+					mapping = new Dictionary<string, object> (StringComparer.Ordinal);
+
 				if (constructor.Parameters[0].ParameterType == constructor.Module.TypeSystem.Boolean) {
-					if (mapping == null)
-						mapping = new Dictionary<string, object> (StringComparer.Ordinal);
 					mapping.Add ("Bindable", ca[0].Value);
+				} else if (constructor.Parameters[0].ParameterType.FullName == "System.ComponentModel.BindableSupport") {
+					if ((int)ca[0].Value == 0)
+						mapping.Add ("Bindable", false);
+					else if ((int)ca[0].Value == 1)
+						mapping.Add ("Bindable", true);
+					else
+						throw new NotImplementedException ();
 				} else {
 					throw new NotImplementedException ();
 				}

mcs/tools/linker/monolinker.exe.sources

@@ -10,6 +10,8 @@
 ../../../external/linker/linker/Mono.Linker/MethodAction.cs
 ../../../external/linker/linker/Mono.Linker/XApiReader.cs
 ../../../external/linker/linker/Mono.Linker/IXApiVisitor.cs
+../../../external/linker/linker/Mono.Linker/LoadException.cs
+../../../external/linker/linker/Mono.Linker/MarkException.cs
 ../../../external/linker/linker/Mono.Linker.Steps/BaseStep.cs
 ../../../external/linker/linker/Mono.Linker.Steps/LoadReferencesStep.cs
 ../../../external/linker/linker/Mono.Linker.Steps/LoadI18nAssemblies.cs

mcs/tools/mkbundle/Makefile

@@ -24,10 +24,11 @@ test-simple: simple.exe
 	mono --debug $(the_lib) --cross default simple.exe -o foo && ./foo
 	mono --debug $(the_lib) --sdk `dirname \`which mono\``/.. simple.exe -o foo && ./foo
 	-rm DEMO.zip
-	mono-package-runtime `dirname \`which mono\``/.. DEMO
+	$(topdir)/../scripts/mono-package-runtime `dirname \`which mono\``/.. DEMO
 	mkdir -p ~/.mono/targets/DEMO
 	unzip -d ~/.mono/targets/DEMO DEMO.zip
-	mono --debug $(the_lib) --cross DEMO simple.exe -o foo && ./foo
+	mono --debug $(the_lib) --cross DEMO simple.exe -o foo | grep "Assembly.*mscorlib.dll"
+	./foo
 
 simple.exe: Makefile
 	echo 'class X { static void Main () { System.Console.WriteLine ("OK");}}' > simple.cs && mcs simple.cs

mcs/tools/mkbundle/mkbundle.cs

@@ -49,6 +49,7 @@ class MakeBundle {
 	static string machine_config_file = null;
 	static string config_dir = null;
 	static string style = "linux";
+	static bool bundled_header = false;
 	static string os_message = "";
 	static bool compress;
 	static bool nomain;
@@ -347,6 +348,9 @@ class MakeBundle {
 				else
 					environment.Add (env.Substring (0, p), env.Substring (p+1));
 				break;
+			case "--bundled-header":
+				bundled_header = true;
+				break;
 			default:
 				sources.Add (args [i]);
 				break;
@@ -700,10 +704,10 @@ class MakeBundle {
 			using (StreamWriter tc = new StreamWriter (File.Create (temp_c))) {
 			string prog = null;
 
-#if XAMARIN_ANDROID
-			tc.WriteLine ("/* This source code was produced by mkbundle, do not edit */");
-			tc.WriteLine ("\n#ifndef NULL\n#define NULL (void *)0\n#endif");
-			tc.WriteLine (@"
+			if (bundled_header) {
+				tc.WriteLine ("/* This source code was produced by mkbundle, do not edit */");
+				tc.WriteLine ("\n#ifndef NULL\n#define NULL (void *)0\n#endif");
+				tc.WriteLine (@"
 typedef struct {
 	const char *name;
 	const unsigned char *data;
@@ -712,10 +716,10 @@ typedef struct {
 void          mono_register_bundled_assemblies (const MonoBundledAssembly **assemblies);
 void          mono_register_config_for_assembly (const char* assembly_name, const char* config_xml);
 ");
-#else
-			tc.WriteLine ("#include <mono/metadata/mono-config.h>");
-			tc.WriteLine ("#include <mono/metadata/assembly.h>\n");
-#endif
+			} else {
+				tc.WriteLine ("#include <mono/metadata/mono-config.h>");
+				tc.WriteLine ("#include <mono/metadata/assembly.h>\n");
+			}
 
 			if (compress) {
 				tc.WriteLine ("typedef struct _compressed_data {");
@@ -1082,14 +1086,14 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
 	static void LoadLocalizedAssemblies (List<string> assemblies)
 	{
 		var other = i18n.Select (x => "I18N." + x + (x.Length > 0 ? "." : "") + "dll");
-		bool error = false;
+		string error = null;
 
 		foreach (string name in other) {
 			try {
 				Assembly a = LoadAssembly (name);
 
 				if (a == null) {
-					error = true;
+					error = "Failed to load " + name;
 					continue;
 				}
 
@@ -1105,8 +1109,8 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
 			}
 		}
 
-		if (error) {
-			Error ("Couldn't load one or more of the i18n assemblies.");
+		if (error != null) {
+			Error ("Couldn't load one or more of the i18n assemblies: " + error);
 			Environment.Exit (1);
 		}
 	}
@@ -1114,10 +1118,10 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
 	
 	static readonly Universe universe = new Universe ();
 	static readonly Dictionary<string, string> loaded_assemblies = new Dictionary<string, string> ();
-	static readonly string resourcePathSeparator = (Path.DirectorySeparatorChar == '\\') ? $"\\{Path.DirectorySeparatorChar}" : $"{Path.DirectorySeparatorChar}";
 
 	public static string GetAssemblyName (string path)
 	{
+		string resourcePathSeparator = style == "windows" ? "\\\\" : "/";
 		string name = Path.GetFileName (path);
 
 		// A bit of a hack to support satellite assemblies. They all share the same name but
@@ -1159,7 +1163,7 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
 			Assembly a = universe.LoadFile (path);
 
 			foreach (AssemblyName an in a.GetReferencedAssemblies ()) {
-				LoadAssembly (an.FullName);
+				a = LoadAssembly (an.Name);
 				if (!QueueAssembly (files, a.CodeBase))
 					return false;
 			}
@@ -1221,7 +1225,6 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
 	static void Error (string msg, params object [] args)
 	{
 		Console.Error.WriteLine ("ERROR: {0}", string.Format (msg, args));
-		throw new Exception ();
 		Environment.Exit (1);
 	}
 
@@ -1239,6 +1242,7 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
 				   "    --skip-scan          Skip scanning assemblies that could not be loaded (but still embed them).\n" +
 				   "    --i18n ENCODING      none, all or comma separated list of CJK, MidWest, Other, Rare, West.\n" +
 				   "    -v                   Verbose output\n" + 
+				   "    --bundled-header     Do not attempt to include 'mono-config.h'. Define the entry points directly in the generated code\n" +
 				   "\n" + 
 				   "--simple   Simple mode does not require a C toolchain and can cross compile\n" + 
 				   "    --cross TARGET       Generates a binary for the given TARGET\n"+

mcs/tools/mono-symbolicate/LocationProvider.cs

@@ -11,7 +11,7 @@ namespace Mono
 {
 	class AssemblyLocationProvider
 	{
-		AssemblyDefinition assembly;
+		string assemblyFullPath;
 		Logger logger;
 
 		public AssemblyLocationProvider (string assemblyPath, Logger logger)
@@ -22,85 +22,88 @@ namespace Mono
 			if (!File.Exists (assemblyPath))
 				throw new ArgumentException ("assemblyPath does not exist: "+ assemblyPath);
 
-			var readerParameters = new ReaderParameters { ReadSymbols = true };
-			assembly = AssemblyDefinition.ReadAssembly (assemblyPath, readerParameters);
+			assemblyFullPath = assemblyPath;
 		}
 
 		public bool TryResolveLocation (StackFrameData sfData, SeqPointInfo seqPointInfo)
 		{
-			if (!assembly.MainModule.HasSymbols)
-				return false;
+			var readerParameters = new ReaderParameters { ReadSymbols = true };
+			using (var assembly = AssemblyDefinition.ReadAssembly (assemblyFullPath, readerParameters)) {
 
-			TypeDefinition type = null;
-			string[] nested;
-			if (sfData.TypeFullName.IndexOf ('/') >= 0)
-				 nested = sfData.TypeFullName.Split ('/');
-			else
-				nested = sfData.TypeFullName.Split ('+');
+				if (!assembly.MainModule.HasSymbols)
+					return false;
 
-			var types = assembly.MainModule.Types;
-			foreach (var ntype in nested) {
-				if (type == null) {
-					// Use namespace first time.
-					type = types.FirstOrDefault (t => t.FullName == ntype);
+				TypeDefinition type = null;
+				string[] nested;
+				if (sfData.TypeFullName.IndexOf ('/') >= 0)
+					nested = sfData.TypeFullName.Split ('/');
+				else
+					nested = sfData.TypeFullName.Split ('+');
+
+				var types = assembly.MainModule.Types;
+				foreach (var ntype in nested) {
+					if (type == null) {
+						// Use namespace first time.
+						type = types.FirstOrDefault (t => t.FullName == ntype);
+					} else {
+						type = types.FirstOrDefault (t => t.Name == ntype);
+					}
+
+					if (type == null) {
+						logger.LogWarning ("Could not find type: {0}", ntype);
+						return false;
+					}
+
+					types = type.NestedTypes;
+				}
+
+				var parensStart = sfData.MethodSignature.IndexOf ('(');
+				var methodName = sfData.MethodSignature.Substring (0, parensStart).TrimEnd ();
+				var methodParameters = sfData.MethodSignature.Substring (parensStart);
+				var methods = type.Methods.Where (m => CompareName (m, methodName) && CompareParameters (m.Parameters, methodParameters)).ToArray ();
+				if (methods.Length == 0) {
+					logger.LogWarning ("Could not find method: {0}", methodName);
+					return false;
+				}
+				if (methods.Length > 1) {
+					logger.LogWarning ("Ambiguous match for method: {0}", sfData.MethodSignature);
+					return false;
+				}
+				var method = methods [0];
+
+				int ilOffset;
+				if (sfData.IsILOffset) {
+					ilOffset = sfData.Offset;
 				} else {
-					type = types.FirstOrDefault (t => t.Name == ntype);
+					if (seqPointInfo == null)
+						return false;
+
+					ilOffset = seqPointInfo.GetILOffset (method.MetadataToken.ToInt32 (), sfData.MethodIndex, sfData.Offset);
 				}
 
-				if (type == null) {
-					logger.LogWarning ("Could not find type: {0}", ntype);
+				if (ilOffset < 0)
 					return false;
+
+				if (!method.DebugInformation.HasSequencePoints)
+					return false;
+
+				SequencePoint prev = null;
+				foreach (var sp in method.DebugInformation.SequencePoints.OrderBy (l => l.Offset)) {
+					if (sp.Offset >= ilOffset) {
+						sfData.SetLocation (sp.Document.Url, sp.StartLine);
+						return true;
+					}
+
+					prev = sp;
 				}
 
-				types = type.NestedTypes;
-			}
-
-			var parensStart = sfData.MethodSignature.IndexOf ('(');
-			var methodName = sfData.MethodSignature.Substring (0, parensStart).TrimEnd ();
-			var methodParameters = sfData.MethodSignature.Substring (parensStart);
-			var methods = type.Methods.Where (m => CompareName (m, methodName) && CompareParameters (m.Parameters, methodParameters)).ToArray ();
-			if (methods.Length == 0) {
-				logger.LogWarning ("Could not find method: {0}", methodName);
-				return false;
-			}
-			if (methods.Length > 1) {
-				logger.LogWarning ("Ambiguous match for method: {0}", sfData.MethodSignature);
-				return false;
-			}
-			var method = methods [0];
-
-			int ilOffset;
-			if (sfData.IsILOffset) {
-				ilOffset = sfData.Offset;
-			} else {
-				if (seqPointInfo == null)
-					return false;
-
-				ilOffset = seqPointInfo.GetILOffset (method.MetadataToken.ToInt32 (), sfData.MethodIndex, sfData.Offset);
-			}
-
-			if (ilOffset < 0)
-				return false;
-
-			if (!method.DebugInformation.HasSequencePoints)
-				return false;
-
-			SequencePoint prev = null;
-			foreach (var sp in method.DebugInformation.SequencePoints.OrderBy (l => l.Offset)) {
-				if (sp.Offset >= ilOffset) {
-					sfData.SetLocation (sp.Document.Url, sp.StartLine);
+				if (prev != null) {
+					sfData.SetLocation (prev.Document.Url, prev.StartLine);
 					return true;
 				}
 
-				prev = sp;
+				return false;
 			}
-
-			if (prev != null) {
-				sfData.SetLocation (prev.Document.Url, prev.StartLine);
-				return true;
-			}
-
-			return false;
 		}
 
 		static bool CompareName (MethodDefinition candidate, string expected)

mcs/tools/mono-symbolicate/Makefile

@@ -25,7 +25,7 @@ SYMBOLICATE_EXPECTED_FILE = Test/symbolicate.expected
 CHECK_DIFF = @\
 	$(MONO) $(TEST_EXE) > $(STACKTRACE_FILE); \
 	$(MONO) $(LIB_PATH)/$(PROGRAM) $(MSYM_DIR) $(STACKTRACE_FILE) > $(SYMBOLICATE_RAW_FILE); \
-	cat $(SYMBOLICATE_RAW_FILE) | tr '\\' '/' | sed "s/) .* in .*\/mcs\//) in mcs\//" | sed '/\[MVID\]/d' | sed '/\[AOTID\]/d' > $(SYMBOLICATE_RESULT_FILE); \
+	cat $(SYMBOLICATE_RAW_FILE) | tr '\\' '/' | sed "s/) .* in .*\/mcs\//) in mcs\//" | sed "s/) .* in .*\/external\//) in external\//" | sed '/\[MVID\]/d' | sed '/\[AOTID\]/d' > $(SYMBOLICATE_RESULT_FILE); \
 	DIFF=$$(diff -up $(SYMBOLICATE_EXPECTED_FILE) $(SYMBOLICATE_RESULT_FILE)); \
 	if [ ! -z "$$DIFF" ]; then \
 		echo "Symbolicate tests failed."; \

mcs/tools/mono-symbolicate/SymbolManager.cs

@@ -107,10 +107,11 @@ namespace Mono
 						continue;
 					}
 
-					var assembly = AssemblyDefinition.ReadAssembly (assemblyPath);
-
-					var mvid = assembly.MainModule.Mvid.ToString ("N");
-					var mvidDir = Path.Combine (msymDir, mvid);
+					string mvidDir;
+					using (var assembly = AssemblyDefinition.ReadAssembly (assemblyPath)) {
+						var mvid = assembly.MainModule.Mvid.ToString ("N");
+						mvidDir = Path.Combine (msymDir, mvid);
+					}
 
 					if (Directory.Exists (mvidDir)) {
 						try {

mcs/tools/mono-symbolicate/mono-symbolicate.exe.sources

@@ -95,7 +95,6 @@ Logger.cs
 ../../../external/cecil/Mono.Cecil.PE/*.cs
 ../../../external/cecil/Mono.Collections.Generic/*.cs
 ../../../external/cecil/Mono.Security.Cryptography/*.cs
-../../../external/cecil/System.Security.Cryptography/*.cs
 ../../../external/cecil/symbols/mdb/Mono.Cecil.Mdb/MdbReader.cs
 ../../../external/cecil/symbols/mdb/Mono.Cecil.Mdb/MdbWriter.cs
 ../../../external/cecil/symbols/mdb/Mono.CompilerServices.SymbolWriter/*.cs

mcs/tools/resgen/Makefile

@@ -6,7 +6,8 @@ PROGRAM = resgen.exe
 
 CLEAN_FILES = resgen.exe
 
-LIB_REFS = System System.Xml System.Core
+LIB_REFS = System System.Xml System.Core System.Drawing
+LOCAL_MCS_FLAGS = -unsafe
 
 INSTALL_PROFILE := $(filter $(DEFAULT_PROFILE), $(PROFILE))
 ifndef INSTALL_PROFILE

mcs/tools/resgen/monoresgen.cs

@@ -15,32 +15,12 @@ using System.IO;
 using System.Collections;
 using System.Collections.Generic;
 using System.Resources;
-using System.Reflection;
 using System.Xml;
 
 class ResGen {
 
-	static Assembly swf;
-	static Type resxr;
-	static Type resxw;
 	static HashSet<string> symbols = new HashSet<string> ();
 
-	/*
-	 * We load the ResX format stuff on demand, since the classes are in 
-	 * System.Windows.Forms (!!!) and we can't depend on that assembly in mono, yet.
-	 */
-	static void LoadResX () {
-		if (swf != null)
-			return;
-		try {
-			swf = Assembly.Load (Consts.AssemblySystem_Windows_Forms);
-			resxr = swf.GetType ("System.Resources.ResXResourceReader");
-			resxw = swf.GetType ("System.Resources.ResXResourceWriter");
-		} catch (Exception e) {
-			throw new Exception ("Cannot load support for ResX format: " + e.Message);
-		}
-	}
-
 	static void Usage () {
 
 		string Usage = @"Mono Resource Generator version " + Consts.MonoVersion +
@@ -91,16 +71,8 @@ Options:
 		case ".resources":
 			return new ResourceReader (stream);
 		case ".resx":
-			LoadResX ();
-			IResourceReader reader = (IResourceReader) Activator.CreateInstance (
-				resxr, new object[] {stream});
-			if (useSourcePath) { // only possible on 2.0 profile, or higher
-				PropertyInfo p = reader.GetType ().GetProperty ("BasePath",
-					BindingFlags.Public | BindingFlags.Instance);
-				if (p != null && p.CanWrite) {
-					p.SetValue (reader, Path.GetDirectoryName (name), null);
-				}
-			}
+			var reader = new ResXResourceReader (stream);
+			reader.BasePath = Path.GetDirectoryName (name);
 			return reader;
 		default:
 			throw new Exception ("Unknown format in file " + name);
@@ -118,8 +90,7 @@ Options:
 		case ".resources":
 			return new ResourceWriter (stream);
 		case ".resx":
-			LoadResX ();
-			return (IResourceWriter)Activator.CreateInstance (resxw, new object[] {stream});
+			return new ResXResourceWriter (stream);
 		default:
 			throw new Exception ("Unknown format in file " + name);
 		}
@@ -165,7 +136,7 @@ Options:
 				inner = inner.InnerException;
 			}
 
-			if (inner is TargetInvocationException && inner.InnerException != null)
+			if (inner is System.Reflection.TargetInvocationException && inner.InnerException != null)
 				inner = inner.InnerException;
 			if (inner != null)
 				Console.WriteLine ("Inner exception: {0}", inner.Message);

mcs/tools/resgen/resgen.exe.sources

@@ -1,4 +1,23 @@
 Assembly/AssemblyInfo.cs
 ../../build/common/Consts.cs
 ../../build/common/Locale.cs
+../../build/common/MonoTODOAttribute.cs
 monoresgen.cs
+../../class/System.Windows.Forms/System.Resources/AssemblyNamesTypeResolutionService.cs
+../../class/System.Windows.Forms/System.Resources/ResXDataNode.cs
+../../class/System.Windows.Forms/System.Resources/ResXResourceSet.cs
+../../class/System.Windows.Forms/System.Resources/ByteArrayFromResXHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXDataNodeHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXResourceWriter.cs
+../../class/System.Windows.Forms/System.Resources/FileRefHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXFileRef.cs
+../../class/System.Windows.Forms/System.Resources/SerializedFromResXHandler.cs
+../../class/System.Windows.Forms/System.Resources/InMemoryHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXNullRef.cs
+../../class/System.Windows.Forms/System.Resources/TypeConverterFromResXHandler.cs
+../../class/System.Windows.Forms/System.Resources/NullRefHandler.cs
+../../class/System.Windows.Forms/System.Resources/ResXResourceReader.cs
+../../class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
+../../class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapReader.cs
+../../class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
+../../class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapWriter.cs

mcs/tools/security/certview/Makefile

@@ -2,12 +2,9 @@ thisdir = tools/security/certview
 SUBDIRS = 
 include ../../../build/rules.make
 
-RESGEN = resgen
 LIB_REFS = Mono.Security System.Xml
 LOCAL_MCS_FLAGS = /win32icon:mono.ico
 
-# SWF isn't quite good enough to build this yet.
-
 all-local: certview.exe
 
 install-local:

mcs/tools/security/permview.cs

@@ -375,28 +375,29 @@ namespace Mono.Tools {
 					return 0;
 
 				string assemblyName = args [args.Length - 1];
-				AssemblyDefinition ad = AssemblyDefinition.ReadAssembly (assemblyName);
-				if (ad != null) {
-					bool complete = false;
-					
-					if (declarative) {
-						// full output (assembly+classes+methods)
-						complete = ProcessAssemblyComplete (tw, ad);
-					} else if (xmloutput) {
-						// full output in XML (for easier diffs after c14n)
-						complete = ProcessAssemblyXml (tw, ad);
-					} else {
-						// default (assembly only)
-						complete = ProcessAssemblyOnly (tw, ad);
-					}
+				using (AssemblyDefinition ad = AssemblyDefinition.ReadAssembly (assemblyName)) {
+					if (ad != null) {
+						bool complete = false;
 
-					if (!complete) {
-						Console.Error.WriteLine ("Couldn't reflect informations.");
-						return 1;
+						if (declarative) {
+							// full output (assembly+classes+methods)
+							complete = ProcessAssemblyComplete (tw, ad);
+						} else if (xmloutput) {
+							// full output in XML (for easier diffs after c14n)
+							complete = ProcessAssemblyXml (tw, ad);
+						} else {
+							// default (assembly only)
+							complete = ProcessAssemblyOnly (tw, ad);
+						}
+
+						if (!complete) {
+							Console.Error.WriteLine ("Couldn't reflect informations.");
+							return 1;
+						}
+					} else {
+						Console.Error.WriteLine ("Couldn't load assembly '{0}'.", assemblyName);
+						return 2;
 					}
-				} else {
-					Console.Error.WriteLine ("Couldn't load assembly '{0}'.", assemblyName);
-					return 2;
 				}
 				tw.Close ();
 			}

mcs/tools/xbuild/Makefile

@@ -20,8 +20,8 @@ else
 install-local: install-extras
 endif
 
-PORTABLE_TARGETS_SRC=../../../external/buildtools/src/Portable/Targets
-PCL5_FX_SRC=../../../external/buildtools/src/Portable/Frameworks/v5.0
+PORTABLE_TARGETS_SRC:=data/Portable/Targets
+PCL5_FX_SRC:=data/Portable/Frameworks/v5.0
 
 NETFRAMEWORK_DIR=$(mono_libdir)/mono/xbuild-frameworks/.NETFramework
 PCL5_FX_DIR=$(mono_libdir)/mono/xbuild-frameworks/.NETPortable/v5.0
@@ -79,6 +79,8 @@ install-frameworks:
 	$(INSTALL_DATA) frameworks/net_4.6.1.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.1/RedistList/FrameworkList.xml
 	$(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.2/RedistList
 	$(INSTALL_DATA) frameworks/net_4.6.2.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.6.2/RedistList/FrameworkList.xml
+	$(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7/RedistList
+	$(INSTALL_DATA) frameworks/net_4.7.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7/RedistList/FrameworkList.xml
 
 install-pcl-targets:
 	$(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)
@@ -148,6 +150,24 @@ EXTRA_DISTFILES = \
 	data/Microsoft.VisualBasic.targets \
 	data/MSBuild/Microsoft.Build.CommonTypes.xsd \
 	data/MSBuild/Microsoft.Build.Core.xsd \
+	data/Portable/Targets/Microsoft.Portable.Core.props \
+	data/Portable/Targets/Microsoft.Portable.Core.targets \
+	data/Portable/Targets/v4.0/Microsoft.Portable.Common.targets \
+	data/Portable/Targets/v4.0/Microsoft.Portable.CSharp.targets \
+	data/Portable/Targets/v4.0/Microsoft.Portable.VisualBasic.targets \
+	data/Portable/Targets/v4.5/Microsoft.Portable.Common.targets \
+	data/Portable/Targets/v4.5/Microsoft.Portable.CSharp.targets \
+	data/Portable/Targets/v4.5/Microsoft.Portable.VisualBasic.targets \
+	data/Portable/Targets/v4.6/Microsoft.Portable.Common.targets \
+	data/Portable/Targets/v4.6/Microsoft.Portable.CSharp.targets \
+	data/Portable/Targets/v4.6/Microsoft.Portable.VisualBasic.targets \
+	data/Portable/Targets/v5.0/Microsoft.Portable.Common.targets \
+	data/Portable/Targets/v5.0/Microsoft.Portable.CSharp.targets \
+	data/Portable/Targets/v5.0/Microsoft.Portable.VisualBasic.targets \
+	"data/Portable/Frameworks/v5.0/.NET Framework 4.6.xml" \
+	"data/Portable/Frameworks/v5.0/ASP.NET Core 1.0.xml" \
+	"data/Portable/Frameworks/v5.0/FrameworkList.xml" \
+	"data/Portable/Frameworks/v5.0/Windows Universal 10.0.xml" \
 	frameworks/net_2.0.xml \
 	frameworks/net_3.0.xml \
 	frameworks/net_3.5.xml \
@@ -159,6 +179,7 @@ EXTRA_DISTFILES = \
 	frameworks/net_4.6.xml \
 	frameworks/net_4.6.1.xml \
 	frameworks/net_4.6.2.xml \
+	frameworks/net_4.7.xml \
 	targets/Microsoft.WebApplication.targets	\
 	$(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props	\
 	$(NUGET_BUILDTASKS_REPO_DIR)/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets	\

mcs/tools/xbuild/data/Portable/Frameworks/v5.0/.NET Framework 4.6.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Framework
+    Identifier=".NETFramework"
+    Profile="*"
+    MinimumVersion="4.6"
+    Family=".NETFramework"
+    MinimumVisualStudioVersion="14.0"
+    DisplayName=".NET Framework"
+    MinimumVersionDisplayName="4.6"
+    PlatformArchitectures="AnyCPU;x86;x64"
+    IsBuiltIn="true"
+    IsHidden="false">
+    <RetargetData
+        ProjectLanguage="CSharp">
+        <NuGet
+            Identifier="net46.app"
+            PortableTargetMoniker="net452">
+            <Package
+                Identifier="Microsoft.NETCore"
+                Version="5.0.0" />
+            <Package
+                Identifier="Microsoft.NETCore.Portable.Compatibility"
+                Version="1.0.0" />
+        </NuGet>
+    </RetargetData>
+    <RetargetData
+        ProjectLanguage="VisualBasic">
+        <NuGet
+            Identifier="net46.app"
+            PortableTargetMoniker="net452">
+            <Package
+                Identifier="Microsoft.NETCore"
+                Version="5.0.0" />
+            <Package
+                Identifier="Microsoft.NETCore.Portable.Compatibility"
+                Version="1.0.0" />
+        </NuGet>
+    </RetargetData>
+</Framework>

mcs/tools/xbuild/data/Portable/Frameworks/v5.0/ASP.NET Core 1.0.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Framework
+    Identifier="DNXCore"
+    Profile="*"
+    MinimumVersion="5.0"
+    Family="DNXCore"
+    MinimumVisualStudioVersion="14.0"
+    DisplayName="ASP.NET Core"
+    MinimumVersionDisplayName="1.0"
+    PlatformArchitectures="AnyCPU;x86;x64"
+    IsBuiltIn="true"
+    IsHidden="true">
+    <RetargetData
+        ProjectLanguage="CSharp">
+        <NuGet
+            Identifier="dnxcore50.app">
+            <Package
+                Identifier="Microsoft.NETCore"
+                Version="5.0.0" />
+            <Package
+                Identifier="Microsoft.NETCore.Portable.Compatibility"
+                Version="1.0.0" />
+        </NuGet>
+    </RetargetData>
+    <RetargetData
+        ProjectLanguage="VisualBasic">
+        <NuGet
+            Identifier="dnxcore50.app">
+            <Package
+                Identifier="Microsoft.NETCore"
+                Version="5.0.0" />
+            <Package
+                Identifier="Microsoft.NETCore.Portable.Compatibility"
+                Version="1.0.0" />
+        </NuGet>
+    </RetargetData>
+</Framework>

mcs/tools/xbuild/data/Portable/Frameworks/v5.0/FrameworkList.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList Redist="Microsoft-Windows-CLRCoreComp.PortableLibrary.5.0" Name=".NET Portable Subset (Visual Studio 2015)" RuntimeVersion="5.0">
+</FileList>

mcs/tools/xbuild/data/Portable/Frameworks/v5.0/Windows Universal 10.0.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Framework
+    Identifier=".NETCore"
+    Profile="*"
+    MinimumVersion="5.0"
+    Family="Windows"
+    MinimumVisualStudioVersion="14.0"
+    DisplayName="Windows Universal"
+    MinimumVersionDisplayName="10.0"
+    PlatformArchitectures="AnyCPU;x86;x64;ARM"
+    IsBuiltIn="true"
+    IsHidden="false">
+    <RetargetData
+        ProjectLanguage="CSharp">
+        <NuGet
+            Identifier="uwp.10.0.app"
+            PortableTargetMoniker="win81">
+            <Package
+                Identifier="Microsoft.NETCore"
+                Version="5.0.0" />
+            <Package
+                Identifier="Microsoft.NETCore.Portable.Compatibility"
+                Version="1.0.0" />
+        </NuGet>
+    </RetargetData>
+    <RetargetData
+        ProjectLanguage="VisualBasic">
+        <NuGet
+            Identifier="uwp.10.0.app"
+            PortableTargetMoniker="win81">
+            <Package
+                Identifier="Microsoft.NETCore"
+                Version="5.0.0" />
+            <Package
+                Identifier="Microsoft.NETCore.Portable.Compatibility"
+                Version="1.0.0" />
+        </NuGet>
+    </RetargetData>
+</Framework>