Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -152,9 +152,13 @@ MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.
 MONO_API_ASSEMBLIES := $(filter-out $(MONO_API_ASSEMBLIES_IGNORED), $(wildcard $(topdir)class/lib/$(PROFILE)/*.dll)) $(wildcard $(topdir)class/lib/$(PROFILE)/Facades/*.dll)
 MONO_API_ASSEMBLIES_CS := $(MONO_API_ASSEMBLIES:$(topdir)class/lib/$(PROFILE)/%.dll=$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs)

-$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs: $(topdir)class/lib/$(PROFILE)/%.dll $(GENAPI) $(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt
+apidiff/ignored-attr.txt:
 	@mkdir -p $(dir $@)
-	$(Q) MONO_PATH=$(topdir)class/lib/$(BUILD_TOOLS_PROFILE) $(RUNTIME) $(GENAPI) -libPath:$(topdir)class/lib/$(PROFILE),$(topdir)class/lib/$(PROFILE)/Facades -out:$(dir $@) -headerFile:$(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt -assemblyAttributes -typeForwardedTo -assemblyVersion -assembly:$< || echo "Couldn't process assembly." > $@
+	@echo "T:System.Runtime.CompilerServices.CompilerGeneratedAttribute" > $@
+
+$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs: $(topdir)class/lib/$(PROFILE)/%.dll $(GENAPI) $(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt apidiff/ignored-attr.txt
+	@mkdir -p $(dir $@)
+	$(Q) MONO_PATH=$(topdir)class/lib/$(BUILD_TOOLS_PROFILE) $(RUNTIME) $(GENAPI) -libPath:$(topdir)class/lib/$(PROFILE),$(topdir)class/lib/$(PROFILE)/Facades -out:$(dir $@) -headerFile:$(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt -assemblyAttributes -typeForwardedTo -assemblyVersion -excludeAttributesList:apidiff/ignored-attr.txt -assembly:$< || echo "Couldn't process assembly." > $@

 mono-api-current: $(MONO_API_ASSEMBLIES_CS)

@@ -175,3 +179,11 @@ mono-api-diff:
 	@mkdir -p apidiff
 	$(Q) sed -e "/@diffdata@/r temp.patch" -e "/@diffdata@/d" -e "s/@title@/Public API Diff/g" -e "s/@description@/If the changes are intentional, run <code>make -C mcs mono-api-diff<\/code> locally and commit changes in external\/api-snapshot./g" diff.html.in > apidiff/index.html
 	$(Q) if [ -s temp.patch ]; then echo "Error: Found public API differences, see mcs/apidiff/index.html. If the changes are intentional, please go to external/api-snapshot and commit them."; rm -f temp.patch; exit 1; else echo "No differences found."; rm -f temp.patch; fi
+
+mono-csproj-diff:
+	@echo "Generating csproj diff..."
+	$(Q) git add -A "*.csproj" $(topdir)../bcl.sln
+	$(Q) git diff --no-renames HEAD "*.csproj" $(topdir)../bcl.sln > $(abspath $(topdir))/temp.patch
+	@mkdir -p csprojdiff
+	$(Q) sed -e "/@diffdata@/r temp.patch" -e "/@diffdata@/d" -e "s/@title@/Project Files Diff/g" -e "s/@description@/Use <code>@monojenkins commit csproj<\/code> to commit them./g" diff.html.in > csprojdiff/index.html
+	$(Q) if [ -s temp.patch ]; then echo "Error: Found csproj differences, see mcs/csprojdiff/index.html. If the changes are intentional, please commit them."; rm -f temp.patch; exit 1; else echo "No differences found."; rm -f temp.patch; fi
--- a/mcs/build/Makefile
+++ b/mcs/build/Makefile
@@ -33,7 +33,7 @@ COMMON_SRCS = \
 	AssemblyRef.cs

 DISTFILES = \
-	README.makefiles		\
+	README.makefiles.md		\
 	README.platforms		\
 	README.configury		\
 	config-default.make		\
@@ -41,6 +41,7 @@ DISTFILES = \
 	corcompare-api.xsl		\
 	executable.make			\
 	gensources.sh			\
+	gensources.cs			\
 	library.make			\
 	rules.make			\
 	tests.make			\
--- a/mcs/build/README.makefiles.md
+++ b/mcs/build/README.makefiles.md
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@@ -34,11 +34,11 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "5.14.0.177";
+	public const string MonoVersion = "5.16.0.100";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
-	public const int MonoCorlibVersion = 1051400005;
+	public const int MonoCorlibVersion = 1051600010;

 #if MOBILE
 	// Versions of .NET Framework for Silverlight 4.0
--- a/mcs/build/common/basic-profile-check.cs
+++ b/mcs/build/common/basic-profile-check.cs
@@ -1,14 +1,13 @@
 using System;

-class X {
-	// Check installed compiler
-	static void Generic<T> ()
-	{
-		// we use 'var' all around in the compiler sources
-		var x = new X ();
-	}
-	
-	void DefaultParametersAvailable (int i = 3)
+interface II
+{
+
+}
+
+class X
+{
+	static void Foo (II a = default (II), II b = default, II c = (II) null)
 	{
 	}

--- a/mcs/build/gensources.cs
+++ b/mcs/build/gensources.cs
@@ -0,0 +1,420 @@
+using System;
+using System.Text;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+public static class Program {
+    public static int Main (string[] _args) {
+        var args = new List<string> (_args);
+        bool useStdout = false, showHelp = false, strictMode = false;
+
+        for (int i = 0; i < args.Count; i++) {
+            var arg = args[i];
+            if (!arg.StartsWith ("-"))
+                continue;
+
+            switch (arg) {
+                case "-?":
+                case "--help":
+                case "-h":
+                    showHelp = true;
+                    break;
+                case "--trace":
+                case "--trace1":
+                    SourcesParser.TraceLevel = 1;
+                    break;
+                case "--trace2":
+                    SourcesParser.TraceLevel = 2;
+                    break;
+                case "--trace3":
+                    SourcesParser.TraceLevel = 3;
+                    break;
+                case "--trace4":
+                    SourcesParser.TraceLevel = 4;
+                    break;
+                case "--stdout":
+                    useStdout = true;
+                    break;
+                case "--strict":
+                    strictMode = true;
+                    break;
+                default:
+                    Console.Error.WriteLine ("Unrecognized switch " + arg);
+                    break;
+            }
+
+            args.RemoveAt (i);
+            i--;            
+        }
+
+        if (args.Count != 4)
+            showHelp = true;
+
+        if (showHelp) {
+            Console.Error.WriteLine ("Usage: mcs/build/gensources.exe [options] (outputFileName|--stdout) libraryDirectoryAndName platformName profileName");
+            Console.Error.WriteLine ("You can specify * for platformName and profileName to read all sources files");
+            Console.Error.WriteLine ("Available options:");
+            Console.Error.WriteLine ("--help -h -?");
+            Console.Error.WriteLine ("  Show command line info");
+            Console.Error.WriteLine ("--trace1 --trace2 --trace3 --trace4");
+            Console.Error.WriteLine ("  Enable diagnostic output");
+            Console.Error.WriteLine ("--stdout");
+            Console.Error.WriteLine ("  Writes results to standard output (omit outputFileName if you use this)");
+            Console.Error.WriteLine ("--strict");
+            Console.Error.WriteLine ("  Produces an error exit code if files or directories are invalid/missing");
+            return 1;
+        }
+
+        var myAssembly = Assembly.GetExecutingAssembly ();
+        var codeBase = new Uri (myAssembly.CodeBase);
+        var executablePath = Path.GetFullPath (codeBase.LocalPath);
+        var executableDirectory = Path.GetDirectoryName (executablePath);
+
+        var outFile = Path.GetFullPath (args[0]);
+        var libraryFullName = Path.GetFullPath (args[1]);
+        var platformName = args[2];
+        var profileName = args[3];
+        var platformsFolder = Path.Combine (executableDirectory, "platforms");
+        var profilesFolder = Path.Combine (executableDirectory, "profiles");
+
+        var libraryDirectory = Path.GetDirectoryName (libraryFullName);
+        var libraryName = Path.GetFileName (libraryFullName);
+
+        var parser = new SourcesParser (platformsFolder, profilesFolder);
+        var result = parser.Parse (libraryDirectory, libraryName, platformName, profileName);
+
+        if (SourcesParser.TraceLevel > 0)
+            Console.Error.WriteLine ($"// Writing sources for platform {platformName} and profile {profileName}, relative to {libraryDirectory}, to {outFile}.");
+
+        TextWriter output;
+        if (useStdout)
+            output = Console.Out;
+        else
+            output = new StreamWriter (outFile);
+
+        using (output) {
+            foreach (var fileName in result.GetFileNames ().OrderBy (s => s, StringComparer.Ordinal))
+                output.WriteLine (fileName);
+        }
+
+        if (strictMode)
+            return result.ErrorCount;
+        else
+            return 0;
+    }
+}
+
+public struct ParseEntry {
+    public string SourcesFileName;
+    public string Directory;
+    public string Pattern;
+    public string HostPlatform;
+    public string ProfileName;
+}
+
+public struct Source {
+    public string FileName;
+}
+
+public class ParseResult {
+    public readonly string LibraryDirectory, LibraryName;
+
+    public readonly List<ParseEntry> Sources = new List<ParseEntry> ();
+    public readonly List<ParseEntry> Exclusions = new List<ParseEntry> ();
+
+    // FIXME: This is a bad spot for this value but enumerators don't have outparam support
+    public int ErrorCount = 0;
+
+    public ParseResult (string libraryDirectory, string libraryName) {
+        LibraryDirectory = libraryDirectory;
+        LibraryName = libraryName;
+    }
+
+    private static string GetRelativePath (string fullPath, string relativeToDirectory) {
+        fullPath = fullPath.Replace (SourcesParser.DirectorySeparator, "/");
+        relativeToDirectory = relativeToDirectory.Replace (SourcesParser.DirectorySeparator, "/");
+
+        if (!relativeToDirectory.EndsWith (SourcesParser.DirectorySeparator))
+            relativeToDirectory += SourcesParser.DirectorySeparator;
+        var dirUri = new Uri (relativeToDirectory);
+        var pathUri = new Uri (fullPath);
+
+        var relativeUri = Uri.UnescapeDataString (
+            dirUri.MakeRelativeUri (pathUri).OriginalString
+        ).Replace ("/", SourcesParser.DirectorySeparator);
+
+        if (SourcesParser.TraceLevel >= 4)
+            Console.Error.WriteLine ($"// {fullPath} -> {relativeUri}");
+
+        return relativeUri;
+    }
+
+    private IEnumerable<string> EnumerateMatches (
+        IEnumerable<ParseEntry> entries,
+        string hostPlatformName, string profileName
+    ) {
+        foreach (var entry in entries) {
+            if (
+                (hostPlatformName != null) &&
+                (entry.HostPlatform ?? hostPlatformName) != hostPlatformName
+            )
+                continue;
+            if (
+                (profileName != null) &&
+                (entry.ProfileName ?? profileName) != profileName
+            )
+                continue;
+
+            var absolutePath = Path.Combine (entry.Directory, entry.Pattern);
+            var absoluteDirectory = Path.GetDirectoryName (absolutePath);
+            var absolutePattern = Path.GetFileName (absolutePath);
+
+            if (SourcesParser.TraceLevel >= 3) {
+                if ((absolutePattern != entry.Pattern) || (absoluteDirectory != entry.Directory))
+                    Console.Error.WriteLine ($"// {entry.Directory} / {entry.Pattern} -> {absoluteDirectory} / {absolutePattern}");
+            }            
+
+            if (!Directory.Exists (absoluteDirectory)) {
+                Console.Error.WriteLine ($"Directory does not exist: {Path.GetFullPath (absoluteDirectory)}");
+                ErrorCount += 1;
+                continue;
+            }
+
+            var matchingFiles = Directory.GetFiles (absoluteDirectory, absolutePattern);
+            foreach (var fileName in matchingFiles) {
+                var relativePath = GetRelativePath (fileName, LibraryDirectory);
+                yield return relativePath;
+            }
+        }
+    }
+
+    // If you loaded sources files for multiple profiles, you can use the arguments here
+    //  to filter the results
+    public IEnumerable<string> GetFileNames (
+        string hostPlatformName = null, string profileName = null
+    ) {
+        var encounteredFileNames = new HashSet<string> (StringComparer.Ordinal);
+
+        var excludedFiles = new HashSet<string> (
+            EnumerateMatches (Exclusions, hostPlatformName, profileName),
+            StringComparer.Ordinal
+        );
+
+        foreach (var fileName in EnumerateMatches (Sources, hostPlatformName, profileName)) {
+            if (excludedFiles.Contains (fileName)) {
+                if (SourcesParser.TraceLevel >= 3)
+                    Console.Error.WriteLine ($"// Excluding {fileName}");
+                continue;
+            }
+
+            // Skip duplicates
+            if (encounteredFileNames.Contains (fileName))
+                continue;
+
+            encounteredFileNames.Add (fileName);
+            yield return fileName;
+        }
+    }
+}
+
+public class SourcesParser {
+    public static readonly string DirectorySeparator = new String (Path.DirectorySeparatorChar, 1);    
+    public static int TraceLevel = 0;
+
+    private class State {
+        public ParseResult Result;
+        public string HostPlatform;
+        public string ProfileName;
+
+        public int SourcesFilesParsed, ExclusionsFilesParsed;
+
+        public List<ParseEntry> ParsedSources {
+            get {
+                return Result.Sources;
+            }
+        }
+
+        public List<ParseEntry> ParsedExclusions {
+            get {
+                return Result.Exclusions;
+            }
+        }
+    }
+
+    public readonly string[] AllHostPlatformNames;
+    public readonly string[] AllProfileNames;
+
+    private int ParseDepth = 0;
+
+    public SourcesParser (
+        string platformsFolder, string profilesFolder
+    ) {
+        AllHostPlatformNames = Directory.GetFiles (platformsFolder, "*.make")
+            .Select (Path.GetFileNameWithoutExtension)
+            .ToArray ();
+        AllProfileNames = Directory.GetFiles (profilesFolder, "*.make")
+            .Select (Path.GetFileNameWithoutExtension)
+            .ToArray ();
+    }
+
+    public ParseResult Parse (string libraryDirectory, string libraryName, string hostPlatform, string profile) {
+        var state = new State {
+            Result = new ParseResult (libraryDirectory, libraryName),
+            ProfileName = profile,
+            HostPlatform = hostPlatform
+        };
+
+        var testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{profile}_{libraryName}");
+        var ok = TryParseSingleFile (state, testPath + ".sources", false);
+        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+
+        if (ok) {
+            PrintSummary (state);
+            return state.Result;
+        }
+
+        state.HostPlatform = null;
+
+        testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}");
+        ok = TryParseSingleFile (state, testPath + ".sources", false);
+        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+
+        if (ok) {
+            PrintSummary (state);
+            return state.Result;
+        }
+
+        testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{libraryName}");
+        ok = TryParseSingleFile (state, testPath + ".sources", false);
+        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+
+        if (ok) {
+            PrintSummary (state);
+            return state.Result;
+        }
+
+        state.ProfileName = null;
+
+        testPath = Path.Combine (libraryDirectory, libraryName);
+        TryParseSingleFile (state, testPath + ".sources", false);
+        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+
+        PrintSummary (state);
+
+        return state.Result;
+    }
+
+    public ParseResult Parse (string libraryDirectory, string libraryName) {
+        var state = new State {
+            Result = new ParseResult (libraryDirectory, libraryName)
+        };
+
+        string testPath = Path.Combine (libraryDirectory, libraryName);
+        TryParseSingleFile (state, testPath + ".sources", false);
+        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+
+        foreach (var profile in AllProfileNames) {
+            state.ProfileName = profile;
+
+            foreach (var hostPlatform in AllHostPlatformNames) {
+                state.HostPlatform = hostPlatform;
+
+                testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{profile}_{libraryName}");
+                TryParseSingleFile (state, testPath + ".sources", false);
+                TryParseSingleFile (state, testPath + ".exclude.sources", true);
+            }
+
+            state.HostPlatform = null;
+
+            testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}");
+            TryParseSingleFile (state, testPath + ".sources", false);
+            TryParseSingleFile (state, testPath + ".exclude.sources", true);
+        }
+
+        PrintSummary (state);
+
+        return state.Result;
+    }
+
+    private void PrintSummary (State state) {
+        if (TraceLevel > 0)
+            Console.Error.WriteLine ($"// Parsed {state.SourcesFilesParsed} sources file(s) and {state.ExclusionsFilesParsed} exclusions file(s).");
+    }
+
+    private void HandleMetaDirective (State state, string directory, bool asExclusionsList, string directive) {
+        var include = "#include ";
+        if (directive.StartsWith (include))
+            ParseSingleFile (state, Path.Combine (directory, directive.Substring (include.Length)), asExclusionsList);
+    }
+
+    private bool TryParseSingleFile (State state, string fileName, bool asExclusionsList) {
+        if (!File.Exists (fileName))
+            return false;
+
+        ParseSingleFile (state, fileName, asExclusionsList);
+        return true;
+    }
+
+    private void ParseSingleFile (State state, string fileName, bool asExclusionsList) {
+        var nullStr = "<none>";
+        if (TraceLevel >= 1)
+            Console.Error.WriteLine ($"// {new String (' ', ParseDepth * 2)}{fileName}  [{state.HostPlatform ?? nullStr}] [{state.ProfileName ?? nullStr}]");
+        ParseDepth += 1;
+
+        var directory = Path.GetDirectoryName (fileName);
+
+        using (var sr = new StreamReader (fileName)) {
+            if (asExclusionsList)
+                state.ExclusionsFilesParsed++;
+            else
+                state.SourcesFilesParsed++;
+
+            string line;
+            while ((line = sr.ReadLine ()) != null) {
+                if (String.IsNullOrWhiteSpace (line))
+                    continue;
+
+                if (line.StartsWith ("#")) {
+                    HandleMetaDirective (state, directory, asExclusionsList, line);
+                    continue;
+                }
+
+                var parts = line.Split (':');
+
+                if (parts.Length > 1) {
+                    var explicitExclusions = parts[1].Split (',');
+
+                    // gensources.sh implemented these explicit exclusions like so:
+                    // ../foo/bar/*.cs:A.cs,B.cs
+                    // This would generate exclusions for ../foo/bar/A.cs and ../foo/bar/B.cs,
+                    //  not ./A.cs and ./B.cs as you might expect
+
+                    var mainPatternDirectory = Path.GetDirectoryName (parts[0]);
+
+                    foreach (var pattern in explicitExclusions) {
+                        state.ParsedExclusions.Add (new ParseEntry {
+                            SourcesFileName = fileName,
+                            Directory = directory,
+                            Pattern = Path.Combine (mainPatternDirectory, pattern),
+                            HostPlatform = state.HostPlatform,
+                            ProfileName = state.ProfileName
+                        });
+                    }
+                }
+
+                (asExclusionsList ? state.ParsedExclusions : state.ParsedSources)
+                    .Add (new ParseEntry {
+                        SourcesFileName = fileName,
+                        Directory = directory,
+                        Pattern = parts[0],
+                        HostPlatform = state.HostPlatform,
+                        ProfileName = state.ProfileName
+                    });
+            }
+        }
+
+        ParseDepth -= 1;
+    }
+}
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -224,7 +224,7 @@ test-local run-test-local run-test-ondotnet-local:
 ccomma = ,
 define RESOURCE_template
 $(1).resources: $(2)
-	$(RESGEN) "$$<" "$$@"
+	$$(RESGEN) "$$<" "$$@"

 GEN_RESOURCE_DEPS += $(1).resources
 GEN_RESOURCE_FLAGS += -resource:$(1).resources
@@ -298,11 +298,19 @@ endif
 PROFILE_sources := $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).sources)) $(wildcard $(PROFILE)_$(LIBRARY).sources) $(wildcard $(LIBRARY).sources))
 PROFILE_excludes = $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).exclude.sources)) $(wildcard $(PROFILE)_$(LIBRARY).exclude.sources))

-# Note, gensources.sh can create a $(sourcefile).makefrag if it sees any '#include's
-# We don't include it in the dependencies since it isn't always created
+gensources = $(topdir)/build/gensources.exe
+$(gensources): $(topdir)/build/gensources.cs
+	$(BOOTSTRAP_MCS) -noconfig -debug:portable -r:mscorlib.dll -r:System.dll -r:System.Core.dll -out:$(gensources) $(topdir)/build/gensources.cs
+
+ifdef PROFILE_RUNTIME
+GENSOURCES_RUNTIME = $(PROFILE_RUNTIME)
+else
+GENSOURCES_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"  $(RUNTIME)
+endif
+
 sourcefile = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).sources
-$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(topdir)/build/gensources.sh $(depsdir)/.stamp
-	$(SHELL) $(topdir)/build/gensources.sh $@ '$(PROFILE_sources)' '$(PROFILE_excludes)'
+$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(depsdir)/.stamp $(gensources)
+	$(GENSOURCES_RUNTIME) --debug $(gensources) "$@" "$(LIBRARY)" "$(PROFILE_PLATFORM)" "$(PROFILE)"

 library_CLEAN_FILES += $(sourcefile)

@@ -390,9 +398,9 @@ gen-deps:

 update-corefx-sr-generic:
 ifneq ($(RESX_STRINGS),)
-	MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_STRINGS) >$(SR_OUTPUT)
+	MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_EXTRA_ARGUMENTS) $(RESX_STRINGS) >$(SR_OUTPUT)
 endif

 update-corefx-sr: $(RESX_RESOURCE_STRING) $(XTEST_RESX_RESOURCE_STRING)
-	make SR_OUTPUT=corefx/SR.cs RESX_STRINGS="$(RESX_RESOURCE_STRING)" update-corefx-sr-generic \
-	&& make SR_OUTPUT=corefx/SR.tests.cs RESX_STRINGS=$(XTEST_RESX_RESOURCE_STRING) update-corefx-sr-generic
+	make SR_OUTPUT=corefx/SR.cs RESX_STRINGS="$(RESX_RESOURCE_STRING)" RESX_EXTRA_ARGUMENTS="$(RESX_EXTRA_ARGUMENTS)" update-corefx-sr-generic \
+	&& make SR_OUTPUT=corefx/SR.tests.cs RESX_STRINGS=$(XTEST_RESX_RESOURCE_STRING) update-corefx-sr-generic
--- a/mcs/build/profiles/basic.make
+++ b/mcs/build/profiles/basic.make
@@ -115,7 +115,7 @@ endif

 $(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs
 	$(MAKE) $(MAKE_Q) -C $(topdir)/packages
-	$(BOOTSTRAP_MCS) /warn:0 /noconfig /r:System.dll /r:mscorlib.dll /out:$@ $<
+	$(BOOTSTRAP_MCS) /warn:0 /noconfig /langversion:latest /r:System.dll /r:mscorlib.dll /out:$@ $<

 $(PROFILE_OUT): $(PROFILE_EXE)
 	$(PROFILE_RUNTIME) $< > $@ 2>&1
--- a/mcs/build/profiles/net_4_x.make
+++ b/mcs/build/profiles/net_4_x.make
@@ -13,7 +13,7 @@ profile-check:
 	@:

 DEFAULT_REFERENCES = mscorlib
-PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
+PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
 API_BIN_PROFILE = v4.7.1

 FRAMEWORK_VERSION = 4.5
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -161,7 +161,7 @@ gacutil = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/gacutil.exe
 GACUTIL = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
 endif

-STD_TARGETS = test run-test run-xunit-test run-test-ondotnet clean install uninstall doc-update
+STD_TARGETS = test xunit-test run-test run-xunit-test run-test-ondotnet clean install uninstall doc-update

 $(STD_TARGETS): %: do-%

--- a/mcs/build/tests.make
+++ b/mcs/build/tests.make
@@ -29,7 +29,8 @@ XTEST_REMOTE_EXECUTOR = $(topdir)/class/lib/$(PROFILE)/RemoteExecutorConsoleApp.
 xunit_src += $(topdir)/../mcs/class/test-helpers/AdminHelper.cs \
 $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/IO/FileCleanupTestBase.cs \
 $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs \
-$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs
+$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs \
+$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.Unix.cs

 ifeq ($(PROFILE),monodroid)
 xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
@@ -216,8 +217,8 @@ endif
 ## FIXME: i18n problem in the 'sed' command below
 run-test-lib: test-local test-local-aot-compile patch-nunitlite-appconfig
 	ok=:; \
-	PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" MONO_REGISTRY_PATH="$(HOME)/.mono/registry" MONO_TESTS_IN_PROGRESS="yes" $(TEST_HARNESS_EXEC) $(test_assemblies) $(NOSHADOW_FLAG) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(LABELS_ARG) -format:nunit2 -result:TestResult-$(PROFILE).xml $(FIXTURE_ARG) $(TESTNAME_ARG)|| ok=false; \
-	if [ ! -f "TestResult-$(PROFILE).xml" ]; then echo "<?xml version='1.0' encoding='utf-8'?><test-results failures='1' total='1' not-run='0' name='bcl-tests' date='$$(date +%F)' time='$$(date +%T)'><test-suite name='$(strip $(test_assemblies))' success='False' time='0'><results><test-case name='crash' executed='True' success='False' time='0'><failure><message>The test runner didn't produce a test result XML, probably due to a crash of the runtime. Check the log for more details.</message><stack-trace></stack-trace></failure></test-case></results></test-suite></test-results>" > TestResult-$(PROFILE).xml; fi; \
+	PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" MONO_REGISTRY_PATH="$(HOME)/.mono/registry" MONO_TESTS_IN_PROGRESS="yes" DBG_RUNTIME_ARGS="$(TEST_RUNTIME_FLAGS)" $(TEST_HARNESS_EXEC) $(test_assemblies) $(NOSHADOW_FLAG) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(LABELS_ARG) -format:nunit2 -result:TestResult-$(PROFILE).xml $(FIXTURE_ARG) $(TESTNAME_ARG)|| ok=false; \
+	if [ ! -f "TestResult-$(PROFILE).xml" ]; then echo "<?xml version='1.0' encoding='utf-8'?><test-results failures='1' total='1' not-run='0' name='bcl-tests' date='$$(date +%F)' time='$$(date +%T)'><test-suite name='$(strip $(test_assemblies))' success='False' time='0'><results><test-case name='$(notdir $(strip $(test_assemblies))).crash' executed='True' success='False' time='0'><failure><message>The test runner didn't produce a test result XML, probably due to a crash of the runtime. Check the log for more details.</message><stack-trace></stack-trace></failure></test-case></results></test-suite></test-results>" > TestResult-$(PROFILE).xml; fi; \
 	$$ok

 ## Instructs compiler to compile to target .net execution, it can be usefull in rare cases when runtime detection is not possible
@@ -273,6 +274,11 @@ XTEST_HARNESS_PATH := $(topdir)/../external/xunit-binaries
 XTEST_HARNESS = $(XTEST_HARNESS_PATH)/xunit.console.exe
 XTEST_HARNESS_FLAGS := -noappdomain -noshadow -parallel none -nunit TestResult-$(PROFILE)-xunit.xml
 XTEST_TRAIT := -notrait category=failing -notrait category=nonmonotests -notrait Benchmark=true -notrait category=outerloop
+# The logic is double inverted so this actually excludes tests not intented for current platform
+# best to search for `property name="category"` in the xml output to see what's going on
+# https://github.com/dotnet/buildtools/blob/master/src/xunit.netcore.extensions/Discoverers/PlatformSpecificDiscoverer.cs
+XTEST_TRAIT_PLATFORM := -notrait category=non$(XTEST_PLATFORM)tests
+
 TEST_MONO_PATH := $(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$(XTEST_HARNESS_PATH)

 ifdef FIXTURE
@@ -295,7 +301,7 @@ run-xunit-test-local: run-xunit-test-lib
 run-xunit-test-lib: xunit-test-local $(XTEST_REMOTE_EXECUTOR)
 	@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.desktop.dll xunit.execution.desktop.dll
 	ok=:; \
-	PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR=$(XTEST_REMOTE_EXECUTOR) $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) || ok=false; \
+	PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR=$(XTEST_REMOTE_EXECUTOR) $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \
 	$$ok
 	@rm -f xunit.execution.desktop.dll

--- a/mcs/class/Facades/System.Memory/TypeForwarders.cs
+++ b/mcs/class/Facades/System.Memory/TypeForwarders.cs
@@ -24,24 +24,20 @@
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Memory<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlyMemory<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlySpan<>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Span<>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.BuffersExtensions))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IBufferWriter<>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IMemoryOwner<>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IPinnable))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryManager<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryHandle))]
-[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.OperationStatus))]
-[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.StandardFormat))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryPool<>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Binary.BinaryPrimitives))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Base64))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Formatter))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Parser))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MemoryMarshal))]
-
-// TODO: we don't have these types yet
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))]  
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.BuffersExtensions))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IBufferWriter<>))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IMemoryOwner<>))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IPinnable))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryManager<>))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryPool<>))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Base64))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Formatter))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Parser))]
-//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SequenceMarshal))]
+[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SequenceMarshal))]
--- a/mcs/class/Facades/System.Runtime.Extensions/Makefile
+++ b/mcs/class/Facades/System.Runtime.Extensions/Makefile
@@ -10,7 +10,7 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
 LIBRARY = System.Runtime.Extensions.dll

 KEYFILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /nowarn:1616,1699
+SIGN_FLAGS = /delaysign /nowarn:1616,1699,618
 LIB_REFS = System
 LIB_MCS_FLAGS = $(SIGN_FLAGS) 

--- a/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.cs
+++ b/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.cs
@@ -26,6 +26,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Environment))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.IO.Path))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Math))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MathF))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.MidpointRounding))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.WebUtility))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Progress<>))]
--- a/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.netcore.cs
+++ b/mcs/class/Facades/System.Runtime.Extensions/TypeForwarders.netcore.cs
@@ -0,0 +1,78 @@
+//
+// TypeForwarders.netcore.cs: .NET Core specific extensions
+//
+// Authors:
+//	Marek Safar  <marek.safar@gmail.com>
+//
+// Copyright  (C) 2018  Microsoft Corporation
+//
+// 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.AssemblyLoadEventArgs))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AssemblyLoadEventHandler))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Base64FormattingOptions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.Comparer))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.EnvironmentVariableTarget))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.GlobalizationExtensions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.BinaryReader))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.BinaryWriter))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.EndOfStreamException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.MemoryStream))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.StreamReader))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.StreamWriter))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.TextReader))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.TextWriter))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ResolveEventHandler))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AppDomain))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AppDomainUnloadedException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ApplicationId))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.CannotUnloadAppDomainException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ContextBoundObject))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ContextMarshalException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ContextStaticAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.LoaderOptimization))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.LoaderOptimizationAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.OperatingSystem))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.PlatformID))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.StringNormalizationExtensions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.IPermission))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.ISecurityEncodable))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityElement))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.CodeAccessSecurityAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.SecurityAction))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.SecurityAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.SecurityPermissionAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Permissions.SecurityPermissionFlag))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.ArrayList))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.Hashtable))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.IHashCodeProvider))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ComponentGuaranteesAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ResourceConsumptionAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ComponentGuaranteesOptions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ResourceExposureAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.ResourceScope))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Versioning.VersioningHelper))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AssemblyNameProxy))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.StringReader))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.StringWriter))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.BufferedStream))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.InvalidDataException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.CodeDom.Compiler.IndentedTextWriter))]
--- a/mcs/class/Facades/System.Runtime.Extensions/net_4_x_System.Runtime.Extensions.dll.sources
+++ b/mcs/class/Facades/System.Runtime.Extensions/net_4_x_System.Runtime.Extensions.dll.sources
@@ -0,0 +1,2 @@
+#include System.Runtime.Extensions.dll.sources
+TypeForwarders.netcore.cs
--- a/mcs/class/Facades/System.Runtime/Makefile
+++ b/mcs/class/Facades/System.Runtime/Makefile
@@ -10,7 +10,7 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
 LIBRARY = System.Runtime.dll

 KEYFILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /nowarn:1616,1699
+SIGN_FLAGS = /delaysign /nowarn:1616,1699,618
 LIB_REFS = System System.ComponentModel.Composition System.Core
 LIB_MCS_FLAGS = $(SIGN_FLAGS)

--- a/mcs/class/Facades/System.Runtime/TypeForwarders.netcore.cs
+++ b/mcs/class/Facades/System.Runtime/TypeForwarders.netcore.cs
@@ -0,0 +1,311 @@
+//
+// TypeForwarders.netcore.cs: .NET Core specific extensions
+//
+// Authors:
+//	Marek Safar  <marek.safar@gmail.com>
+//
+// Copyright  (C) 2018  Microsoft Corporation
+//
+// 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 (Microsoft.Win32.SafeHandles.CriticalHandleMinusOneIsInvalid))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.CriticalHandleZeroOrMinusOneIsInvalid))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.SafeFileHandle))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.SafeHandleMinusOneIsInvalid))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (Microsoft.Win32.SafeHandles.SafeWaitHandle))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AccessViolationException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AggregateException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.AppContext))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ApplicationException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.IMemoryOwner<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.IPinnable))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.MemoryHandle))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.MemoryManager<>))]
+//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.ReadOnlySpanAction<,>))]
+//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Buffers.SpanAction<,>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.CharEnumerator))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Collections.Generic.KeyValuePair))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Configuration.Assemblies.AssemblyHashAlgorithm))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Configuration.Assemblies.AssemblyVersionCompatibility))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Converter<,>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.DBNull))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.DuplicateWaitObjectException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.EntryPointNotFoundException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ExecutionEngineException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.FileStyleUriParser))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.FtpStyleUriParser))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.GCNotificationStatus))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.GenericUriParser))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.GenericUriParserOptions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.Calendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CalendarAlgorithmType))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CalendarWeekRule))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CharUnicodeInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.ChineseLunisolarCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CompareInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CompareOptions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CultureInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CultureNotFoundException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.CultureTypes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.DateTimeFormatInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.DaylightTime))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.DigitShapes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.EastAsianLunisolarCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.GregorianCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.GregorianCalendarTypes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.HebrewCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.HijriCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.IdnMapping))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.JapaneseCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.JapaneseLunisolarCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.JulianCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.KoreanCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.KoreanLunisolarCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.NumberFormatInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.PersianCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.RegionInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.SortKey))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.SortVersion))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.StringInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.TaiwanCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.TaiwanLunisolarCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.TextElementEnumerator))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.TextInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.ThaiBuddhistCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.UmAlQuraCalendar))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Globalization.UnicodeCategory))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.GopherStyleUriParser))]
+//[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.HashCode))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.HttpStyleUriParser))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ICloneable))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.InsufficientMemoryException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileAccess))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileMode))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileOptions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileShare))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.FileStream))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.SeekOrigin))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.IO.Stream))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.LdapStyleUriParser))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.MarshalByRefObject))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Memory<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.MidpointRounding))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ModuleHandle))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.MulticastNotSupportedException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NetPipeStyleUriParser))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NetTcpStyleUriParser))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NewsStyleUriParser))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NonSerializedAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.NotFiniteNumberException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ReadOnlyMemory<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ReadOnlySpan<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AmbiguousMatchException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Assembly))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AssemblyAlgorithmIdAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AssemblyContentType))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.AssemblyName))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Binder))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.BindingFlags))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CallingConventions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ConstructorInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeData))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeExtensions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeFormatException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeNamedArgument))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.CustomAttributeTypedArgument))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.EventAttributes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.EventInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ExceptionHandlingClause))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ExceptionHandlingClauseOptions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.FieldAttributes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.FieldInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.GenericParameterAttributes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ICustomAttributeProvider))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ImageFileMachine))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.InterfaceMapping))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.IntrospectionExtensions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.InvalidFilterCriteriaException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.IReflect))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.IReflectableType))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.LocalVariableInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ManifestResourceInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MemberFilter))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MemberInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MemberTypes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodAttributes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodBase))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodBody))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodImplAttributes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.MethodInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Missing))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Module))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ModuleResolveEventHandler))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ObfuscateAssemblyAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ObfuscationAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ParameterAttributes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ParameterInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ParameterModifier))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.Pointer))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.PortableExecutableKinds))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.PropertyAttributes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.PropertyInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ReflectionContext))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ReflectionTypeLoadException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ResourceAttributes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.ResourceLocation))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.StrongNameKeyPair))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TargetException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TargetInvocationException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TargetParameterCountException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TypeAttributes))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TypeDelegator))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TypeFilter))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Reflection.TypeInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ResolveEventArgs))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.AsyncMethodBuilderAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.CompilationRelaxations))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.CompilerGlobalScopeAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ConfiguredTaskAwaitable))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ConfiguredTaskAwaitable<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.DefaultDependencyAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.DependencyAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.DiscardableAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.FixedAddressValueTypeAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.IAsyncStateMachine))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ICriticalNotifyCompletion))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.INotifyCompletion))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.IsByRefLikeAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.IsReadOnlyAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ITuple))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.LoadHint))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.MethodCodeType))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.RuntimeFeature))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.RuntimeWrappedException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.SpecialNameAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.StringFreezingAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.SuppressIldasmAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.TaskAwaiter))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.TaskAwaiter<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.TupleElementNamesAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ValueTaskAwaiter))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.ValueTaskAwaiter<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.CompilerServices.YieldAwaitable))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ConstrainedExecution.Cer))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ConstrainedExecution.Consistency))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ConstrainedExecution.CriticalFinalizerObject))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ConstrainedExecution.ReliabilityContractAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptionsAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.InteropServices.CriticalHandle))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.InteropServices.ExternalException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.InteropServices.InAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.InteropServices.SafeHandle))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.MemoryFailPoint))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.IDeserializationCallback))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.IFormatterConverter))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.IObjectReference))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.ISafeSerializationData))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.ISerializable))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OnDeserializedAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OnDeserializingAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OnSerializedAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OnSerializingAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.OptionalFieldAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SafeSerializationEventArgs))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SerializationEntry))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SerializationException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SerializationInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.SerializationInfoEnumerator))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.StreamingContext))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Runtime.Serialization.StreamingContextStates))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.RuntimeArgumentHandle))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.Cryptography.CryptographicException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.PartialTrustVisibilityLevel))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityCriticalScope))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityRulesAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityRuleSet))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SecurityTreatAsSafeAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.SuppressUnmanagedCodeSecurityAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Security.UnverifiableCodeAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.SerializableAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Span<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.StackOverflowException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.SystemException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.Decoder))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderExceptionFallback))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderExceptionFallbackBuffer))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderFallback))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderFallbackBuffer))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderFallbackException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderReplacementFallback))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.DecoderReplacementFallbackBuffer))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.Encoder))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderExceptionFallback))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderExceptionFallbackBuffer))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderFallback))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderFallbackBuffer))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderFallbackException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderReplacementFallback))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncoderReplacementFallbackBuffer))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.Encoding))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncodingInfo))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.EncodingProvider))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Text.NormalizationForm))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.CancellationToken))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.CancellationTokenRegistration))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Sources.IValueTaskSource))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Sources.IValueTaskSource<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Sources.ValueTaskSourceStatus))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Task))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskContinuationOptions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskCreationOptions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskFactory))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskFactory<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskScheduler))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.TaskStatus))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.Task<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.UnobservedTaskExceptionEventArgs))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.ValueTask))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.Threading.Tasks.ValueTask<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TimeZone))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TimeZoneNotFoundException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TupleExtensions))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TypedReference))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.TypeUnloadedException))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.UnhandledExceptionEventArgs))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.UnhandledExceptionEventHandler))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.UriParser))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.UriPartial))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,,>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,,,>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,,,,>))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute (typeof (System.ValueTuple<,,,,,,,>))]
--- a/mcs/class/Facades/System.Runtime/net_4_x_System.Runtime.dll.sources
+++ b/mcs/class/Facades/System.Runtime/net_4_x_System.Runtime.dll.sources
@@ -0,0 +1,2 @@
+#include System.Runtime.dll.sources
+TypeForwarders.netcore.cs
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -424,7 +424,7 @@ monolite_dir = monolite-$(HOST_PLATFORM)/$(MONO_CORLIB_VERSION)

 # Files needed to bootstrap C# compiler and cil-stringreplacer
 build_files := mscorlib.dll System.dll System.Xml.dll Mono.Security.dll System.Core.dll System.Security.dll System.Configuration.dll \
-	System.Numerics.dll System.Xml.Linq.dll \
+	System.Numerics.dll System.Xml.Linq.dll System.IO.Compression.dll \
 	Facades/System.Collections.Concurrent.dll Facades/System.Linq.dll Facades/System.Runtime.dll Facades/System.Collections.dll	\
 	Facades/System.Reflection.Extensions.dll Facades/System.Text.Encoding.Extensions.dll Facades/System.Diagnostics.Debug.dll \
 	Facades/System.Reflection.Primitives.dll Facades/System.Text.Encoding.dll Facades/System.Diagnostics.Tools.dll Facades/System.Reflection.dll \
--- a/Show More
+++ b/Show More