Rework genproj to use gensources to build sources list for each profile and host platform (#8985)

* Update genproj makefile to include gensources Update genproj argument parser to be more generous about displaying help * Checkpoint * Checkpoint * Checkpoint * Checkpoint * Checkpoint * Checkpoint * Checkpoint * Checkpoint * Fix rebase issue * Checkpoint * Checkpoint * Fix built sources only being added to one profile * Fix typo * Checkpoint * Fix indentation * Use csc instead of mcs * Checkpoint * Fix BUILT_SOURCES only being handled for the first profile processed * Checkpoint * Checkpoint * Strip double slashes from paths to fix spurious csproj change * Checkpoint * Checkpoint * Checkpoint * Checkpoint: Fix genproj compilation * Checkpoint * Checkpoint * Checkpoint * Fix crash when no targets were loaded (due to an error) * Checkpoint * Checkpoint * Checkpoint * Fix TryParseTargetInto bug * Checkpoint * Shuffle exclude logic around so that it works correctly during genproj diffing * Remove gensources tracing * Checkpoint * Fix handling of oddball sources paths from executable.make * Fix jay not being set to build * Fix wrong slashes being used for embedded resource paths * [csproj] Update project files
author: Katelyn Gadd <kg@luminance.org> 2018-06-29 09:01:31 +0300
committer: Marek Safar <marek.safar@gmail.com> 2018-06-29 09:01:31 +0300
commit: e271c293ee7a364a853a30f8574830ea84e0481a (patch)
tree: 2cf0d6da865890a2498d6ebb3beebf3b91532041 /mcs
parent: 57b474ba90c4224c0ed0db618c2cf212cd1a0bf4 (diff)
352 files changed, 6585 insertions, 5160 deletions
diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 5a39dd9501a..29abac599a5 100644
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -191,6 +191,7 @@ csproj-local:
 	echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
 	(echo $(is_boot); \
 	echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(patsubst %,-r:%,$(LIB_REFS)); \
+	echo $(sourcefile); \
 	echo $(PROGRAM); \
 	echo $(BUILT_SOURCES_cmdline); \
 	echo $(build_lib); \
diff --git a/mcs/build/gensources.cs b/mcs/build/gensources.cs
index 241cc96730e..d596cda47f4 100644
--- a/mcs/build/gensources.cs
+++ b/mcs/build/gensources.cs
@@ -74,8 +74,8 @@ public static class Program {
 
         var outFile = Path.GetFullPath (args[0]);
         var libraryFullName = Path.GetFullPath (args[1]);
-        var platformName = args[2];
-        var profileName = args[3];
+        var platformName = args[2].Trim ();
+        var profileName = args[3].Trim ();
         var platformsFolder = Path.Combine (executableDirectory, "platforms");
         var profilesFolder = Path.Combine (executableDirectory, "profiles");
 
@@ -95,7 +95,12 @@ public static class Program {
             output = new StreamWriter (outFile);
 
         using (output) {
-            foreach (var fileName in result.GetFileNames ().OrderBy (s => s, StringComparer.Ordinal))
+            var fileNames = result.GetMatches ()
+                .OrderBy (e => e.RelativePath, StringComparer.Ordinal)
+                .Select (e => e.RelativePath)
+                .Distinct();
+
+            foreach (var fileName in fileNames)
                 output.WriteLine (fileName);
         }
 
@@ -106,23 +111,48 @@ public static class Program {
     }
 }
 
+public class SourcesFile {
+    public readonly string FileName;
+    public readonly bool   IsExclusion;
+
+    public readonly List<ParseEntry>  Sources = new List<ParseEntry> ();
+    public readonly List<ParseEntry>  Exclusions = new List<ParseEntry> ();
+    public readonly List<SourcesFile> Includes = new List<SourcesFile> ();
+
+    public SourcesFile (string fileName, bool isExclusion) {
+        FileName = fileName;
+        IsExclusion = isExclusion;
+    }
+}
+
 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 struct MatchEntry {
+    public SourcesFile SourcesFile;
+    public string RelativePath;
+}
+
+public class TargetParseResult {
+    public (string hostPlatform, string profile) Key;
+    public SourcesFile Sources, Exclusions;
+    public bool IsFallback;
+
+    public override string ToString () {
+        var fallbackString = IsFallback ? " fallback" : "";
+        return $"{Key}{fallbackString} -> [{Sources?.FileName}, {Exclusions?.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> ();
+    public readonly Dictionary<(string hostPlatform, string profile), TargetParseResult> TargetDictionary = new Dictionary<(string hostPlatform, string profile), TargetParseResult> ();
+
+    public readonly Dictionary<string, SourcesFile> SourcesFiles = new Dictionary<string, SourcesFile> ();
+    public readonly Dictionary<string, SourcesFile> ExclusionFiles = new Dictionary<string, SourcesFile> ();
 
     // FIXME: This is a bad spot for this value but enumerators don't have outparam support
     public int ErrorCount = 0;
@@ -132,54 +162,52 @@ public class ParseResult {
         LibraryName = libraryName;
     }
 
+    public IEnumerable<TargetParseResult> Targets {
+        get {
+            return TargetDictionary.Values;
+        }
+    }
+
     private static string GetRelativePath (string fullPath, string relativeToDirectory) {
-        fullPath = fullPath.Replace (SourcesParser.DirectorySeparator, "/");
-        relativeToDirectory = relativeToDirectory.Replace (SourcesParser.DirectorySeparator, "/");
+        fullPath = fullPath.Replace ("\\", "/");
+        relativeToDirectory = relativeToDirectory.Replace ("\\", "/");
 
-        if (!relativeToDirectory.EndsWith (SourcesParser.DirectorySeparator))
-            relativeToDirectory += SourcesParser.DirectorySeparator;
+        if (!relativeToDirectory.EndsWith ("/"))
+            relativeToDirectory += "/";
         var dirUri = new Uri (relativeToDirectory);
         var pathUri = new Uri (fullPath);
 
-        var relativeUri = Uri.UnescapeDataString (
+        var relativePath = Uri.UnescapeDataString (
             dirUri.MakeRelativeUri (pathUri).OriginalString
         ).Replace ("/", SourcesParser.DirectorySeparator)
          .Replace (SourcesParser.DirectorySeparator + SourcesParser.DirectorySeparator, SourcesParser.DirectorySeparator);
 
+        /*
         if (SourcesParser.TraceLevel >= 4)
-            Console.Error.WriteLine ($"// {fullPath} -> {relativeUri}");
+            Console.Error.WriteLine ($"// {fullPath} -> {relativePath}");
+        */
 
-        return relativeUri;
+        return relativePath;
     }
 
-    private IEnumerable<string> EnumerateMatches (
-        IEnumerable<ParseEntry> entries,
-        string hostPlatformName, string profileName
+    public IEnumerable<MatchEntry> EnumerateMatches (
+        SourcesFile sourcesFile,
+        IEnumerable<ParseEntry> entries
     ) {
         var patternChars = new [] { '*', '?' };
-        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).Trim ();
+        foreach (var entry in entries) {
+            var absolutePath = Path.Combine (entry.Directory, entry.Pattern);
             var absoluteDirectory = Path.GetDirectoryName (absolutePath);
             var absolutePattern = Path.GetFileName (absolutePath);
 
-            if (SourcesParser.TraceLevel >= 3) {
+            if (SourcesParser.TraceLevel >= 4) {
                 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)}");
+                Console.Error.WriteLine ($"Directory does not exist: '{Path.GetFullPath (absoluteDirectory)}'");
                 ErrorCount += 1;
                 continue;
             }
@@ -187,13 +215,16 @@ public class ParseResult {
             if (absolutePattern.IndexOfAny (patternChars) >= 0) {
                 var matchingFiles = Directory.GetFiles (absoluteDirectory, absolutePattern);
                 if (matchingFiles.Length == 0) {
-                    Console.Error.WriteLine ($"// No matches for pattern '{absolutePattern}'");
-                    ErrorCount += 1;
+                    if (SourcesParser.TraceLevel > 0)
+                        Console.Error.WriteLine ($"// No matches for pattern '{absolutePattern}'");
                 }
 
                 foreach (var fileName in matchingFiles) {
                     var relativePath = GetRelativePath (fileName, LibraryDirectory);
-                    yield return relativePath;
+                    yield return new MatchEntry {
+                        SourcesFile = sourcesFile,
+                        RelativePath = relativePath,
+                    };
                 }
             } else {
                 if (!File.Exists (absolutePath)) {
@@ -201,38 +232,71 @@ public class ParseResult {
                     ErrorCount += 1;
                 } else {
                     var relativePath = GetRelativePath (absolutePath, LibraryDirectory);
-                    yield return relativePath;
+                    yield return new MatchEntry {
+                        SourcesFile = sourcesFile,
+                        RelativePath = 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
+    private IEnumerable<MatchEntry> GetMatchesFromFile (
+        SourcesFile sourcesFile, HashSet<string> excludedFiles = null
     ) {
-        var encounteredFileNames = new HashSet<string> (StringComparer.Ordinal);
+        if (sourcesFile == null)
+            yield break;
+
+        if (excludedFiles == null)
+            excludedFiles = new HashSet<string> (StringComparer.Ordinal);
 
-        var excludedFiles = new HashSet<string> (
-            EnumerateMatches (Exclusions, hostPlatformName, profileName),
-            StringComparer.Ordinal
-        );
+        foreach (var m in EnumerateMatches (sourcesFile, sourcesFile.Exclusions))
+            excludedFiles.Add (m.RelativePath);
 
-        foreach (var fileName in EnumerateMatches (Sources, hostPlatformName, profileName)) {
-            if (excludedFiles.Contains (fileName)) {
+        foreach (var include in sourcesFile.Includes) {
+            foreach (var m in GetMatchesFromFile (include, excludedFiles))
+                yield return m;
+        }
+
+        // FIXME: This is order-sensitive
+        foreach (var entry in EnumerateMatches (sourcesFile, sourcesFile.Sources)) {
+            if (excludedFiles.Contains (entry.RelativePath)) {
                 if (SourcesParser.TraceLevel >= 3)
-                    Console.Error.WriteLine ($"// Excluding {fileName}");
+                    Console.Error.WriteLine ($"// Excluding {entry.RelativePath}");
                 continue;
             }
 
-            // Skip duplicates
-            if (encounteredFileNames.Contains (fileName))
-                continue;
+            yield return entry;
+        }
+    }
 
-            encounteredFileNames.Add (fileName);
-            yield return fileName;
+    public IEnumerable<MatchEntry> GetMatches (TargetParseResult target = null) {
+        var excludedFiles = new HashSet<string> (StringComparer.Ordinal);
+
+        if (target == null) {
+            if (TargetDictionary.Count == 0)
+                yield break;
+
+            target = Targets.First ();
         }
+
+        if (target == null)
+            throw new ArgumentNullException ("target");
+
+        if (SourcesParser.TraceLevel >= 3)
+            Console.Error.WriteLine ($"// Scanning sources file tree for {target.Key}");
+
+        int count = 0;
+        foreach (var m in GetMatchesFromFile (target.Exclusions, excludedFiles))
+            excludedFiles.Add (m.RelativePath);
+
+        foreach (var m in GetMatchesFromFile (target.Sources, excludedFiles)) {
+            count++;
+            yield return m;
+        }
+
+        if (SourcesParser.TraceLevel >= 3)
+            Console.Error.WriteLine ($"// Scan complete. Generated {count} successful matches.");
     }
 }
 
@@ -246,18 +310,6 @@ public class SourcesParser {
         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;
@@ -284,103 +336,191 @@ public class SourcesParser {
         };
 
         var testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{profile}_{libraryName}");
-        var ok = TryParseSingleFile (state, testPath + ".sources", false);
-        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+        var ok = TryParseTargetInto (state, testPath);
 
         if (ok) {
-            PrintSummary (state);
+            PrintSummary (state, testPath);
             return state.Result;
         }
 
         state.HostPlatform = null;
 
         testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}");
-        ok = TryParseSingleFile (state, testPath + ".sources", false);
-        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+        ok = TryParseTargetInto (state, testPath);
 
         if (ok) {
-            PrintSummary (state);
+            PrintSummary (state, testPath);
             return state.Result;
         }
 
         testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{libraryName}");
-        ok = TryParseSingleFile (state, testPath + ".sources", false);
-        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+        ok = TryParseTargetInto (state, testPath);
 
         if (ok) {
-            PrintSummary (state);
+            PrintSummary (state, testPath);
             return state.Result;
         }
 
         state.ProfileName = null;
 
         testPath = Path.Combine (libraryDirectory, libraryName);
-        TryParseSingleFile (state, testPath + ".sources", false);
-        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+        ok = TryParseTargetInto (state, testPath);
 
-        PrintSummary (state);
+        PrintSummary (state, testPath);
 
         return state.Result;
     }
 
+    private void StripFallbackTargetsOrDefaultTarget (
+        State state, TargetParseResult defaultTarget, List<TargetParseResult> fallbackTargets, int maximumCount
+    ) {
+        if (fallbackTargets.Count == maximumCount) {
+            // If we didn't find any platform specific targets, remove them and just leave one single
+            //  platform-specific target entry
+            foreach (var target in fallbackTargets)
+                state.Result.TargetDictionary.Remove (target.Key);
+        } else if (defaultTarget != null) {
+            // Otherwise, strip the non-platform-specific target
+            state.Result.TargetDictionary.Remove (defaultTarget.Key);
+        }
+    }
+
     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);
+        string originalTestPath = Path.Combine (libraryDirectory, libraryName);
+        var defaultTarget = ParseTarget (state, originalTestPath, null);
+        var profileFallbackTargets = new List<TargetParseResult> ();
 
         foreach (var profile in AllProfileNames) {
             state.ProfileName = profile;
+            state.HostPlatform = null;
+
+            var testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}");
+            var profileTarget = ParseTarget (state, testPath, defaultTarget);
+            if ((profileTarget != null) && profileTarget.IsFallback)
+                profileFallbackTargets.Add (profileTarget);
+
+            var fallbackTargets = new List<TargetParseResult> ();
 
             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);
+                var target = ParseTarget (state, testPath, profileTarget ?? defaultTarget);
+                if ((target != null) && target.IsFallback)
+                    fallbackTargets.Add (target);
             }
 
-            state.HostPlatform = null;
+            StripFallbackTargetsOrDefaultTarget (state, profileTarget, fallbackTargets, AllHostPlatformNames.Length);
+        }
+
+        StripFallbackTargetsOrDefaultTarget (state, defaultTarget, profileFallbackTargets, AllProfileNames.Length);
 
-            testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}");
-            TryParseSingleFile (state, testPath + ".sources", false);
-            TryParseSingleFile (state, testPath + ".exclude.sources", true);
+        var platformFallbackTargets = new List<TargetParseResult> ();
+
+        foreach (var hostPlatform in AllHostPlatformNames) {
+            state.ProfileName = null;
+            state.HostPlatform = hostPlatform;
+
+            var testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{libraryName}");
+            var target = ParseTarget (state, testPath, defaultTarget);
+            if ((target != null) && target.IsFallback)
+                platformFallbackTargets.Add (target);
         }
 
-        PrintSummary (state);
+        StripFallbackTargetsOrDefaultTarget (state, defaultTarget, platformFallbackTargets, AllHostPlatformNames.Length);
+
+        PrintSummary (state, originalTestPath);
 
         return state.Result;
     }
 
-    private void PrintSummary (State state) {
+    private void PrintSummary (State state, string testPath) {
         if (TraceLevel > 0)
-            Console.Error.WriteLine ($"// Parsed {state.SourcesFilesParsed} sources file(s) and {state.ExclusionsFilesParsed} exclusions file(s).");
+            Console.Error.WriteLine ($"// Parsed {state.SourcesFilesParsed} sources file(s) and {state.ExclusionsFilesParsed} exclusions file(s) from path '{testPath}'.");
     }
 
-    private void HandleMetaDirective (State state, string directory, bool asExclusionsList, string directive) {
+    private void HandleMetaDirective (State state, SourcesFile file, string directory, bool asExclusionsList, string directive) {
         var include = "#include ";
-        if (directive.StartsWith (include))
-            ParseSingleFile (state, Path.Combine (directory, directive.Substring (include.Length)), asExclusionsList);
+        if (directive.StartsWith (include)) {
+            var fileName = Path.Combine (directory, directive.Substring (include.Length));
+            var newFile = ParseSingleFile (state, fileName, asExclusionsList);
+            if (newFile == null) {
+                Console.Error.WriteLine($"// Include not found: {fileName}");
+                state.Result.ErrorCount++;
+            } else {
+                file.Includes.Add (newFile);
+            }
+        }
+    }
+
+    private bool TryParseTargetInto (State state, string prefix) {
+        var result = ParseTarget (state, prefix, null);
+        return (result != null);
     }
 
-    private bool TryParseSingleFile (State state, string fileName, bool asExclusionsList) {
-        if (!File.Exists (fileName))
-            return false;
+    private TargetParseResult ParseTarget (State state, string prefix, TargetParseResult fallbackTarget) {
+        // FIXME: We determine the prefix for the pair of sources and exclusions,
+        //  which may not match intended behavior:
+        // if linux_net_4_x_foo.sources is present, but linux_net_4_x_foo.exclude.sources is not present,
+        //  should net_4_x_foo.exclude.sources be used as a fallback? Maybe it should.
+        // This won't do that though.
+
+        var tpr = new TargetParseResult {
+            Key = (hostPlatform: state.HostPlatform, profile: state.ProfileName)
+        };
+
+        var sourcesFileName = prefix + ".sources";
+        var exclusionsFileName = prefix + ".exclude.sources";
+
+        if (!File.Exists (sourcesFileName)) {
+            if (fallbackTarget != null) {
+                if (TraceLevel >= 2)
+                    Console.Error.WriteLine($"// Not found: {sourcesFileName}, falling back to {fallbackTarget}");
+                tpr.Sources = fallbackTarget.Sources;
+                tpr.Exclusions = fallbackTarget.Exclusions;
+                tpr.IsFallback = true;
+                state.Result.TargetDictionary.Add (tpr.Key, tpr);
+                return tpr;
+            } else {
+                if (TraceLevel >= 2)
+                    Console.Error.WriteLine($"// Not found: {sourcesFileName}");
+                return null;
+            }
+        }
 
-        ParseSingleFile (state, fileName, asExclusionsList);
-        return true;
+        tpr.Sources = ParseSingleFile (state, sourcesFileName, false);
+
+        if (File.Exists (exclusionsFileName))
+            tpr.Exclusions = ParseSingleFile (state, exclusionsFileName, true);
+
+        state.Result.TargetDictionary.Add (tpr.Key, tpr);
+        return tpr;
     }
 
-    private void ParseSingleFile (State state, string fileName, bool asExclusionsList) {
+    private SourcesFile ParseSingleFile (State state, string fileName, bool asExclusionsList) {
+        var fileTable = asExclusionsList ? state.Result.ExclusionFiles : state.Result.SourcesFiles;
+
         var nullStr = "<none>";
-        if (TraceLevel >= 1)
-            Console.Error.WriteLine ($"// {new String (' ', ParseDepth * 2)}{fileName}  [{state.HostPlatform ?? nullStr}] [{state.ProfileName ?? nullStr}]");
+
+        if (fileTable.ContainsKey (fileName)) {
+            if (TraceLevel >= 2)
+                Console.Error.WriteLine ($"// {new String (' ', ParseDepth * 2)}{fileName}  (already parsed)");
+
+            return fileTable[fileName];
+        } else {
+            if (TraceLevel >= 2)
+                Console.Error.WriteLine ($"// {new String (' ', ParseDepth * 2)}{fileName}  [{state.HostPlatform ?? nullStr}] [{state.ProfileName ?? nullStr}]");
+        }
+
         ParseDepth += 1;
 
         var directory = Path.GetDirectoryName (fileName);
+        var result = new SourcesFile (fileName, asExclusionsList);
+        fileTable.Add (fileName, result);
 
         using (var sr = new StreamReader (fileName)) {
             if (asExclusionsList)
@@ -390,14 +530,16 @@ public class SourcesParser {
 
             string line;
             while ((line = sr.ReadLine ()) != null) {
-                if (String.IsNullOrWhiteSpace (line))
-                    continue;
-
                 if (line.StartsWith ("#")) {
-                    HandleMetaDirective (state, directory, asExclusionsList, line);
+                    HandleMetaDirective (state, result, directory, asExclusionsList, line);
                     continue;
                 }
 
+                line = line.Trim ();
+
+                if (String.IsNullOrWhiteSpace (line))
+                    continue;
+
                 var parts = line.Split (':');
 
                 if (parts.Length > 1) {
@@ -411,27 +553,22 @@ public class SourcesParser {
                     var mainPatternDirectory = Path.GetDirectoryName (parts[0]);
 
                     foreach (var pattern in explicitExclusions) {
-                        state.ParsedExclusions.Add (new ParseEntry {
-                            SourcesFileName = fileName,
+                        result.Exclusions.Add (new ParseEntry {
                             Directory = directory,
-                            Pattern = Path.Combine (mainPatternDirectory, pattern),
-                            HostPlatform = state.HostPlatform,
-                            ProfileName = state.ProfileName
+                            Pattern = Path.Combine (mainPatternDirectory, pattern)
                         });
                     }
                 }
 
-                (asExclusionsList ? state.ParsedExclusions : state.ParsedSources)
+                (asExclusionsList ? result.Exclusions : result.Sources)
                     .Add (new ParseEntry {
-                        SourcesFileName = fileName,
                         Directory = directory,
-                        Pattern = parts[0],
-                        HostPlatform = state.HostPlatform,
-                        ProfileName = state.ProfileName
+                        Pattern = parts[0]
                     });
             }
         }
 
         ParseDepth -= 1;
+        return result;
     }
 }
 \ No newline at end of file
diff --git a/mcs/build/library.make b/mcs/build/library.make
index 641f811af38..afcfb02ab8d 100644
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -136,6 +136,7 @@ csproj-library:
 	echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
 	(echo $(is_boot); \
 	echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(KEYFILE_MCS_FLAGS); \
+	echo $(LIBRARY); \
 	echo $(LIBRARY_NAME); \
 	echo $(BUILT_SOURCES_cmdline); \
 	echo $(build_lib); \
@@ -251,6 +252,7 @@ csproj-test:
 	echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
 	(echo false; \
 	echo $(USE_MCS_FLAGS) -r:$(the_assembly) $(TEST_MCS_FLAGS); \
+	echo $(LIBRARY); \
 	echo $(test_lib); \
 	echo $(BUILT_SOURCES_cmdline); \
 	echo $(test_lib); \
@@ -309,7 +311,7 @@ GENSOURCES_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLAT
 endif
 
 sourcefile = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).sources
-$(sourcefile): $(PROFILE_sources) $(depsdir)/.stamp $(gensources)
+$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(depsdir)/.stamp $(gensources)
 	$(GENSOURCES_RUNTIME) --debug $(gensources) --strict "$@" "$(LIBRARY)" "$(PROFILE_PLATFORM)" "$(PROFILE)"
 
 library_CLEAN_FILES += $(sourcefile)
diff --git a/mcs/class/Accessibility/Accessibility.csproj b/mcs/class/Accessibility/Accessibility.csproj
index 2ecd9604b93..437e3714b7e 100644
--- a/mcs/class/Accessibility/Accessibility.csproj
+++ b/mcs/class/Accessibility/Accessibility.csproj
@@ -43,13 +43,14 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Accessibility\IAccessible.cs" />
     <Compile Include="Accessibility\IAccessibleHandler.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
index 1afc84de7fc..b583c3e2d97 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
@@ -43,8 +43,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -84,8 +87,8 @@
     <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
     <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
     <Compile Include="Commons.Xml\XmlDefaultReader.cs" />
-    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Cscompmgd/Cscompmgd.csproj b/mcs/class/Cscompmgd/Cscompmgd.csproj
index 7ba0fa60ea5..725a6a89f76 100644
--- a/mcs/class/Cscompmgd/Cscompmgd.csproj
+++ b/mcs/class/Cscompmgd/Cscompmgd.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -53,6 +53,7 @@
     <Compile Include="Microsoft.CSharp\CompilerError.cs" />
     <Compile Include="Microsoft.CSharp\ErrorLevel.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/CustomMarshalers/CustomMarshalers.csproj b/mcs/class/CustomMarshalers/CustomMarshalers.csproj
index 5243e898354..10416a6e38d 100644
--- a/mcs/class/CustomMarshalers/CustomMarshalers.csproj
+++ b/mcs/class/CustomMarshalers/CustomMarshalers.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -54,6 +54,7 @@
     <Compile Include="System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
     <Compile Include="System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives.csproj b/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives.csproj
index d2ba9959cad..9938426061c 100644
--- a/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives.csproj
+++ b/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl.csproj b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl.csproj
index 962ef455d83..65d8fa67af2 100644
--- a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl.csproj
+++ b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl.csproj
@@ -99,11 +99,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\..\external\corefx\src\Microsoft.Win32.Registry.AccessControl\src\Microsoft\Win32\RegistryAclExtensions.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry.csproj b/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry.csproj
index 78f4983d6fb..1fb1d3f83d1 100644
--- a/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry.csproj
+++ b/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.AppContext/Facades_System.AppContext.csproj b/mcs/class/Facades/System.AppContext/Facades_System.AppContext.csproj
index f415a6ccb91..ee2314856e5 100644
--- a/mcs/class/Facades/System.AppContext/Facades_System.AppContext.csproj
+++ b/mcs/class/Facades/System.AppContext/Facades_System.AppContext.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent.csproj b/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent.csproj
index e883644e392..0c909af256a 100644
--- a/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent.csproj
+++ b/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric.csproj b/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric.csproj
index 6930ed513a4..0653fa57487 100644
--- a/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric.csproj
+++ b/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized.csproj b/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized.csproj
index 60cc7a383a1..f260659a1f6 100644
--- a/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized.csproj
+++ b/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Collections/Facades_System.Collections.csproj b/mcs/class/Facades/System.Collections/Facades_System.Collections.csproj
index 97c9e2b25e0..7c42ba4e845 100644
--- a/mcs/class/Facades/System.Collections/Facades_System.Collections.csproj
+++ b/mcs/class/Facades/System.Collections/Facades_System.Collections.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations.csproj b/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations.csproj
index 8a6f6d3b811..333c3d1c6dd 100644
--- a/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations.csproj
+++ b/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj" />
diff --git a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync.csproj b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync.csproj
index b2e780501d0..00ecaedfea2 100644
--- a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync.csproj
+++ b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives.csproj b/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives.csproj
index a2a18e34817..e5f1d386a34 100644
--- a/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives.csproj
+++ b/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter.csproj b/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter.csproj
index 5856967b00c..11a8b1154ca 100644
--- a/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter.csproj
+++ b/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel.csproj b/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel.csproj
index 808bd7eb907..dd932eb7e3c 100644
--- a/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel.csproj
+++ b/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Console/Facades_System.Console.csproj b/mcs/class/Facades/System.Console/Facades_System.Console.csproj
index 731f5bcf0d1..bb5361005bd 100644
--- a/mcs/class/Facades/System.Console/Facades_System.Console.csproj
+++ b/mcs/class/Facades/System.Console/Facades_System.Console.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common.csproj b/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common.csproj
index 60459c74b3b..560893cf154 100644
--- a/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common.csproj
+++ b/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient.csproj b/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient.csproj
index 4c34a2f8060..5cb3b91918f 100644
--- a/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient.csproj
+++ b/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts.csproj b/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts.csproj
index e988609d7db..deecebf3f04 100644
--- a/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug.csproj b/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug.csproj
index 19900acef62..99ddeb0824e 100644
--- a/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo.csproj b/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo.csproj
index 895bd757bfb..017e5e17bfc 100644
--- a/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo.csproj
+++ b/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process.csproj b/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process.csproj
index 7a7ebc64c88..20ae9f96270 100644
--- a/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace.csproj b/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace.csproj
index d417682cbe8..7a7677ab3db 100644
--- a/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace.csproj
+++ b/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener.csproj b/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener.csproj
index bb0cb24902c..0f81047c930 100644
--- a/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener.csproj
+++ b/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools.csproj b/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools.csproj
index e8c83ef3a88..cdb2d715cd4 100644
--- a/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent.csproj b/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent.csproj
index 41b370e04bb..7d195d5e2ae 100644
--- a/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent.csproj
+++ b/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource.csproj b/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource.csproj
index 340a5fd5848..7215034e766 100644
--- a/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource.csproj
+++ b/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing.csproj b/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing.csproj
index 9df6a720279..7783d37f29d 100644
--- a/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Drawing.Common/Facades_System.Drawing.Common.csproj b/mcs/class/Facades/System.Drawing.Common/Facades_System.Drawing.Common.csproj
index 19b708e3261..b4b7177820d 100644
--- a/mcs/class/Facades/System.Drawing.Common/Facades_System.Drawing.Common.csproj
+++ b/mcs/class/Facades/System.Drawing.Common/Facades_System.Drawing.Common.csproj
@@ -89,10 +89,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj b/mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj
index 7a36c239529..37513e4aba9 100644
--- a/mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj
+++ b/mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj
@@ -99,61 +99,21 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="TypeForwarders.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
-    <Compile Include="TypeForwarders.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
-    <Compile Include="TypeForwarders.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="TypeForwarders.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
-    <Compile Include="TypeForwarders.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
-    <Compile Include="..\..\System.Drawing\System.Drawing\Color.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\KnownColor.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\KnownColors.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\Point.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\PointF.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\Rectangle.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\RectangleF.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\Size.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\SizeF.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
-    <Compile Include="TypeForwarders.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
-    <Compile Include="TypeForwarders.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
-    <Compile Include="..\..\System.Drawing\System.Drawing\Color.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\KnownColor.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\KnownColors.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\Point.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\PointF.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\Rectangle.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\RectangleF.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\Size.cs" />
-    <Compile Include="..\..\System.Drawing\System.Drawing\SizeF.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
-    <Compile Include="TypeForwarders.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
-    <Compile Include="TypeForwarders.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' "></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime.csproj b/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime.csproj
index d67b38a1d1a..d1983e4b68e 100644
--- a/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime.csproj
+++ b/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars.csproj b/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars.csproj
index a45ba36af22..fde4a3fe848 100644
--- a/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars.csproj
+++ b/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions.csproj b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions.csproj
index f89ad7d2926..5147d6bbbe0 100644
--- a/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions.csproj
+++ b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Globalization/Facades_System.Globalization.csproj b/mcs/class/Facades/System.Globalization/Facades_System.Globalization.csproj
index bf3f0ecfe52..a93a1c03c9a 100644
--- a/mcs/class/Facades/System.Globalization/Facades_System.Globalization.csproj
+++ b/mcs/class/Facades/System.Globalization/Facades_System.Globalization.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile.csproj b/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile.csproj
index 0bd04dd16ec..1ff1312b931 100644
--- a/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile.csproj
+++ b/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl.csproj b/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl.csproj
index f43b8cdac72..a1940f862ee 100644
--- a/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl.csproj
@@ -99,11 +99,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\..\external\corefx\src\System.IO.FileSystem.AccessControl\src\System\IO\FileSystemAclExtensions.net46.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo.csproj b/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo.csproj
index b44178a6867..f16ca702785 100644
--- a/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives.csproj b/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives.csproj
index b9eb6b25413..8c21ab97f0a 100644
--- a/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher.csproj b/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher.csproj
index 2157477ed51..9faf1fb414f 100644
--- a/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem.csproj b/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem.csproj
index 4bf1d139011..b9cdaad4372 100644
--- a/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage.csproj b/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage.csproj
index c0292e83f94..bdc3171d040 100644
--- a/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage.csproj
+++ b/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles.csproj b/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles.csproj
index f72bd1badc5..3444da9c0b8 100644
--- a/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles.csproj
+++ b/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes.csproj b/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes.csproj
index 51566503dcb..6c995f29252 100644
--- a/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes.csproj
+++ b/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream.csproj b/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream.csproj
index 67c9b65f7f6..bc7d0caef1e 100644
--- a/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream.csproj
+++ b/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.IO/Facades_System.IO.csproj b/mcs/class/Facades/System.IO/Facades_System.IO.csproj
index 58dd69a1822..00f11941916 100644
--- a/mcs/class/Facades/System.IO/Facades_System.IO.csproj
+++ b/mcs/class/Facades/System.IO/Facades_System.IO.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions.csproj b/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions.csproj
index 382928fbdd2..74fed5806ed 100644
--- a/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions.csproj
+++ b/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel.csproj b/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel.csproj
index a0c1e094f61..58d9490f965 100644
--- a/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel.csproj
+++ b/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable.csproj b/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable.csproj
index 861ce94417b..45f760500d3 100644
--- a/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable.csproj
+++ b/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Facades/System.Linq/Facades_System.Linq.csproj b/mcs/class/Facades/System.Linq/Facades_System.Linq.csproj
index 94782e4c6c7..cc1b99d6a3b 100644
--- a/mcs/class/Facades/System.Linq/Facades_System.Linq.csproj
+++ b/mcs/class/Facades/System.Linq/Facades_System.Linq.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Facades/System.Memory/Facades_System.Memory.csproj b/mcs/class/Facades/System.Memory/Facades_System.Memory.csproj
index 3fe5dc880db..dae52dde1a3 100644
--- a/mcs/class/Facades/System.Memory/Facades_System.Memory.csproj
+++ b/mcs/class/Facades/System.Memory/Facades_System.Memory.csproj
@@ -89,10 +89,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager.csproj b/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager.csproj
index f6a01ca9744..7e214892a9f 100644
--- a/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager.csproj
+++ b/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache.csproj b/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache.csproj
index 970bd27c094..f3d263e2625 100644
--- a/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache.csproj
+++ b/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.Http.Rtc/Facades_System.Net.Http.Rtc.csproj b/mcs/class/Facades/System.Net.Http.Rtc/Facades_System.Net.Http.Rtc.csproj
index 204bc6391ba..e3452b4b247 100644
--- a/mcs/class/Facades/System.Net.Http.Rtc/Facades_System.Net.Http.Rtc.csproj
+++ b/mcs/class/Facades/System.Net.Http.Rtc/Facades_System.Net.Http.Rtc.csproj
@@ -49,10 +49,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener.csproj b/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener.csproj
index 645e0e17ec5..0aeda492b25 100644
--- a/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener.csproj
+++ b/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail.csproj b/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail.csproj
index 6698a918ea3..7c152555faf 100644
--- a/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail.csproj
+++ b/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution.csproj b/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution.csproj
index c83a29e9103..2bc630c1419 100644
--- a/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution.csproj
+++ b/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation.csproj b/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation.csproj
index efa8ddb4f69..da3a979d042 100644
--- a/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation.csproj
+++ b/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.Ping/Facades_System.Net.Ping.csproj b/mcs/class/Facades/System.Net.Ping/Facades_System.Net.Ping.csproj
index 61687eefbec..81ff1dbe095 100644
--- a/mcs/class/Facades/System.Net.Ping/Facades_System.Net.Ping.csproj
+++ b/mcs/class/Facades/System.Net.Ping/Facades_System.Net.Ping.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives.csproj b/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives.csproj
index 25f6ed37fd3..73a12245c56 100644
--- a/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives.csproj
+++ b/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests.csproj b/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests.csproj
index 62d1843beb2..f6232be48d5 100644
--- a/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests.csproj
+++ b/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security.csproj b/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security.csproj
index e67871108a1..03e34a5a9a7 100644
--- a/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security.csproj
+++ b/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint.csproj b/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint.csproj
index 184e09f72dc..cffdea7d626 100644
--- a/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint.csproj
+++ b/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets.csproj b/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets.csproj
index a96fc00fa64..8ec8caaccf5 100644
--- a/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets.csproj
+++ b/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities.csproj b/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities.csproj
index 177b8bc741c..e57713995fa 100644
--- a/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities.csproj
+++ b/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection.csproj b/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection.csproj
index 5397177cebb..163d0be39f2 100644
--- a/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection.csproj
+++ b/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client.csproj b/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client.csproj
index 54ed06d8d01..0343a6f2dea 100644
--- a/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client.csproj
+++ b/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets.csproj b/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets.csproj
index 3a4dd5cd3a0..4352cf0782a 100644
--- a/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets.csproj
+++ b/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel.csproj b/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel.csproj
index af0f455a5fd..3b8e5e13190 100644
--- a/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel.csproj
+++ b/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Reflection.DispatchProxy/Facades_System.Reflection.DispatchProxy.csproj b/mcs/class/Facades/System.Reflection.DispatchProxy/Facades_System.Reflection.DispatchProxy.csproj
index e2c9e4b72ea..23371e03bde 100644
--- a/mcs/class/Facades/System.Reflection.DispatchProxy/Facades_System.Reflection.DispatchProxy.csproj
+++ b/mcs/class/Facades/System.Reflection.DispatchProxy/Facades_System.Reflection.DispatchProxy.csproj
@@ -90,11 +90,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="System.Reflection\DispatchProxy.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration.csproj b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration.csproj
index c8879f33fd5..98cb7afb68b 100644
--- a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration.csproj
+++ b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight.csproj b/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight.csproj
index 36445097547..49d18af216c 100644
--- a/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight.csproj
+++ b/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit.csproj b/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit.csproj
index 65c757e7525..5d39ee8feac 100644
--- a/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit.csproj
+++ b/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions.csproj b/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions.csproj
index 8d4363b6de6..10e321fd54c 100644
--- a/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions.csproj
+++ b/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives.csproj b/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives.csproj
index f51fa14d38e..35bfc260a34 100644
--- a/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives.csproj
+++ b/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions.csproj b/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions.csproj
index ffc1994bc9d..42b9f60873f 100644
--- a/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions.csproj
+++ b/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions.csproj
@@ -99,13 +99,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\..\external\corefx\src\System.Reflection.TypeExtensions\src\System\Reflection\Requires.cs" />
     <Compile Include="..\..\..\..\external\corefx\src\System.Reflection.TypeExtensions\src\System\Reflection\TypeExtensions.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="corefx\SR.cs" />
     <Compile Include="TypeForwarders.cs" />
+    <Compile Include="corefx\SR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Reflection/Facades_System.Reflection.csproj b/mcs/class/Facades/System.Reflection/Facades_System.Reflection.csproj
index 769e11f7a51..36e97a82827 100644
--- a/mcs/class/Facades/System.Reflection/Facades_System.Reflection.csproj
+++ b/mcs/class/Facades/System.Reflection/Facades_System.Reflection.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Resources.Reader/Facades_System.Resources.Reader.csproj b/mcs/class/Facades/System.Resources.Reader/Facades_System.Resources.Reader.csproj
index 88f1acd857d..db2743c9b45 100644
--- a/mcs/class/Facades/System.Resources.Reader/Facades_System.Resources.Reader.csproj
+++ b/mcs/class/Facades/System.Resources.Reader/Facades_System.Resources.Reader.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter.csproj b/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter.csproj
index a56427bc1bf..32b112ff8fa 100644
--- a/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter.csproj
+++ b/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager.csproj b/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager.csproj
index d7b8a1104a4..e18b8e4ac83 100644
--- a/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager.csproj
+++ b/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Resources.Writer/Facades_System.Resources.Writer.csproj b/mcs/class/Facades/System.Resources.Writer/Facades_System.Resources.Writer.csproj
index f0d375a13b2..2471c8eb2f0 100644
--- a/mcs/class/Facades/System.Resources.Writer/Facades_System.Resources.Writer.csproj
+++ b/mcs/class/Facades/System.Resources.Writer/Facades_System.Resources.Writer.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC.csproj b/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC.csproj
index 635ec64b78a..de2f844a19e 100644
--- a/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC.csproj
+++ b/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions.csproj b/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions.csproj
index b109aaef2be..569a4427845 100644
--- a/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions.csproj
+++ b/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions.csproj
@@ -99,13 +99,23 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' "></ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="TypeForwarders.netcore.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' "></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles.csproj b/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles.csproj
index a7e629fc674..475f4838772 100644
--- a/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles.csproj
+++ b/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation.csproj b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation.csproj
index be116d60de0..f6c4220f31d 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime.csproj b/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime.csproj
index 330c3cbbef8..b19c556ddb7 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime.csproj
+++ b/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices.csproj b/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices.csproj
index 977e80d8319..7e663632882 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices.csproj
+++ b/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.Loader/Facades_System.Runtime.Loader.csproj b/mcs/class/Facades/System.Runtime.Loader/Facades_System.Runtime.Loader.csproj
index e090c55e28e..aef414c84b9 100644
--- a/mcs/class/Facades/System.Runtime.Loader/Facades_System.Runtime.Loader.csproj
+++ b/mcs/class/Facades/System.Runtime.Loader/Facades_System.Runtime.Loader.csproj
@@ -90,11 +90,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="AssemblyLoadContext.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics.csproj b/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics.csproj
index a67095fd1d6..d3fe5562fa9 100644
--- a/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics.csproj
+++ b/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Numerics/System.Numerics.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Formatters/Facades_System.Runtime.Serialization.Formatters.csproj b/mcs/class/Facades/System.Runtime.Serialization.Formatters/Facades_System.Runtime.Serialization.Formatters.csproj
index 8e09d058c54..73a996fbba7 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Formatters/Facades_System.Runtime.Serialization.Formatters.csproj
+++ b/mcs/class/Facades/System.Runtime.Serialization.Formatters/Facades_System.Runtime.Serialization.Formatters.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json.csproj b/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json.csproj
index 9a32546c5a7..3607f33e677 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json.csproj
+++ b/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj
index 2d71207dddf..f457c677c58 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj
+++ b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization.csproj" />
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj b/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj
index 3d0e4ea007a..13bdcbbe7b5 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj
+++ b/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Runtime/Facades_System.Runtime.csproj b/mcs/class/Facades/System.Runtime/Facades_System.Runtime.csproj
index 0f960a29916..6bd236788b6 100644
--- a/mcs/class/Facades/System.Runtime/Facades_System.Runtime.csproj
+++ b/mcs/class/Facades/System.Runtime/Facades_System.Runtime.csproj
@@ -99,13 +99,23 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' "></ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="TypeForwarders.netcore.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' "></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl.csproj b/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl.csproj
index 003e2e38471..6da269b7570 100644
--- a/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl.csproj
+++ b/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims.csproj b/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims.csproj
index ff253b0e728..07df8e76519 100644
--- a/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims.csproj
+++ b/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj b/mcs/class/Facades/System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj
index d8dbe85ab7c..65f9629e81f 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Cng/Facades_System.Security.Cryptography.Cng.csproj b/mcs/class/Facades/System.Security.Cryptography.Cng/Facades_System.Security.Cryptography.Cng.csproj
index 551584836eb..c1f5a88dbdc 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Cng/Facades_System.Security.Cryptography.Cng.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Cng/Facades_System.Security.Cryptography.Cng.csproj
@@ -89,10 +89,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Csp/Facades_System.Security.Cryptography.Csp.csproj b/mcs/class/Facades/System.Security.Cryptography.Csp/Facades_System.Security.Cryptography.Csp.csproj
index 969733500d0..0eb93f1503d 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Csp/Facades_System.Security.Cryptography.Csp.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Csp/Facades_System.Security.Cryptography.Csp.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes.csproj b/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes.csproj
index ad55210c400..893757ec5a7 100644
--- a/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding.csproj b/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding.csproj
index 672351073d4..ab4c9febda5 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes.csproj
index 8824255154e..f6708df4bfc 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman.csproj
index 674fbd0d774..59344897cf5 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa.csproj
index 2c8bc9f0914..c0a99c62fc8 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption.csproj
index 3d8ca362a3d..2a85f02730b 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms.csproj b/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms.csproj
index dc250de2ae4..cb556e5ea1d 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing.csproj b/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing.csproj
index 8101ca2005d..ee33a22f265 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Facades_System.Security.Cryptography.OpenSsl.csproj b/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Facades_System.Security.Cryptography.OpenSsl.csproj
index ec4740dc7f2..fd8eb87edb3 100644
--- a/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Facades_System.Security.Cryptography.OpenSsl.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Facades_System.Security.Cryptography.OpenSsl.csproj
@@ -89,12 +89,14 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="ECDsaOpenSsl.cs" />
     <Compile Include="RSAOpenSsl.cs" />
     <Compile Include="SafeEvpPKeyHandle.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Pkcs/Facades_System.Security.Cryptography.Pkcs.csproj b/mcs/class/Facades/System.Security.Cryptography.Pkcs/Facades_System.Security.Cryptography.Pkcs.csproj
index 89a560b9b94..d8ec000c150 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Pkcs/Facades_System.Security.Cryptography.Pkcs.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Pkcs/Facades_System.Security.Cryptography.Pkcs.csproj
@@ -89,10 +89,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.Primitives/Facades_System.Security.Cryptography.Primitives.csproj b/mcs/class/Facades/System.Security.Cryptography.Primitives/Facades_System.Security.Cryptography.Primitives.csproj
index 10cc44c6742..1c609eba10b 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Primitives/Facades_System.Security.Cryptography.Primitives.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Primitives/Facades_System.Security.Cryptography.Primitives.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData.csproj b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData.csproj
index 3e77b9556bd..bce4d196f50 100644
--- a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA.csproj b/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA.csproj
index a1770e73a52..8cde8cd6fb1 100644
--- a/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator.csproj b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator.csproj
index cde9de19a32..d27593d74ce 100644
--- a/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates.csproj b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates.csproj
index 984f26b4186..af9bf018516 100644
--- a/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows.csproj b/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows.csproj
index 21627d4cecc..3e437978ad7 100644
--- a/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows.csproj
+++ b/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal.csproj b/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal.csproj
index 2c74b7a6a27..75fb1007f11 100644
--- a/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal.csproj
+++ b/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString.csproj b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString.csproj
index bf2ef27a258..4ca00f91356 100644
--- a/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString.csproj
+++ b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex.csproj b/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex.csproj
index 1a0aea93f7b..94af9e5702f 100644
--- a/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex.csproj
+++ b/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.ServiceModel/System.ServiceModel.csproj" />
diff --git a/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http.csproj b/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http.csproj
index d7b972f1d49..eef9d8d1218 100644
--- a/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http.csproj
+++ b/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.ServiceModel/System.ServiceModel.csproj" />
diff --git a/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp.csproj b/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp.csproj
index 6bca2f2bcba..56ce07df56f 100644
--- a/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp.csproj
+++ b/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.ServiceModel/System.ServiceModel.csproj" />
diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj b/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj
index 10cfa63bc32..fbc31eaef1a 100644
--- a/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj
+++ b/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security.csproj b/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security.csproj
index ff990610305..8f8290cd048 100644
--- a/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security.csproj
+++ b/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.ServiceModel/System.ServiceModel.csproj" />
diff --git a/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController.csproj b/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController.csproj
index 1216dbc786c..b074e82f925 100644
--- a/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController.csproj
+++ b/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController.csproj
@@ -99,16 +99,18 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="ServiceController_mobile.cs" />
     <Compile Include="ServiceControllerStatus_mobile.cs" />
+    <Compile Include="ServiceController_mobile.cs" />
     <Compile Include="ServiceStartMode_mobile.cs" />
     <Compile Include="ServiceType_mobile.cs" />
     <Compile Include="TimeoutException_mobile.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Text.Encoding.CodePages/Facades_System.Text.Encoding.CodePages.csproj b/mcs/class/Facades/System.Text.Encoding.CodePages/Facades_System.Text.Encoding.CodePages.csproj
index cd568445d9e..2d8dc656967 100644
--- a/mcs/class/Facades/System.Text.Encoding.CodePages/Facades_System.Text.Encoding.CodePages.csproj
+++ b/mcs/class/Facades/System.Text.Encoding.CodePages/Facades_System.Text.Encoding.CodePages.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="CodePagesEncodingProvider.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions.csproj b/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions.csproj
index 8f6764b3e37..19861b7b286 100644
--- a/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions.csproj
+++ b/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding.csproj b/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding.csproj
index 8024947fa81..16ef2419a52 100644
--- a/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding.csproj
+++ b/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions.csproj b/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions.csproj
index 8bdd1c91f5f..4e96551b2ac 100644
--- a/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions.csproj
+++ b/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl.csproj b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl.csproj
index 9770c579d7c..352d24602f1 100644
--- a/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl.csproj
+++ b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl.csproj
@@ -99,11 +99,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\..\external\corefx\src\System.Threading.AccessControl\src\System\Threading\ThreadingAclExtensions.net46.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped.csproj b/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped.csproj
index 0dccfb3bfe7..959d7c5b394 100644
--- a/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped.csproj
+++ b/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel.csproj b/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel.csproj
index cb0338135ed..bdc2b1419db 100644
--- a/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel.csproj
+++ b/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks.csproj b/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks.csproj
index 27d6953ce18..8329c64d3b9 100644
--- a/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks.csproj
+++ b/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread.csproj b/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread.csproj
index f7357d293c0..64fbb6bb886 100644
--- a/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread.csproj
+++ b/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool.csproj b/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool.csproj
index ccc4356c072..8d21f5c3dda 100644
--- a/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool.csproj
+++ b/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer.csproj b/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer.csproj
index 9fc3c34f2ff..3c75587be58 100644
--- a/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer.csproj
+++ b/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Threading/Facades_System.Threading.csproj b/mcs/class/Facades/System.Threading/Facades_System.Threading.csproj
index fe61596f6f8..a338fb25eaa 100644
--- a/mcs/class/Facades/System.Threading/Facades_System.Threading.csproj
+++ b/mcs/class/Facades/System.Threading/Facades_System.Threading.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple.csproj b/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple.csproj
index be29ad68c80..76e514aacf3 100644
--- a/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple.csproj
+++ b/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter.csproj b/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter.csproj
index cb6cc86e693..503be446ca4 100644
--- a/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter.csproj
+++ b/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.XML/System.Xml.csproj" />
diff --git a/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument.csproj b/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument.csproj
index 4ce79c693f6..cdbbdf7eaca 100644
--- a/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument.csproj
+++ b/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.Xml.Linq/System.Xml.Linq.csproj" />
diff --git a/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument.csproj b/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument.csproj
index 8ed72b6d1a9..9c7a2fa89c8 100644
--- a/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument.csproj
+++ b/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Xml.XPath.XmlDocument/Facades_System.Xml.XPath.XmlDocument.csproj b/mcs/class/Facades/System.Xml.XPath.XmlDocument/Facades_System.Xml.XPath.XmlDocument.csproj
index 0344d216bd7..5daa445d7b8 100644
--- a/mcs/class/Facades/System.Xml.XPath.XmlDocument/Facades_System.Xml.XPath.XmlDocument.csproj
+++ b/mcs/class/Facades/System.Xml.XPath.XmlDocument/Facades_System.Xml.XPath.XmlDocument.csproj
@@ -89,11 +89,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="System.Xml\XmlDocumentXPathExtensions.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath.csproj b/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath.csproj
index 38dac90edde..f8edee1555f 100644
--- a/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath.csproj
+++ b/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument.csproj b/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument.csproj
index de7c74a068b..e11401aa84c 100644
--- a/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument.csproj
+++ b/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer.csproj b/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer.csproj
index b13a2118009..d03f85872c8 100644
--- a/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer.csproj
+++ b/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System.XML/System.Xml.csproj" />
diff --git a/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives.csproj b/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives.csproj
index f696fc88da2..8402f23f237 100644
--- a/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives.csproj
+++ b/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/Facades/netstandard/Facades_netstandard.csproj b/mcs/class/Facades/netstandard/Facades_netstandard.csproj
index 29004da42cb..ba97e493163 100644
--- a/mcs/class/Facades/netstandard/Facades_netstandard.csproj
+++ b/mcs/class/Facades/netstandard/Facades_netstandard.csproj
@@ -99,10 +99,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../System/System.csproj" />
diff --git a/mcs/class/I18N/CJK/I18N.CJK.csproj b/mcs/class/I18N/CJK/I18N.CJK.csproj
index 84e73d2dda6..4d4b872b46d 100644
--- a/mcs/class/I18N/CJK/I18N.CJK.csproj
+++ b/mcs/class/I18N/CJK/I18N.CJK.csproj
@@ -104,15 +104,16 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\build\common\Consts.cs" />
     <Compile Include="..\Assembly\AssemblyInfo.cs" />
-    <Compile Include="CodeTable.cs" />
     <Compile Include="CP51932.cs" />
     <Compile Include="CP932.cs" />
     <Compile Include="CP936.cs" />
     <Compile Include="CP949.cs" />
     <Compile Include="CP950.cs" />
+    <Compile Include="CodeTable.cs" />
     <Compile Include="DbcsConvert.cs" />
     <Compile Include="DbcsEncoding.cs" />
     <Compile Include="GB18030Encoding.cs" />
@@ -120,6 +121,7 @@
     <Compile Include="ISO2022JP.cs" />
     <Compile Include="JISConvert.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../Common/I18N.csproj" />
diff --git a/mcs/class/I18N/Common/I18N.csproj b/mcs/class/I18N/Common/I18N.csproj
index 24194af754a..5990feda481 100644
--- a/mcs/class/I18N/Common/I18N.csproj
+++ b/mcs/class/I18N/Common/I18N.csproj
@@ -104,6 +104,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\build\common\Consts.cs" />
     <Compile Include="..\Assembly\AssemblyInfo.cs" />
@@ -116,6 +117,7 @@
     <Compile Include="MonoSafeEncoding.cs" />
     <Compile Include="Strings.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../corlib/corlib.csproj" />
diff --git a/mcs/class/I18N/MidEast/I18N.MidEast.csproj b/mcs/class/I18N/MidEast/I18N.MidEast.csproj
index 79a3d7fb8b8..73b905c42eb 100644
--- a/mcs/class/I18N/MidEast/I18N.MidEast.csproj
+++ b/mcs/class/I18N/MidEast/I18N.MidEast.csproj
@@ -104,6 +104,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\build\common\Consts.cs" />
     <Compile Include="..\Assembly\AssemblyInfo.cs" />
@@ -115,6 +116,7 @@
     <Compile Include="CP28599.cs" />
     <Compile Include="CP38598.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../Common/I18N.csproj" />
diff --git a/mcs/class/I18N/Other/I18N.Other.csproj b/mcs/class/I18N/Other/I18N.Other.csproj
index 24b4350001e..fac5f09aa20 100644
--- a/mcs/class/I18N/Other/I18N.Other.csproj
+++ b/mcs/class/I18N/Other/I18N.Other.csproj
@@ -104,6 +104,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\build\common\Consts.cs" />
     <Compile Include="..\Assembly\AssemblyInfo.cs" />
@@ -117,6 +118,7 @@
     <Compile Include="CP57002.cs" />
     <Compile Include="CP874.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../Common/I18N.csproj" />
diff --git a/mcs/class/I18N/Rare/I18N.Rare.csproj b/mcs/class/I18N/Rare/I18N.Rare.csproj
index 3b69f2b8c81..01751b3bcca 100644
--- a/mcs/class/I18N/Rare/I18N.Rare.csproj
+++ b/mcs/class/I18N/Rare/I18N.Rare.csproj
@@ -104,6 +104,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\build\common\Consts.cs" />
     <Compile Include="..\Assembly\AssemblyInfo.cs" />
@@ -147,6 +148,7 @@
     <Compile Include="CP870.cs" />
     <Compile Include="CP875.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../Common/I18N.csproj" />
diff --git a/mcs/class/I18N/West/I18N.West.csproj b/mcs/class/I18N/West/I18N.West.csproj
index f6c644a6a9b..86c9068ec08 100644
--- a/mcs/class/I18N/West/I18N.West.csproj
+++ b/mcs/class/I18N/West/I18N.West.csproj
@@ -104,6 +104,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\build\common\Consts.cs" />
     <Compile Include="..\Assembly\AssemblyInfo.cs" />
@@ -123,6 +124,7 @@
     <Compile Include="CP863.cs" />
     <Compile Include="CP865.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../Common/I18N.csproj" />
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj b/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj
index 629651d0a70..ae27c207312 100644
--- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj
+++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj
@@ -44,11 +44,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="IBM.Data.DB2\DB2ClientUtils.cs" />
     <Compile Include="IBM.Data.DB2\DB2CLIWrapper.cs" />
+    <Compile Include="IBM.Data.DB2\DB2ClientUtils.cs" />
     <Compile Include="IBM.Data.DB2\DB2Command.cs" />
     <Compile Include="IBM.Data.DB2\DB2CommandBuilder.cs" />
     <Compile Include="IBM.Data.DB2\DB2Connection.cs" />
@@ -72,6 +72,7 @@
     <Compile Include="IBM.Data.DB2\DB2Transaction.cs" />
     <Compile Include="IBM.Data.DB2\DB2Type.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
index 570f18a35fb..549f8311c96 100644
--- a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
+++ b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="ICSharpCode.SharpZipLib\AssemblyInfo.cs" />
     <Compile Include="ICSharpCode.SharpZipLib\BZip2\BZip2.cs" />
@@ -100,6 +101,7 @@
     <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipNameTransform.cs" />
     <Compile Include="ICSharpCode.SharpZipLib\Zip\ZipOutputStream.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj
index 0a657a85b91..c2d40957ccf 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\tools\xbuild\SolutionParser.cs" />
@@ -91,12 +91,12 @@
     <Compile Include="Microsoft.Build.BuildEngine\FileLogger.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\GroupingCollection.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\IBuildTask.cs" />
+    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\Import.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\ImportCollection.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\ImportedProject.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\InternalLoggerException.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\InvalidProjectFileException.cs" />
-    <Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\MemberInvocationReference.cs" />
@@ -123,6 +123,7 @@
     <Compile Include="Microsoft.Build.BuildEngine\Utilities.cs" />
     <Compile Include="Microsoft.Build.BuildEngine\WriteHandler.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj
index 53a3b4b48df..12be9e0234a 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />
@@ -108,6 +108,7 @@
     <Compile Include="Microsoft.Build.Framework\TaskStartedEventArgs.cs" />
     <Compile Include="Microsoft.Build.Framework\TaskStartedEventHandler.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj
index 30dc6c53094..c620773bb5b 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />
@@ -137,18 +137,18 @@
     <Compile Include="Microsoft.Build.Tasks\GetFrameworkSdkPath.cs" />
     <Compile Include="Microsoft.Build.Tasks\GetReferenceAssemblyPaths.cs" />
     <Compile Include="Microsoft.Build.Tasks\LC.cs" />
+    <Compile Include="Microsoft.Build.Tasks\MSBuild.cs" />
     <Compile Include="Microsoft.Build.Tasks\MakeDir.cs" />
     <Compile Include="Microsoft.Build.Tasks\ManagedCompiler.cs" />
     <Compile Include="Microsoft.Build.Tasks\Message.cs" />
-    <Compile Include="Microsoft.Build.Tasks\MSBuild.cs" />
     <Compile Include="Microsoft.Build.Tasks\ReadLinesFromFile.cs" />
     <Compile Include="Microsoft.Build.Tasks\RegisterAssembly.cs" />
     <Compile Include="Microsoft.Build.Tasks\RemoveDir.cs" />
     <Compile Include="Microsoft.Build.Tasks\RemoveDuplicates.cs" />
     <Compile Include="Microsoft.Build.Tasks\ResolveAssemblyReference.cs" />
-    <Compile Include="Microsoft.Build.Tasks\ResolvedReference.cs" />
     <Compile Include="Microsoft.Build.Tasks\ResolveManifestFiles.cs" />
     <Compile Include="Microsoft.Build.Tasks\ResolveProjectBase.cs" />
+    <Compile Include="Microsoft.Build.Tasks\ResolvedReference.cs" />
     <Compile Include="Microsoft.Build.Tasks\SGen.cs" />
     <Compile Include="Microsoft.Build.Tasks\SignFile.cs" />
     <Compile Include="Microsoft.Build.Tasks\TaskExtension.cs" />
@@ -157,8 +157,8 @@
     <Compile Include="Microsoft.Build.Tasks\Touch.cs" />
     <Compile Include="Microsoft.Build.Tasks\UnregisterAssembly.cs" />
     <Compile Include="Microsoft.Build.Tasks\UpdateManifest.cs" />
-    <Compile Include="Microsoft.Build.Tasks\Vbc.cs" />
     <Compile Include="Microsoft.Build.Tasks\VCBuild.cs" />
+    <Compile Include="Microsoft.Build.Tasks\Vbc.cs" />
     <Compile Include="Microsoft.Build.Tasks\Warning.cs" />
     <Compile Include="Microsoft.Build.Tasks\WriteCodeFragment.cs" />
     <Compile Include="Microsoft.Build.Tasks\WriteLinesToFile.cs" />
@@ -168,6 +168,7 @@
     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceReader.cs" />
     <Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\TxtResourceWriter.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj
index f44102cc1ff..8dc4bd0a927 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />
@@ -64,10 +64,11 @@
     <Compile Include="Microsoft.Build.Utilities\TaskLoggingHelper.cs" />
     <Compile Include="Microsoft.Build.Utilities\ToolLocationHelper.cs" />
     <Compile Include="Microsoft.Build.Utilities\ToolTask.cs" />
-    <Compile Include="Mono.XBuild.Utilities\MonoLocationHelper.cs" />
     <Compile Include="Mono.XBuild.Utilities\MSBuildUtils.cs" />
+    <Compile Include="Mono.XBuild.Utilities\MonoLocationHelper.cs" />
     <Compile Include="Mono.XBuild.Utilities\ReservedNameUtils.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.csproj b/mcs/class/Microsoft.Build/Microsoft.Build.csproj
index f8decac4614..59c6902d26e 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.csproj
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.csproj
@@ -43,8 +43,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="Microsoft.Build.Internal\ExpressionParser.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />
@@ -154,8 +157,8 @@
     <Compile Include="Microsoft.Build.Logging\ConfigurableForwardingLogger.cs" />
     <Compile Include="Microsoft.Build.Logging\ForwardingLoggerRecord.cs" />
     <Compile Include="Microsoft.Build.Logging\LoggerDescription.cs" />
-    <Compile Include="Microsoft.Build.Internal\ExpressionParser.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj
index ae571d627c4..aff29de57cf 100644
--- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj
+++ b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj
@@ -98,6 +98,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\ArgumentObject.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Binder.cs" />
@@ -133,23 +134,23 @@
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinderException.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinderExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinderInternalCompilerException.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Binding\Better.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BindingContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BindingFlag.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BinOpArgInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BinOpKind.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BinOpSig.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BindingContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\BindingFlag.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Binding\Better.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\COperators.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\CandidateFunctionMember.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ConstVal.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Conversion.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Conversions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\COperators.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\EXPRExtensions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\EXPRFLAG.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExplicitConversion.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExprFactory.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionBinder.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExpressionKind.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\EXPRExtensions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\ExprFactory.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\EXPRFLAG.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\FundamentalTypes.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\GroupToArgsBinder.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\GroupToArgsBinderResult.cs" />
@@ -177,12 +178,12 @@
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\ParentSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\PropertySymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\Scope.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactory.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\Symbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolKind.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolLoader.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolMask.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymbolStore.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\SymFactory.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\TypeParameterSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\VariableSymbol.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayIndex.cs" />
@@ -197,10 +198,10 @@
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Concatenate.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Constant.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\EXPR.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExpressionIterator.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExprOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExprWithArgs.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExprWithType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExpressionIterator.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Field.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\FieldInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\List.cs" />
@@ -215,16 +216,16 @@
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\UnaryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\UserDefinedConversion.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\UserDefinedLogicalOperator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Visitors\ExpressionTreeRewriter.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Visitors\ExprVisitorBase.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Visitors\ExpressionTreeRewriter.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ZeroInitialize.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\TypeBind.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\AggregateType.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ArgumentListType.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ArrayType.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\MethodGroupType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\NullableType.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\NullType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\NullableType.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ParameterModifierType.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\PointerType.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\PredefinedTypes.cs" />
@@ -240,8 +241,8 @@
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\SpecialNames.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\SymbolTable.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\NameManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\Names.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\NameTable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\Names.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\Operators.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\PredefinedName.cs" />
     <Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Syntax\PredefinedType.cs" />
@@ -252,6 +253,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="corefx\SR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj b/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj
index bc7389b8721..3f9cb2a4b5d 100644
--- a/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj
+++ b/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj
@@ -43,15 +43,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Microsoft.VisualC\DebugInfoInPDBAttribute.cs" />
     <Compile Include="Microsoft.VisualC\DecoratedNameAttribute.cs" />
-    <Compile Include="Microsoft.VisualC\IsConstModifier.cs" />
     <Compile Include="Microsoft.VisualC\IsCXXReferenceModifier.cs" />
+    <Compile Include="Microsoft.VisualC\IsConstModifier.cs" />
     <Compile Include="Microsoft.VisualC\IsLongModifier.cs" />
     <Compile Include="Microsoft.VisualC\IsSignedModifier.cs" />
     <Compile Include="Microsoft.VisualC\IsVolatileModifier.cs" />
@@ -59,6 +59,7 @@
     <Compile Include="Microsoft.VisualC\NeedsCopyConstructorModifier.cs" />
     <Compile Include="Microsoft.VisualC\NoSignSpecifiedModifier.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
index 0d864f40f17..04116374236 100644
--- a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
+++ b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -55,6 +55,7 @@
     <Compile Include="Microsoft.Web.Infrastructure\HttpContextHelper.cs" />
     <Compile Include="Microsoft.Web.Infrastructure\InfrastructureHelper.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
index 1f79b2507a9..ae8866c60ce 100644
--- a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
+++ b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
@@ -50,6 +50,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -73,6 +74,7 @@
     <Compile Include="Mono.Btls.Interface\VersionInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/Mono.C5/Mono.C5.csproj b/mcs/class/Mono.C5/Mono.C5.csproj
index ac23ddf801e..1f39e0ee5dd 100644
--- a/mcs/class/Mono.C5/Mono.C5.csproj
+++ b/mcs/class/Mono.C5/Mono.C5.csproj
@@ -43,12 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="C5\arrays\ArrayList.cs" />
-    <Compile Include="C5\arrays\CircularQueue.cs" />
-    <Compile Include="C5\arrays\HashedArrayList.cs" />
-    <Compile Include="C5\arrays\SortedArray.cs" />
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="C5\AssemblyInfo.cs" />
     <Compile Include="C5\Attributes.cs" />
     <Compile Include="C5\Builtin.cs" />
@@ -61,24 +57,29 @@
     <Compile Include="C5\Exceptions.cs" />
     <Compile Include="C5\Formatting.cs" />
     <Compile Include="C5\Hashers.cs" />
+    <Compile Include="C5\Interfaces.cs" />
+    <Compile Include="C5\MappedEnumerators.cs" />
+    <Compile Include="C5\Random.cs" />
+    <Compile Include="C5\Records.cs" />
+    <Compile Include="C5\Sorting.cs" />
+    <Compile Include="C5\ViewSupport.cs" />
+    <Compile Include="C5\WrappedArray.cs" />
+    <Compile Include="C5\Wrappers.cs" />
+    <Compile Include="C5\arrays\ArrayList.cs" />
+    <Compile Include="C5\arrays\CircularQueue.cs" />
+    <Compile Include="C5\arrays\HashedArrayList.cs" />
+    <Compile Include="C5\arrays\SortedArray.cs" />
     <Compile Include="C5\hashing\HashBag.cs" />
     <Compile Include="C5\hashing\HashDictionary.cs" />
     <Compile Include="C5\hashing\HashTable.cs" />
     <Compile Include="C5\heaps\IntervalHeap.cs" />
-    <Compile Include="C5\Interfaces.cs" />
     <Compile Include="C5\linkedlists\HashedLinkedList.cs" />
     <Compile Include="C5\linkedlists\LinkedList.cs" />
-    <Compile Include="C5\MappedEnumerators.cs" />
-    <Compile Include="C5\Random.cs" />
-    <Compile Include="C5\Records.cs" />
-    <Compile Include="C5\Sorting.cs" />
     <Compile Include="C5\trees\RedBlackTreeBag.cs" />
     <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />
     <Compile Include="C5\trees\RedBlackTreeSet.cs" />
-    <Compile Include="C5\ViewSupport.cs" />
-    <Compile Include="C5\WrappedArray.cs" />
-    <Compile Include="C5\Wrappers.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.CSharp/Mono.CSharp.csproj b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
index 02d2adb9654..4f2e980374b 100644
--- a/mcs/class/Mono.CSharp/Mono.CSharp.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
@@ -113,6 +113,52 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="net_4_x-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
+    <Compile Include="monodroid-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
+    <Compile Include="monotouch-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
+    <Compile Include="monotouch_runtime-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+    <Compile Include="monotouch_watch-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch_runtime' ">
+    <Compile Include="monotouch_watch_runtime-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+    <Compile Include="monotouch_tv-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
+    <Compile Include="monotouch_tv_runtime-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
+    <Compile Include="testing_aot_hybrid-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+    <Compile Include="testing_aot_full-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+    <Compile Include="winaot-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="xammac-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
+    <Compile Include="xammac_net_4_5-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+    <Compile Include="unreal-parser.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
+    <Compile Include="wasm-parser.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\mcs\anonymous.cs" />
@@ -171,54 +217,10 @@
     <Compile Include="..\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
     <Compile Include="..\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />
-    <Compile Include="aot.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="aot.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="net_4_x-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
-    <Compile Include="monodroid-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
-    <Compile Include="monotouch-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
-    <Compile Include="monotouch_runtime-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="monotouch_watch-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch_runtime' ">
-    <Compile Include="monotouch_watch_runtime-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
-    <Compile Include="monotouch_tv-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
-    <Compile Include="monotouch_tv_runtime-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
-    <Compile Include="testing_aot_hybrid-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
-    <Compile Include="testing_aot_full-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
-    <Compile Include="winaot-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
-    <Compile Include="xammac-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
-    <Compile Include="xammac_net_4_5-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
-    <Compile Include="unreal-parser.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
-    <Compile Include="wasm-parser.cs" />
-  </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Mono.Cairo/Mono.Cairo.csproj b/mcs/class/Mono.Cairo/Mono.Cairo.csproj
index 779eaf0b8e1..642dfbd1cf1 100644
--- a/mcs/class/Mono.Cairo/Mono.Cairo.csproj
+++ b/mcs/class/Mono.Cairo/Mono.Cairo.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -68,27 +68,27 @@
     <Compile Include="Mono.Cairo\FontType.cs" />
     <Compile Include="Mono.Cairo\FontWeight.cs" />
     <Compile Include="Mono.Cairo\Format.cs" />
-    <Compile Include="Mono.Cairo\GlitzSurface.cs" />
     <Compile Include="Mono.Cairo\GLSurface.cs" />
     <Compile Include="Mono.Cairo\GLXDevice.cs" />
+    <Compile Include="Mono.Cairo\GlitzSurface.cs" />
     <Compile Include="Mono.Cairo\Glyph.cs" />
     <Compile Include="Mono.Cairo\Gradient.cs" />
     <Compile Include="Mono.Cairo\HintMetrics.cs" />
     <Compile Include="Mono.Cairo\HintStyle.cs" />
     <Compile Include="Mono.Cairo\ImageSurface.cs" />
-    <Compile Include="Mono.Cairo\LinearGradient.cs" />
     <Compile Include="Mono.Cairo\LineCap.cs" />
     <Compile Include="Mono.Cairo\LineJoin.cs" />
+    <Compile Include="Mono.Cairo\LinearGradient.cs" />
     <Compile Include="Mono.Cairo\Matrix.cs" />
     <Compile Include="Mono.Cairo\NativeMethods.cs" />
     <Compile Include="Mono.Cairo\Operator.cs" />
+    <Compile Include="Mono.Cairo\PSSurface.cs" />
     <Compile Include="Mono.Cairo\Path.cs" />
     <Compile Include="Mono.Cairo\Pattern.cs" />
     <Compile Include="Mono.Cairo\PatternType.cs" />
     <Compile Include="Mono.Cairo\PdfSurface.cs" />
     <Compile Include="Mono.Cairo\Point.cs" />
     <Compile Include="Mono.Cairo\PointD.cs" />
-    <Compile Include="Mono.Cairo\PSSurface.cs" />
     <Compile Include="Mono.Cairo\RadialGradient.cs" />
     <Compile Include="Mono.Cairo\Rectangle.cs" />
     <Compile Include="Mono.Cairo\Region.cs" />
@@ -107,6 +107,7 @@
     <Compile Include="Mono.Cairo\XcbSurface.cs" />
     <Compile Include="Mono.Cairo\XlibSurface.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb.csproj b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb.csproj
index d87c3314e4f..5963a72987b 100644
--- a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb.csproj
+++ b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\cecil\ProjectInfo.cs" />
     <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbReader.cs" />
@@ -55,6 +55,7 @@
     <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />
     <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\SymbolWriterImpl.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Cecil/Mono.Cecil.csproj b/mcs/class/Mono.Cecil/Mono.Cecil.csproj
index 9e4971a7a67..4e98841945d 100644
--- a/mcs/class/Mono.Cecil/Mono.Cecil.csproj
+++ b/mcs/class/Mono.Cecil/Mono.Cecil.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Code.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeReader.cs" />
@@ -146,13 +147,13 @@
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleKind.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleReference.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\NativeType.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeAttributes.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeInfo.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterAttributes.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinition.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinitionCollection.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterReference.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\PinnedType.cs" />
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeAttributes.cs" />
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeInfo.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\PointerType.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyAttributes.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyDefinition.cs" />
@@ -182,6 +183,7 @@
     <Compile Include="..\..\..\external\cecil\ProjectInfo.cs" />
     <Compile Include="Consts.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
index 7f646a42818..458e885bae6 100644
--- a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
+++ b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
@@ -43,10 +43,14 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\CompileVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\ExprVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\InstructionExtentVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\SourcePositionVisitor.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite.Ast\Expr.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprAdd.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprBinaryOp.cs" />
@@ -66,10 +70,6 @@
     <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprSub.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite.Ast\ExprType.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite.Ast\Sn.cs" />
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\CompileVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\ExprVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\InstructionExtentVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Rewrite.AstVisitors\SourcePositionVisitor.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite\AssemblyRef.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite\ConditionTextExtractor.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite\ContractRequiresInfo.cs" />
@@ -82,6 +82,63 @@
     <Compile Include="Mono.CodeContracts.Rewrite\RewriterOptions.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite\RewriterResults.cs" />
     <Compile Include="Mono.CodeContracts.Rewrite\TransformContractsVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\CodeVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\DefaultNodeVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IAggregateVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ICodeConsumer.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IExpressionILVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IILVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ILVisitorBase.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IMethodCodeConsumer.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISymbolicExpressionVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISyntheticILVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeInspector.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ValueCodeVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\ArrayTypeNode.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\AssemblyNode.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\AssignmentStatement.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\BinaryExpression.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\BinaryOperator.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Block.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\BlockExpression.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\BodyParser.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Branch.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\CatchFilter.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Class.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Construct.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\CoreSystemTypes.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\EndFinally.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Ensures.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\ExceptionHandler.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Expression.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\ExpressionStatement.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\FaultHandler.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Field.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Literal.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Local.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Member.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\MemberBinding.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Method.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\MethodCall.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\MethodContract.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\MethodContractElement.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Module.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\NaryExpression.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Node.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\NodeType.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\OperatorExtensions.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Parameter.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Property.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Reference.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Requires.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Return.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Statement.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\This.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\TypeNode.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\UnaryExpression.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\UnaryOperator.cs" />
+    <Compile Include="Mono.CodeContracts.Static.AST\Variable.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\AnalysisDriver.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\BasicAnalysisDriver.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Drivers\BasicMethodDriver.cs" />
@@ -125,8 +182,8 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\MethodCallPathElement.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\ParameterPathElement.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement.cs" />
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement`1.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElementBase.cs" />
+    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathElement`1.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\PathExtensions.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\SpecialPathElement.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis.Paths\SpecialPathElementKind.cs" />
@@ -154,9 +211,9 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\MethodWrapper.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ParameterWrapper.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\StackToSymbolicAdapter.cs" />
-    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymbolicValue.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymFunction.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymValue.cs" />
+    <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\SymbolicValue.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\TypeCache.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ValueContextProvider.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.HeapAnalysis\ValueDecoder.cs" />
@@ -169,16 +226,16 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AbstractInterpretationException.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysers.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.ConstantEvaluator.cs" />
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.GenericNumericalAnalysis.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.GenericValueAnalysis.cs" />
+    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Analysis.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AssumeFalseVisitor.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\AssumeTrueVisitor.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedExpressionDecoder.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedExpressionEncoder.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\BoxedVariable.cs" />
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstantEvaluatorVisitor.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstToIntervalEvaluator.cs" />
+    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\ConstantEvaluatorVisitor.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Counter.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisInterval.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\DisIntervalAssumer.cs" />
@@ -198,9 +255,9 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IIntervalEnvironment.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\Interval.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeFalseVisitor.cs" />
+    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeTrueVisitor.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumer.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumerBase.cs" />
-    <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalAssumeTrueVisitor.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalBase.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalContext.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis.Numerical\IntervalContextBase.cs" />
@@ -238,63 +295,6 @@
     <Compile Include="Mono.CodeContracts.Static.Analysis\IValueContext.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis\IValueContextProvider.cs" />
     <Compile Include="Mono.CodeContracts.Static.Analysis\PrinterFactory.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\CodeVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\DefaultNodeVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IAggregateVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ICodeConsumer.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IExpressionILVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IILVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ILVisitorBase.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\IMethodCodeConsumer.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISymbolicExpressionVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ISyntheticILVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeInspector.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\NodeVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST.Visitors\ValueCodeVisitor.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\ArrayTypeNode.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\AssemblyNode.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\AssignmentStatement.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\BinaryExpression.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\BinaryOperator.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Block.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\BlockExpression.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\BodyParser.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Branch.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\CatchFilter.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Class.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Construct.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\CoreSystemTypes.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\EndFinally.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Ensures.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\ExceptionHandler.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Expression.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\ExpressionStatement.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\FaultHandler.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Field.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Literal.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Local.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Member.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\MemberBinding.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Method.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\MethodCall.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\MethodContract.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\MethodContractElement.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Module.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\NaryExpression.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Node.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\NodeType.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\OperatorExtensions.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Parameter.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Property.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Reference.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Requires.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Return.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Statement.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\This.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\TypeNode.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\UnaryExpression.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\UnaryOperator.cs" />
-    <Compile Include="Mono.CodeContracts.Static.AST\Variable.cs" />
     <Compile Include="Mono.CodeContracts.Static.ContractExtraction\ContractExtractor.cs" />
     <Compile Include="Mono.CodeContracts.Static.ContractExtraction\ContractNodes.cs" />
     <Compile Include="Mono.CodeContracts.Static.ContractExtraction\GatherLocals.cs" />
@@ -377,14 +377,14 @@
     <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableMap.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\IImmutableSet.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\IIndexable.cs" />
+    <Compile Include="Mono.CodeContracts.Static.DataStructures\IPropertyCollection.cs" />
+    <Compile Include="Mono.CodeContracts.Static.DataStructures\IWorkList.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableIntKeyMap.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableIntMap.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableMap.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableSet.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\ImmutableSetExtensions.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\Indexable.cs" />
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IPropertyCollection.cs" />
-    <Compile Include="Mono.CodeContracts.Static.DataStructures\IWorkList.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\Optional.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\Pair.cs" />
     <Compile Include="Mono.CodeContracts.Static.DataStructures\PriorityQueue.cs" />
@@ -417,12 +417,13 @@
     <Compile Include="Mono.CodeContracts.Static.Proving\IFactBase.cs" />
     <Compile Include="Mono.CodeContracts.Static.Proving\IFactQuery.cs" />
     <Compile Include="Mono.CodeContracts.Static.Proving\SimpleLogicInference.cs" />
-    <Compile Include="Mono.CodeContracts.Static\Checker.cs" />
     <Compile Include="Mono.CodeContracts.Static\CheckOptions.cs" />
     <Compile Include="Mono.CodeContracts.Static\CheckResults.cs" />
+    <Compile Include="Mono.CodeContracts.Static\Checker.cs" />
     <Compile Include="Mono.CodeContracts.Static\DebugOptions.cs" />
     <Compile Include="Mono.CodeContracts.Static\ProofOutcome.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
index e8ba3ca68b1..02eac3bcee6 100644
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
@@ -58,6 +58,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -68,6 +69,7 @@
     <Compile Include="SourceMethodBuilder.cs" />
     <Compile Include="SymbolWriterImpl.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
index 25010afdeae..14e19d19c5e 100644
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
@@ -99,6 +99,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\System\Mono.Util\MonoPInvokeCallbackAttribute.cs" />
@@ -116,7 +117,6 @@
     <Compile Include="Mono.Data.Sqlite_2.0\SQLiteConvert.cs" />
     <Compile Include="Mono.Data.Sqlite_2.0\SQLiteDataAdapter.cs" />
     <Compile Include="Mono.Data.Sqlite_2.0\SQLiteDataReader.cs" />
-    <Compile Include="Mono.Data.Sqlite_2.0\SqliteDataSourceEnumerator.cs" />
     <Compile Include="Mono.Data.Sqlite_2.0\SQLiteEnlistment.cs" />
     <Compile Include="Mono.Data.Sqlite_2.0\SQLiteException.cs" />
     <Compile Include="Mono.Data.Sqlite_2.0\SQLiteFactory.cs" />
@@ -129,8 +129,10 @@
     <Compile Include="Mono.Data.Sqlite_2.0\SQLiteStatement.cs" />
     <Compile Include="Mono.Data.Sqlite_2.0\SQLiteTransaction.cs" />
     <Compile Include="Mono.Data.Sqlite_2.0\SR.Designer.cs" />
+    <Compile Include="Mono.Data.Sqlite_2.0\SqliteDataSourceEnumerator.cs" />
     <Compile Include="Mono.Data.Sqlite_2.0\UnsafeNativeMethods.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj
index cb59c57e6ff..f8ff81555de 100644
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj
+++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj
@@ -98,6 +98,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -138,6 +139,7 @@
     <Compile Include="Mono.Data.Tds\TdsMetaParameterCollection.cs" />
     <Compile Include="Mono.Data.Tds\TdsParameterDirection.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
index 80bac3fc05b..5aabb8e7470 100644
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
+++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -79,11 +79,11 @@
     <Compile Include="Mono.Debugger.Soft\ILInstruction.cs" />
     <Compile Include="Mono.Debugger.Soft\ILInterpreter.cs" />
     <Compile Include="Mono.Debugger.Soft\IMirror.cs" />
+    <Compile Include="Mono.Debugger.Soft\ITargetProcess.cs" />
     <Compile Include="Mono.Debugger.Soft\InterfaceMappingMirror.cs" />
     <Compile Include="Mono.Debugger.Soft\InvalidStackFrameException.cs" />
     <Compile Include="Mono.Debugger.Soft\InvocationException.cs" />
     <Compile Include="Mono.Debugger.Soft\InvokeOptions.cs" />
-    <Compile Include="Mono.Debugger.Soft\ITargetProcess.cs" />
     <Compile Include="Mono.Debugger.Soft\LocalScope.cs" />
     <Compile Include="Mono.Debugger.Soft\LocalVariable.cs" />
     <Compile Include="Mono.Debugger.Soft\Location.cs" />
@@ -115,15 +115,16 @@
     <Compile Include="Mono.Debugger.Soft\TypeMirror.cs" />
     <Compile Include="Mono.Debugger.Soft\UserBreakEvent.cs" />
     <Compile Include="Mono.Debugger.Soft\UserLogEvent.cs" />
-    <Compile Include="Mono.Debugger.Soft\Value.cs" />
-    <Compile Include="Mono.Debugger.Soft\VirtualMachine.cs" />
-    <Compile Include="Mono.Debugger.Soft\VirtualMachineManager.cs" />
     <Compile Include="Mono.Debugger.Soft\VMDeathEvent.cs" />
-    <Compile Include="Mono.Debugger.Soft\VMDisconnectedException.cs" />
     <Compile Include="Mono.Debugger.Soft\VMDisconnectEvent.cs" />
+    <Compile Include="Mono.Debugger.Soft\VMDisconnectedException.cs" />
     <Compile Include="Mono.Debugger.Soft\VMMismatchException.cs" />
     <Compile Include="Mono.Debugger.Soft\VMStartEvent.cs" />
+    <Compile Include="Mono.Debugger.Soft\Value.cs" />
+    <Compile Include="Mono.Debugger.Soft\VirtualMachine.cs" />
+    <Compile Include="Mono.Debugger.Soft\VirtualMachineManager.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Http/Mono.Http.csproj b/mcs/class/Mono.Http/Mono.Http.csproj
index 670874cd11a..54de5c97517 100644
--- a/mcs/class/Mono.Http/Mono.Http.csproj
+++ b/mcs/class/Mono.Http/Mono.Http.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.Http.Configuration\AcceptEncodingConfig.cs" />
@@ -59,6 +59,7 @@
     <Compile Include="Mono.Http\GZipWriteFilter.cs" />
     <Compile Include="Mono.Http\NtlmClient.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Management/Mono.Management.csproj b/mcs/class/Mono.Management/Mono.Management.csproj
index d0f9f3bb985..b9dac625560 100644
--- a/mcs/class/Mono.Management/Mono.Management.csproj
+++ b/mcs/class/Mono.Management/Mono.Management.csproj
@@ -43,13 +43,14 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.Attach\VirtualMachine.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
index 3650218d5d7..0ce5d724ac6 100644
--- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -57,6 +57,7 @@
     <Compile Include="Mono.Messaging.RabbitMQ\RabbitMQMessageQueueTransaction.cs" />
     <Compile Include="Mono.Messaging.RabbitMQ\RabbitMQMessagingProvider.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Messaging/Mono.Messaging.csproj b/mcs/class/Mono.Messaging/Mono.Messaging.csproj
index 0ff968c1b6a..a4c69938dee 100644
--- a/mcs/class/Mono.Messaging/Mono.Messaging.csproj
+++ b/mcs/class/Mono.Messaging/Mono.Messaging.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -78,6 +79,7 @@
     <Compile Include="Mono.Messaging\MonoMessagingException.cs" />
     <Compile Include="Mono.Messaging\QueueReference.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/Mono.Options/Mono.Options.csproj b/mcs/class/Mono.Options/Mono.Options.csproj
index 73c4feb1325..0211283cc2c 100644
--- a/mcs/class/Mono.Options/Mono.Options.csproj
+++ b/mcs/class/Mono.Options/Mono.Options.csproj
@@ -43,13 +43,14 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.Options\Options.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Parallel/Mono.Parallel.csproj b/mcs/class/Mono.Parallel/Mono.Parallel.csproj
index b0c0769f667..c218010c179 100644
--- a/mcs/class/Mono.Parallel/Mono.Parallel.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -59,6 +59,7 @@
     <Compile Include="Mono.Threading\Snzi.cs" />
     <Compile Include="Mono.Threading\SpinLockWrapper.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Posix/Mono.Posix.csproj b/mcs/class/Mono.Posix/Mono.Posix.csproj
index 4b76bc0dd53..9fc8e1fcdb7 100644
--- a/mcs/class/Mono.Posix/Mono.Posix.csproj
+++ b/mcs/class/Mono.Posix/Mono.Posix.csproj
@@ -54,6 +54,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -116,6 +117,15 @@
   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="Mono.Unix.Android\AndroidUtils.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' "></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj
index f918cb59bcf..3e27b811dca 100644
--- a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj
+++ b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj
@@ -44,16 +44,16 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.Profiler.Log\LogBufferHeader.cs" />
     <Compile Include="Mono.Profiler.Log\LogEnums.cs" />
     <Compile Include="Mono.Profiler.Log\LogEvent.cs" />
-    <Compile Include="Mono.Profiler.Log\LogEvents.cs" />
     <Compile Include="Mono.Profiler.Log\LogEventVisitor.cs" />
+    <Compile Include="Mono.Profiler.Log\LogEvents.cs" />
     <Compile Include="Mono.Profiler.Log\LogException.cs" />
     <Compile Include="Mono.Profiler.Log\LogProcessor.cs" />
     <Compile Include="Mono.Profiler.Log\LogProfiler.cs" />
@@ -61,6 +61,7 @@
     <Compile Include="Mono.Profiler.Log\LogStream.cs" />
     <Compile Include="Mono.Profiler.Log\LogStreamHeader.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj b/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj
index 2b48fb0f018..5370dfb462b 100644
--- a/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj
+++ b/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -61,6 +61,7 @@
     <Compile Include="Mono.Security.Cryptography\RNGCryptoServiceProvider.cs" />
     <Compile Include="Mono.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.Security/Mono.Security.csproj b/mcs/class/Mono.Security/Mono.Security.csproj
index b17fdb16ed4..cbf54aada71 100644
--- a/mcs/class/Mono.Security/Mono.Security.csproj
+++ b/mcs/class/Mono.Security/Mono.Security.csproj
@@ -109,6 +109,32 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
+    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
+    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
+    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
@@ -210,9 +236,9 @@
     <Compile Include="Mono.Security.Protocol.Tls\HandshakeState.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\HttpsClientStream.cs" />
-    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\SecurityParameters.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />
@@ -230,8 +256,8 @@
     <Compile Include="Mono.Security.Protocol.Tls\TlsStream.cs" />
     <Compile Include="Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />
     <Compile Include="Mono.Security.X509.Extensions\BasicConstraintsExtension.cs" />
-    <Compile Include="Mono.Security.X509.Extensions\CertificatePoliciesExtension.cs" />
     <Compile Include="Mono.Security.X509.Extensions\CRLDistributionPointsExtension.cs" />
+    <Compile Include="Mono.Security.X509.Extensions\CertificatePoliciesExtension.cs" />
     <Compile Include="Mono.Security.X509.Extensions\ExtendedKeyUsageExtension.cs" />
     <Compile Include="Mono.Security.X509.Extensions\GeneralNames.cs" />
     <Compile Include="Mono.Security.X509.Extensions\KeyAttributesExtension.cs" />
@@ -243,12 +269,12 @@
     <Compile Include="Mono.Security.X509\PKCS12.cs" />
     <Compile Include="Mono.Security.X509\X501Name.cs" />
     <Compile Include="Mono.Security.X509\X509Builder.cs" />
+    <Compile Include="Mono.Security.X509\X509CRL.cs" />
     <Compile Include="Mono.Security.X509\X509Certificate.cs" />
     <Compile Include="Mono.Security.X509\X509CertificateBuilder.cs" />
     <Compile Include="Mono.Security.X509\X509CertificateCollection.cs" />
     <Compile Include="Mono.Security.X509\X509Chain.cs" />
     <Compile Include="Mono.Security.X509\X509ChainStatusFlags.cs" />
-    <Compile Include="Mono.Security.X509\X509CRL.cs" />
     <Compile Include="Mono.Security.X509\X509Extension.cs" />
     <Compile Include="Mono.Security.X509\X509Extensions.cs" />
     <Compile Include="Mono.Security.X509\X509Store.cs" />
@@ -263,40 +289,24 @@
     <Compile Include="Mono.Xml\MiniParser.cs" />
     <Compile Include="Mono.Xml\SecurityParser.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
     <Compile Include="..\corlib\CommonCrypto\CommonCrypto.cs" />
     <Compile Include="..\corlib\CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
-    <Compile Include="..\corlib\CommonCrypto\CommonCrypto.cs" />
-    <Compile Include="..\corlib\CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
     <Compile Include="..\corlib\CommonCrypto\CommonCrypto.cs" />
     <Compile Include="..\corlib\CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
-    <Compile Include="..\corlib\CommonCrypto\CommonCrypto.cs" />
-    <Compile Include="..\corlib\CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' "></ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
     <Compile Include="..\corlib\CommonCrypto\CommonCrypto.cs" />
     <Compile Include="..\corlib\CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\SHA224Managed.g.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
diff --git a/mcs/class/Mono.Simd/Mono.Simd.csproj b/mcs/class/Mono.Simd/Mono.Simd.csproj
index d2870e3b7ec..e463c0575e8 100644
--- a/mcs/class/Mono.Simd/Mono.Simd.csproj
+++ b/mcs/class/Mono.Simd/Mono.Simd.csproj
@@ -69,12 +69,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="Mono.Simd\AccelerationAttribute.cs" />
     <Compile Include="Mono.Simd\AccelMode.cs" />
+    <Compile Include="Mono.Simd\AccelerationAttribute.cs" />
     <Compile Include="Mono.Simd\ArrayExtensions.cs" />
     <Compile Include="Mono.Simd\SimdRuntime.cs" />
     <Compile Include="Mono.Simd\Vector16b.cs" />
@@ -89,6 +90,7 @@
     <Compile Include="Mono.Simd\Vector8us.cs" />
     <Compile Include="Mono.Simd\VectorOperations.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System.Core/System.Core.csproj" />
diff --git a/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj b/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj
index a66b1bd1890..aa021918d80 100644
--- a/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj
+++ b/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj
@@ -43,13 +43,14 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.Tasklets\Continuation.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj b/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj
index 7781e0f3803..fe30af21fc5 100644
--- a/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj
+++ b/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.Mozilla\AsciiString.cs" />
@@ -53,16 +53,16 @@
     <Compile Include="Mono.Mozilla\DOM\Attribute.cs" />
     <Compile Include="Mono.Mozilla\DOM\AttributeCollection.cs" />
     <Compile Include="Mono.Mozilla\DOM\ContentListener.cs" />
+    <Compile Include="Mono.Mozilla\DOM\DOMImplementation.cs" />
+    <Compile Include="Mono.Mozilla\DOM\DOMObject.cs" />
     <Compile Include="Mono.Mozilla\DOM\Document.cs" />
     <Compile Include="Mono.Mozilla\DOM\DocumentEncoder.cs" />
     <Compile Include="Mono.Mozilla\DOM\DocumentType.cs" />
-    <Compile Include="Mono.Mozilla\DOM\DOMImplementation.cs" />
-    <Compile Include="Mono.Mozilla\DOM\DOMObject.cs" />
     <Compile Include="Mono.Mozilla\DOM\Element.cs" />
     <Compile Include="Mono.Mozilla\DOM\EventListener.cs" />
-    <Compile Include="Mono.Mozilla\DOM\History.cs" />
     <Compile Include="Mono.Mozilla\DOM\HTMLElement.cs" />
     <Compile Include="Mono.Mozilla\DOM\HTMLElementCollection.cs" />
+    <Compile Include="Mono.Mozilla\DOM\History.cs" />
     <Compile Include="Mono.Mozilla\DOM\NamedNodeMap.cs" />
     <Compile Include="Mono.Mozilla\DOM\Navigation.cs" />
     <Compile Include="Mono.Mozilla\DOM\Node.cs" />
@@ -72,38 +72,39 @@
     <Compile Include="Mono.Mozilla\DOM\StylesheetList.cs" />
     <Compile Include="Mono.Mozilla\DOM\Window.cs" />
     <Compile Include="Mono.Mozilla\DOM\WindowCollection.cs" />
+    <Compile Include="Mono.Mozilla\UniString.cs" />
+    <Compile Include="Mono.Mozilla\WebBrowser.cs" />
     <Compile Include="Mono.Mozilla\interfaces\extras\DocumentEncoderFlags.cs" />
     <Compile Include="Mono.Mozilla\interfaces\extras\NodeType.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\extras\Options.cs" />
     <Compile Include="Mono.Mozilla\interfaces\extras\nsIReadSegmentFun.cs" />
     <Compile Include="Mono.Mozilla\interfaces\extras\nsITimerCallbackDelegate.cs" />
     <Compile Include="Mono.Mozilla\interfaces\extras\nsIWriteSegmentFun.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\extras\Options.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIAccessNode.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIAccessibilityService.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIAccessible.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleDocument.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRelation.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIAccessibleRetrieval.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIAccessNode.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIArray.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsICancelable.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIChannel.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIClassInfo.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocCharset.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoder.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoderNodeFixup.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMAbstractView.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMAttr.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMBarProp.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMCDATASection.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCharacterData.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMComment.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCounter.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSPrimitiveValue.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRule.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSRuleList.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleDeclaration.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSStyleSheet.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMCSSValue.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCharacterData.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDOMComment.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDOMCounter.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMImplementation.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMStringList.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocument.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentEvent.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentFragment.cs" />
@@ -111,8 +112,6 @@
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentStyle.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentType.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMDocumentView.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMImplementation.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMDOMStringList.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMElement.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMEntityReference.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMEvent.cs" />
@@ -126,15 +125,15 @@
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMKeyEvent.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMMediaList.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMMouseEvent.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSHTMLElement.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSRange.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMNamedNodeMap.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMNode.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMNodeList.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSHTMLElement.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMNSRange.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMProcessingInstruction.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRGBColor.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMRange.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMRect.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIDOMRGBColor.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheet.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMStyleSheetList.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMText.cs" />
@@ -142,12 +141,15 @@
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMViewCSS.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMWindow.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIDOMWindowCollection.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDocCharset.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoder.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIDocumentEncoderNodeFixup.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIErrorService.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIFile.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIHistoryEntry.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIIOService.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIInputStream.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIInterfaceRequestor.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIIOService.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsILoadGroup.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIObserver.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIOutputStream.cs" />
@@ -158,10 +160,10 @@
     <Compile Include="Mono.Mozilla\interfaces\nsIProtocolHandler.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIRequest.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIRequestObserver.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsISelection.cs" />
-    <Compile Include="Mono.Mozilla\interfaces\nsIServiceManager.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsISHistory.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsISHistoryListener.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsISelection.cs" />
+    <Compile Include="Mono.Mozilla\interfaces\nsIServiceManager.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsISimpleEnumerator.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIStreamListener.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsITimer.cs" />
@@ -178,15 +180,13 @@
     <Compile Include="Mono.Mozilla\interfaces\nsIWebNavigation.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIWebProgress.cs" />
     <Compile Include="Mono.Mozilla\interfaces\nsIWebProgressListener.cs" />
-    <Compile Include="Mono.Mozilla\UniString.cs" />
-    <Compile Include="Mono.Mozilla\WebBrowser.cs" />
     <Compile Include="Mono.WebBrowser\DOM\EventArgs.cs" />
     <Compile Include="Mono.WebBrowser\DOM\EventHandlers.cs" />
     <Compile Include="Mono.WebBrowser\DOM\IAttribute.cs" />
     <Compile Include="Mono.WebBrowser\DOM\IAttributeCollection.cs" />
+    <Compile Include="Mono.WebBrowser\DOM\IDOMImplementation.cs" />
     <Compile Include="Mono.WebBrowser\DOM\IDocument.cs" />
     <Compile Include="Mono.WebBrowser\DOM\IDocumentType.cs" />
-    <Compile Include="Mono.WebBrowser\DOM\IDOMImplementation.cs" />
     <Compile Include="Mono.WebBrowser\DOM\IElement.cs" />
     <Compile Include="Mono.WebBrowser\DOM\IElementCollection.cs" />
     <Compile Include="Mono.WebBrowser\DOM\IHistory.cs" />
@@ -203,6 +203,7 @@
     <Compile Include="Mono.WebBrowser\IWebBrowser.cs" />
     <Compile Include="Mono.WebBrowser\Manager.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj
index 6606e075917..179c095825e 100644
--- a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj
+++ b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />
@@ -53,6 +53,7 @@
     <Compile Include="Mono.XBuild.Tasks\LibraryPcFileCache.cs" />
     <Compile Include="Mono.XBuild.Tasks\PcFileCache.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj
index 7b26f7579a6..1e6083f97ae 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Boolean.cs" />
     <Compile Include="Novell.Directory.Ldap.Asn1\Asn1Choice.cs" />
@@ -77,9 +77,9 @@
     <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\BinderyObjectEventData.cs" />
     <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ChangeAddressEventData.cs" />
     <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ConnectionStateEventData.cs" />
+    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DSETimeStamp.cs" />
     <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DebugEventData.cs" />
     <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DebugParameter.cs" />
-    <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\DSETimeStamp.cs" />
     <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\EntryEventData.cs" />
     <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\GeneralDSEventData.cs" />
     <Compile Include="Novell.Directory.Ldap.Events.Edir.EventData\ModuleStateEventData.cs" />
@@ -220,11 +220,11 @@
     <Compile Include="Novell.Directory.Ldap\LdapConnection.cs" />
     <Compile Include="Novell.Directory.Ldap\LdapConstraints.cs" />
     <Compile Include="Novell.Directory.Ldap\LdapControl.cs" />
-    <Compile Include="Novell.Directory.Ldap\LdapDeleteRequest.cs" />
     <Compile Include="Novell.Directory.Ldap\LdapDITContentRuleSchema.cs" />
     <Compile Include="Novell.Directory.Ldap\LdapDITStructureRuleSchema.cs" />
     <Compile Include="Novell.Directory.Ldap\LdapDN.cs" />
     <Compile Include="Novell.Directory.Ldap\LdapDSConstants.cs" />
+    <Compile Include="Novell.Directory.Ldap\LdapDeleteRequest.cs" />
     <Compile Include="Novell.Directory.Ldap\LdapEntry.cs" />
     <Compile Include="Novell.Directory.Ldap\LdapException.cs" />
     <Compile Include="Novell.Directory.Ldap\LdapExtendedOperation.cs" />
@@ -262,6 +262,7 @@
     <Compile Include="Novell.Directory.Ldap\MessageVector.cs" />
     <Compile Include="Novell.Directory.Ldap\SupportClass.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/PEAPI/PEAPI.csproj b/mcs/class/PEAPI/PEAPI.csproj
index d44ad7e5557..9c0d0dbb2aa 100644
--- a/mcs/class/PEAPI/PEAPI.csproj
+++ b/mcs/class/PEAPI/PEAPI.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -52,6 +52,7 @@
     <Compile Include="Metadata.cs" />
     <Compile Include="PEAPI.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj
index f359db1da02..e74621bc3db 100644
--- a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj
+++ b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj
@@ -42,8 +42,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\client\api\AmqpTimestamp.cs" />
     <Compile Include="..\client\api\IBasicConsumer.cs" />
     <Compile Include="..\client\api\IBasicProperties.cs" />
@@ -65,6 +65,7 @@
     <Compile Include="AmqpMethod.cs" />
     <Compile Include="Apigen.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
index 63bb5de724c..8e55d86fa34 100644
--- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
+++ b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
@@ -43,8 +43,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="..\..\docs\specs\net_4_x-api-0-9.cs" />
+    <Compile Include="..\..\docs\specs\net_4_x-api-0-8.cs" />
+    <Compile Include="..\..\docs\specs\net_4_x-api-qpid-0-8.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\..\build\common\Consts.cs" />
     <Compile Include="..\util\BlockingCell.cs" />
     <Compile Include="..\util\DebugUtil.cs" />
@@ -55,6 +60,7 @@
     <Compile Include="..\util\Semaphore.cs" />
     <Compile Include="..\util\SharedQueue.cs" />
     <Compile Include="..\util\XmlUtil.cs" />
+    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="api\AmqpTcpEndpoint.cs" />
     <Compile Include="api\AmqpTimestamp.cs" />
     <Compile Include="api\AmqpVersion.cs" />
@@ -79,7 +85,6 @@
     <Compile Include="api\ShutdownReportEntry.cs" />
     <Compile Include="api\SslHelper.cs" />
     <Compile Include="api\SslOption.cs" />
-    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="content\BasicMessageBuilder.cs" />
     <Compile Include="content\BasicMessageReader.cs" />
     <Compile Include="content\BytesMessageBuilder.cs" />
@@ -160,20 +165,18 @@
     <Compile Include="impl\SyntaxError.cs" />
     <Compile Include="impl\UnexpectedFrameException.cs" />
     <Compile Include="impl\UnknownClassOrMethodException.cs" />
+    <Compile Include="impl\WireFormatting.cs" />
     <Compile Include="impl\v0_8\Connection.cs" />
     <Compile Include="impl\v0_8\ProtocolBase.cs" />
     <Compile Include="impl\v0_8qpid\Connection.cs" />
     <Compile Include="impl\v0_8qpid\ProtocolBase.cs" />
     <Compile Include="impl\v0_9\Connection.cs" />
     <Compile Include="impl\v0_9\ProtocolBase.cs" />
-    <Compile Include="impl\WireFormatting.cs" />
     <Compile Include="messagepatterns\SimpleRpcClient.cs" />
     <Compile Include="messagepatterns\SimpleRpcServer.cs" />
     <Compile Include="messagepatterns\Subscription.cs" />
-    <Compile Include="..\..\docs\specs\net_4_x-api-0-8.cs" />
-    <Compile Include="..\..\docs\specs\net_4_x-api-0-9.cs" />
-    <Compile Include="..\..\docs\specs\net_4_x-api-qpid-0-8.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/SMDiagnostics/SMDiagnostics.csproj b/mcs/class/SMDiagnostics/SMDiagnostics.csproj
index e1e151034b7..392066222c0 100644
--- a/mcs/class/SMDiagnostics/SMDiagnostics.csproj
+++ b/mcs/class/SMDiagnostics/SMDiagnostics.csproj
@@ -46,12 +46,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\Activity.cs" />
-    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticsTraceCode.cs" />
     <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticStrings.cs" />
     <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticTraceSource.cs" />
+    <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\DiagnosticsTraceCode.cs" />
     <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EncodingFallbackAwareXmlTextWriter.cs" />
     <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogCategory.cs" />
     <Compile Include="..\referencesource\SMDiagnostics\System\ServiceModel\Diagnostics\EventLogEventId.cs" />
@@ -69,6 +70,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\TraceSR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj
index 76d6ecba7ad..e2fe750c3fd 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj
+++ b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj
@@ -103,12 +103,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="src\Assembly\AssemblyInfo.cs" />
     <Compile Include="src\ComponentModel\ContractAdditions.cs" />
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Assumes.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\Assumes.InternalErrorException.cs" />
+    <Compile Include="src\ComponentModel\Microsoft\Internal\Assumes.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\AttributeServices.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\CollectionServices.CollectionOfObject.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\Collections\CollectionServices.cs" />
@@ -117,9 +118,9 @@
     <Compile Include="src\ComponentModel\Microsoft\Internal\ContractServices.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\GenerationServices.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\LazyServices.cs" />
-    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.Reader.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.Writer.cs" />
+    <Compile Include="src\ComponentModel\Microsoft\Internal\Lock.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\ReflectionInvoke.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\ReflectionServices.cs" />
     <Compile Include="src\ComponentModel\Microsoft\Internal\Requires.cs" />
@@ -129,10 +130,10 @@
     <Compile Include="src\ComponentModel\Strings.Designer.cs" />
     <Compile Include="src\ComponentModel\SuppressMessages.cs" />
     <Compile Include="src\ComponentModel\SuppressMessagesBaselined.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModelServices.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedExportDefinition.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedModelDiscovery.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModel\AttributedPartCreationInfo.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\AttributedModelServices.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CatalogReflectionContextAttribute.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ChangeRejectedException.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\CompositionContractMismatchException.cs" />
@@ -160,8 +161,8 @@
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportFactoryOfTTMetadata.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportLifetimeContextOfT.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportMetadataAttribute.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportServices.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportServices.DisposableLazy.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ExportServices.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AggregateCatalog.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AggregateExportProvider.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ApplicationCatalog.cs" />
@@ -171,17 +172,17 @@
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\AtomicCompositionExtensions.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogChangeProxy.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.CatalogExport.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.FactoryExport.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.PartCreatorExport.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.ScopeFactoryExport.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.ScopeManager.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExportProvider.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CatalogExtensions.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartCatalogChangeEventArgs.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartCatalogCollection.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ComposablePartExportProvider.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionBatch.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionBatch.SingleExportComposablePart.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionBatch.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionConstants.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionContainer.CompositionServiceShim.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionContainer.cs" />
@@ -191,34 +192,34 @@
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionScopeDefinitionDebuggerProxy.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionService.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\CompositionServices.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\DirectoryCatalog.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\DirectoryCatalog.DirectoryCatalogDebuggerProxy.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportProvider.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\DirectoryCatalog.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportProvider.GetExportOverrides.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportProvider.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ExportsChangeEventArgs.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.DependenciesTraversal.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.DependentsTraversal.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.IComposablePartCatalogTraversal.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.Traversal.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\FilteredCatalog.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\INotifyComposablePartCatalogChanged.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.EngineContext.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.PartManager.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.RecompositionManager.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportEngine.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ImportSourceImportDefinitionHelpers.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\INotifyComposablePartCatalogChanged.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\ScopingExtensions.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Hosting\TypeCatalog.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\IAttributedImport.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ICompositionService.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\IPartImportsSatisfiedNotification.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportAttribute.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportCardinalityMismatchException.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportCardinalityMismatchExceptionDebuggerProxy.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportingConstructorAttribute.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportManyAttribute.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportSource.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ImportingConstructorAttribute.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\InheritedExportAttribute.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\IPartImportsSatisfiedNotification.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataAttributeAttribute.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataServices.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\MetadataViewGenerator.cs" />
@@ -241,22 +242,22 @@
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ExportDefinition.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ExportedDelegate.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ICompositionElement.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\IPartCreatorImportDefinition.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ImportCardinality.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\ImportDefinition.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\IPartCreatorImportDefinition.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\PrimitivesServices.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\Primitives\SerializableCompositionElement.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\DisposableReflectionComposablePart.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ExportfactoryCreator.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ExportfactoryCreator.LifetimeContext.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ExportfactoryCreator.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ExportingMember.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\GenericServices.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\GenericSpecializationPartCreationInfo.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\IReflectionPartCreationInfo.cs" />
+    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportType.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingItem.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingMember.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportingParameter.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ImportType.cs" />
-    <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\IReflectionPartCreationInfo.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\LazyMemberInfo.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorExportDefinition.cs" />
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\PartCreatorMemberImportDefinition.cs" />
@@ -280,6 +281,7 @@
     <Compile Include="src\ComponentModel\System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />
     <Compile Include="src\ComponentModel\System\LazyOfTTMetadata.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj
index 147e62900f5..0aa2e514e26 100644
--- a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj
+++ b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj
@@ -103,6 +103,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\referencesource\System.ComponentModel.DataAnnotations\DataAnnotations\AppSettings.cs" />
@@ -157,6 +158,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\SR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj b/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj
index 933db112b0a..f1662d20590 100644
--- a/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj
+++ b/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -57,17 +58,18 @@
     <Compile Include="System.Configuration.Install\ComponentInstaller.cs" />
     <Compile Include="System.Configuration.Install\IManagedInstaller.cs" />
     <Compile Include="System.Configuration.Install\InstallContext.cs" />
-    <Compile Include="System.Configuration.Install\Installer.cs" />
-    <Compile Include="System.Configuration.Install\InstallerCollection.cs" />
     <Compile Include="System.Configuration.Install\InstallEventArgs.cs" />
     <Compile Include="System.Configuration.Install\InstallEventHandler.cs" />
     <Compile Include="System.Configuration.Install\InstallException.cs" />
+    <Compile Include="System.Configuration.Install\Installer.cs" />
+    <Compile Include="System.Configuration.Install\InstallerCollection.cs" />
     <Compile Include="System.Configuration.Install\ManagedInstallerClass.cs" />
     <Compile Include="System.Configuration.Install\TransactedInstaller.cs" />
     <Compile Include="System.Configuration.Install\UninstallAction.cs" />
     <Compile Include="System.Diagnostics\EventLogInstaller.cs" />
     <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Configuration/System.Configuration.csproj b/mcs/class/System.Configuration/System.Configuration.csproj
index 98829d4041b..d215a35d295 100644
--- a/mcs/class/System.Configuration/System.Configuration.csproj
+++ b/mcs/class/System.Configuration/System.Configuration.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -79,6 +80,7 @@
     <Compile Include="System.Configuration\CommaDelimitedStringCollectionConverter.cs" />
     <Compile Include="System.Configuration\ConfigHelper.cs" />
     <Compile Include="System.Configuration\ConfigInfo.cs" />
+    <Compile Include="System.Configuration\ConfigXmlTextReader.cs" />
     <Compile Include="System.Configuration\Configuration.cs" />
     <Compile Include="System.Configuration\ConfigurationAllowDefinition.cs" />
     <Compile Include="System.Configuration\ConfigurationAllowExeDefinition.cs" />
@@ -111,7 +113,6 @@
     <Compile Include="System.Configuration\ConfigurationUserLevel.cs" />
     <Compile Include="System.Configuration\ConfigurationValidatorAttribute.cs" />
     <Compile Include="System.Configuration\ConfigurationValidatorBase.cs" />
-    <Compile Include="System.Configuration\ConfigXmlTextReader.cs" />
     <Compile Include="System.Configuration\ConnectionStringSettings.cs" />
     <Compile Include="System.Configuration\ConnectionStringSettingsCollection.cs" />
     <Compile Include="System.Configuration\ConnectionStringsSection.cs" />
@@ -171,6 +172,7 @@
     <Compile Include="System.Configuration\ValidatorCallback.cs" />
     <Compile Include="System.Configuration\WhiteSpaceTrimStringConverter.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System.Security/System.Security.csproj" />
diff --git a/mcs/class/System.Core/System.Core.csproj b/mcs/class/System.Core/System.Core.csproj
index 82976e2de62..5ec7d1649e2 100644
--- a/mcs/class/System.Core/System.Core.csproj
+++ b/mcs/class/System.Core/System.Core.csproj
@@ -117,10 +117,39 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
+    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
+    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch_runtime' ">
+    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
+    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
+    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ArrayBuilder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\EnumerableHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\EnumerableHelpers.Linq.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\EnumerableHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\LargeArrayBuilder.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\SparseArrayBuilder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\BitHelper.cs" />
@@ -166,8 +195,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Common\ArrayBuilderExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Common\CachedReflectionInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Common\ConstantCheck.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\DelegateHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\DelegateHelpers.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\DelegateHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\HoistedLocals.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\TypeInfoExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ConditionalExpression.cs" />
@@ -179,17 +208,17 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\DynamicExpressionVisitor.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ElementInit.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Error.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Expression.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Expression.DebuggerProxy.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Expression.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ExpressionStringBuilder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ExpressionType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\ExpressionVisitor.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\GotoExpression.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\IArgumentProvider.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\IDynamicExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\IParameterProvider.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\IndexExpression.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\InvocationExpression.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\IParameterProvider.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\LabelExpression.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\LabelTarget.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\LambdaExpression.cs" />
@@ -229,6 +258,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\RuntimeOps.RuntimeVariableList.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\RuntimeOps.RuntimeVariables.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\TrueReadOnlyCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\ParallelEnumerable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\ParallelExecutionMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\ParallelMergeOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Channels\AsynchronousChannel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Channels\SynchronousChannel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Enumerables\AggregationMinMaxHelpers.cs" />
@@ -260,6 +292,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Partitioning\PartitionedStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Partitioning\UnorderedHashRepartitionStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\AssociativeAggregationOperator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\BinaryQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Binary\ConcatQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Binary\ExceptQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Binary\GroupJoinQueryOperator.cs" />
@@ -268,7 +301,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Binary\JoinQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Binary\UnionQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Binary\ZipQueryOperator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\BinaryQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Inlined\CountAggregationOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Inlined\DecimalAverageAggregationOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Inlined\DecimalMinMaxAggregationOperator.cs" />
@@ -315,6 +347,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\QueryResults.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\QuerySettings.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\ScanQueryOperator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\UnaryQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Unary\AnyAllSearchOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Unary\ContainsSearchOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Unary\DefaultIfEmptyQueryOperator.cs" />
@@ -334,7 +367,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Unary\TakeOrSkipWhileQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\Unary\WhereQueryOperator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\QueryOperators\UnaryQueryOperator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Scheduling\CancellationState.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Scheduling\OrderPreservingPipeliningSpoolingTask.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Scheduling\OrderPreservingSpoolingTask.cs" />
@@ -353,9 +385,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\IntValueEvent.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\ListChunk.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\Lookup.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\PLINQETWProvider.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\Pair.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\PairComparer.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\PLINQETWProvider.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\ReverseComparer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\Shared.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\Sorting.cs" />
@@ -363,9 +395,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\Util.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\Wrapper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\Parallel\Utils\WrapperEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\ParallelEnumerable.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\ParallelExecutionMode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Parallel\src\System\Linq\ParallelMergeOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Queryable\src\System\Linq\CachedReflection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Queryable\src\System\Linq\EnumerableExecutor.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Queryable\src\System\Linq\EnumerableQuery.cs" />
@@ -391,8 +420,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Errors.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Except.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\First.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Grouping.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\GroupJoin.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Grouping.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Intersect.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Iterator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq\src\System\Linq\Join.cs" />
@@ -428,12 +457,12 @@
     <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\Function.cs" />
     <Compile Include="..\referencesource\System.Core\Microsoft\Scripting\Utils\StrongBox.cs" />
     <Compile Include="..\referencesource\System.Core\System\FuncAndAction.cs" />
-    <Compile Include="..\referencesource\System.Core\System\InvalidTimeZoneException.cs" />
     <Compile Include="..\referencesource\System.Core\System\IO\Enums.cs" />
     <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\Enums.cs" />
     <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedFileSecurity.cs" />
     <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewAccessor.cs" />
     <Compile Include="..\referencesource\System.Core\System\IO\MemoryMappedFiles\MemoryMappedViewStream.cs" />
+    <Compile Include="..\referencesource\System.Core\System\InvalidTimeZoneException.cs" />
     <Compile Include="..\referencesource\System.Core\System\Runtime\CompilerServices\DynamicAttribute.cs" />
     <Compile Include="..\referencesource\System.Core\System\Runtime\CompilerServices\ExecutionScope.cs" />
     <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\Aes.cs" />
@@ -453,14 +482,11 @@
     <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\NCryptNative.cs" />
     <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\RsaCng.cs" />
     <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\X509Certificates\TrustStatus.cs" />
-    <Compile Include="..\referencesource\System.Core\System\threading\ReaderWriterLockSlim\ReaderWriterLockSlim.cs" />
-    <Compile Include="..\referencesource\System.Core\System\threading\Tasks\TaskExtensions.cs" />
     <Compile Include="..\referencesource\System.Core\System\TimeZoneInfo.cs" />
     <Compile Include="..\referencesource\System.Core\System\TimeZoneNotFoundException.cs" />
+    <Compile Include="..\referencesource\System.Core\System\threading\ReaderWriterLockSlim\ReaderWriterLockSlim.cs" />
+    <Compile Include="..\referencesource\System.Core\System\threading\Tasks\TaskExtensions.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="corefx\LambdaExpression.cs" />
-    <Compile Include="corefx\SR.cs" />
-    <Compile Include="corefx\SR.missing.cs" />
     <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedFileHandle.cs" />
     <Compile Include="Microsoft.Win32.SafeHandles\SafeMemoryMappedViewHandle.cs" />
     <Compile Include="Microsoft.Win32.SafeHandles\SafeNCryptHandle.cs" />
@@ -498,49 +524,9 @@
     <Compile Include="System.Security.Cryptography\SHA512CryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\TripleDESCng.cs" />
     <Compile Include="System\Util.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ReferenceEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\NotImplemented.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\Helpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AnalyzedTree.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AssemblyGen.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\BoundConstants.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.Storage.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\ILGen.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedStack.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LabelInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Address.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Binary.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.ControlFlow.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Expressions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Lambda.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Logical.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Statements.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Unary.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Bindings.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.ChildRewriter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.SpilledExpressionBlock.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Temps.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\VariableBinder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\RuntimeOps.ExpressionQuoter.cs" />
-    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
-    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellman.cs" />
-    <Compile Include="..\referencesource\System.Core\System\threading\ReaderWriterLockSlim\LockRecursionException.cs" />
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
+    <Compile Include="corefx\LambdaExpression.cs" />
+    <Compile Include="corefx\SR.cs" />
+    <Compile Include="corefx\SR.missing.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ReferenceEqualityComparer.cs" />
@@ -549,27 +535,27 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AnalyzedTree.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AssemblyGen.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\BoundConstants.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.Storage.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\ILGen.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedStack.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LabelInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Address.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Binary.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.ControlFlow.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Expressions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Generated.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Lambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Logical.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Statements.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Unary.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Bindings.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.ChildRewriter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Generated.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.SpilledExpressionBlock.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Temps.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\VariableBinder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\RuntimeOps.ExpressionQuoter.cs" />
     <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
@@ -581,57 +567,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DivInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\EqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ExclusiveOrInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\FieldOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\GreaterThanInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\GreaterThanOrEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\IncrementInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Instruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\InstructionList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\InterpretedFrame.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Interpreter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LabelInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LeftShiftInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\MulInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NegateInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NewInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NotEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NotInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NullCheckInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NumericConvertInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\OrInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\RightShiftInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\RuntimeVariables.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\StackOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\SubInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\TypeOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Utilities.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AddInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
@@ -652,106 +589,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\MulInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NegateInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NewInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NotEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NotInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NullCheckInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NumericConvertInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\OrInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\RightShiftInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\RuntimeVariables.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\StackOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\SubInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\TypeOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Utilities.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AddInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DivInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\EqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ExclusiveOrInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\FieldOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\GreaterThanInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\GreaterThanOrEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\IncrementInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Instruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\InstructionList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\InterpretedFrame.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Interpreter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LabelInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LeftShiftInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\MulInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NegateInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NewInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NotEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NotInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NullCheckInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NumericConvertInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\OrInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\RightShiftInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\RuntimeVariables.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\StackOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\SubInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\TypeOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Utilities.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch_runtime' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AddInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DivInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\EqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ExclusiveOrInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\FieldOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\GreaterThanInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\GreaterThanOrEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\IncrementInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Instruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\InstructionList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\InterpretedFrame.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Interpreter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LabelInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LeftShiftInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
@@ -769,16 +608,14 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\SubInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\TypeOperations.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Utilities.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AddInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
@@ -799,8 +636,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
@@ -818,16 +655,14 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\SubInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\TypeOperations.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Utilities.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AddInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
@@ -848,8 +683,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
@@ -867,41 +702,42 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\SubInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\TypeOperations.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Utilities.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ReferenceEqualityComparer.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\NotImplemented.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\Helpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AnalyzedTree.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AssemblyGen.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\BoundConstants.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.Storage.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\ILGen.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedStack.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LabelInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Address.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Binary.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.ControlFlow.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Expressions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Generated.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Lambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Logical.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Statements.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Unary.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Bindings.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.ChildRewriter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Generated.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.SpilledExpressionBlock.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Temps.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\VariableBinder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\RuntimeOps.ExpressionQuoter.cs" />
     <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
     <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellman.cs" />
+    <Compile Include="..\referencesource\System.Core\System\threading\ReaderWriterLockSlim\LockRecursionException.cs" />
+    <Compile Include="System.IO.Pipes\PipeUnix.cs" />
+    <Compile Include="System.IO.Pipes\PipeWin32.cs" />
     <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\AesTransform.cs" />
     <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
@@ -910,69 +746,13 @@
     <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
     <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AddInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DivInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\EqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ExclusiveOrInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\FieldOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\GreaterThanInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\GreaterThanOrEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\IncrementInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Instruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\InstructionList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\InterpretedFrame.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Interpreter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LabelInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LeftShiftInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\MulInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NegateInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NewInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NotEqualInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NotInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NullCheckInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\NumericConvertInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\OrInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\RightShiftInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\RuntimeVariables.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\StackOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\SubInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\TypeOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\Utilities.cs" />
-    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
-    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellman.cs" />
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AddInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
@@ -993,8 +773,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
@@ -1022,74 +802,38 @@
     <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
     <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ReferenceEqualityComparer.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\NotImplemented.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\Helpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AnalyzedTree.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AssemblyGen.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\BoundConstants.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.Storage.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\ILGen.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedStack.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LabelInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Address.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Binary.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.ControlFlow.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Expressions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Lambda.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Logical.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Statements.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Unary.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Bindings.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.ChildRewriter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.SpilledExpressionBlock.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Temps.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\VariableBinder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\RuntimeOps.ExpressionQuoter.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesCryptoServiceProvider.g.cs" />
-    <Compile Include="..\corlib\CommonCrypto\AesManaged.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ReferenceEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\NotImplemented.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\Helpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AnalyzedTree.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AssemblyGen.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\BoundConstants.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.Storage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\ILGen.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedStack.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LabelInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Address.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Binary.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.ControlFlow.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Expressions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Generated.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Lambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Logical.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Statements.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Unary.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Bindings.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.ChildRewriter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Generated.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.SpilledExpressionBlock.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Temps.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\VariableBinder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\RuntimeOps.ExpressionQuoter.cs" />
     <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
     <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellman.cs" />
-    <Compile Include="..\referencesource\System.Core\System\threading\ReaderWriterLockSlim\LockRecursionException.cs" />
-    <Compile Include="System.IO.Pipes\PipeUnix.cs" />
-    <Compile Include="System.IO.Pipes\PipeWin32.cs" />
     <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\AesTransform.cs" />
     <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
@@ -1098,13 +842,13 @@
     <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
     <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AddInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
@@ -1125,8 +869,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
@@ -1154,53 +898,13 @@
     <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
     <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ReferenceEqualityComparer.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\NotImplemented.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\Helpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AnalyzedTree.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AssemblyGen.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\BoundConstants.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.Storage.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\ILGen.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedStack.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LabelInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Address.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Binary.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.ControlFlow.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Expressions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Lambda.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Logical.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Statements.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Unary.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Bindings.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.ChildRewriter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Generated.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.SpilledExpressionBlock.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Temps.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\VariableBinder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\RuntimeOps.ExpressionQuoter.cs" />
-    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\AesManaged.cs" />
-    <Compile Include="..\referencesource\System.Core\System\Security\Cryptography\ECDiffieHellman.cs" />
-    <Compile Include="System.Security.Cryptography\AesCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\AesTransform.cs" />
-    <Compile Include="System.Security.Cryptography\MD5Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA256Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
-    <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AddInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\AndInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ArrayOperations.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\BranchLabel.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\CallInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ControlFlowInstructions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DecrementInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\DefaultValueInstruction.cs" />
@@ -1221,8 +925,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LessThanOrEqualInstruction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightDelegateCreator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LightLambda.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalAccess.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\LocalVariables.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Interpreter\ModuloInstruction.cs" />
@@ -1250,6 +954,37 @@
     <Compile Include="System.Security.Cryptography\SHA384Cng.cs" />
     <Compile Include="System.Security.Cryptography\SHA512Cng.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ReferenceEqualityComparer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\NotImplemented.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Dynamic\Utils\Helpers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AnalyzedTree.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\AssemblyGen.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\BoundConstants.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.Storage.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\CompilerScope.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\ILGen.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\KeyedStack.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LabelInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Address.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Binary.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.ControlFlow.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Expressions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Lambda.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Logical.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Statements.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.Unary.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\LambdaCompiler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Bindings.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.ChildRewriter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Generated.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.SpilledExpressionBlock.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.Temps.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\StackSpiller.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Linq\Expressions\Compiler\VariableBinder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Linq.Expressions\src\System\Runtime\CompilerServices\RuntimeOps.ExpressionQuoter.cs" />
+  </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj
index 5561c53372b..ae99559ac4a 100644
--- a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj
+++ b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\DataRowComparer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\DataRowExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.DataSetExtensions\src\System\Data\DataSetUtil.cs" />
@@ -59,6 +59,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="corefx\SR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Data.Entity/System.Data.Entity.csproj b/mcs/class/System.Data.Entity/System.Data.Entity.csproj
index 5812cd7dc94..14fd2bde90f 100644
--- a/mcs/class/System.Data.Entity/System.Data.Entity.csproj
+++ b/mcs/class/System.Data.Entity/System.Data.Entity.csproj
@@ -43,12 +43,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\misc\HResults.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\AbstractExpressions.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\Aggregates.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Common\CommandTrees\BasicCommandTreeVisitor.cs" />
@@ -228,10 +227,10 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\Function.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FunctionCommandText.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\FunctionImportElement.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IntegerFacetDescriptionElement.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IRelationship.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IRelationshipEnd.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ISchemaElementLookUpTable.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\IntegerFacetDescriptionElement.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ItemType.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\KeyProperty.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\EntityModel\SchemaObjectModel\ModelFunction.cs" />
@@ -285,18 +284,19 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\IExtendedDataRecord.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\InternalMappingException.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\InvalidCommandTreeException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\MappingException.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\BaseMetadataMappingVisitor.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\DefaultObjectMappingItemCollection.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\EntityViewContainer.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\EntityViewGenerationAttribute.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMapping.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMapping.ReturnTypeRenameMapping.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMapping.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMappingComposable.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\FunctionImportMappingNonComposable.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Mapping.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\MappingItemCollection.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\MetadataMappingHasherVisitor.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\MetadataMappingHasherVisitor.HashSourceBuilder.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\MetadataMappingHasherVisitor.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectAssociationEndMapping.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectComplexPropertyMapping.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ObjectMemberMapping.cs" />
@@ -315,8 +315,8 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageEntityTypeMapping.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingErrorCode.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingFragment.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemCollection.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemCollection.ViewDictionary.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemCollection.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMappingItemLoader.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageModificationFunctionMapping.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\StorageMslConstructs.cs" />
@@ -334,12 +334,12 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\FunctionUpdateCommand.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Graph.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\KeyManager.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.Evaluator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.ExtentPlaceholderCreator.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.JoinPredicateVisitor.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.SubstitutingCloneVisitor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.JoinPropagator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\Propagator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\PropagatorFlags.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\PropagatorResult.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\Update\Internal\RecordConverter.cs" />
@@ -430,12 +430,12 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewCellSlot.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validation\ViewKeyConstraint.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\Validator.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewgenContext.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewGenResults.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewGenerator.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewgenContext.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewgenGatekeeper.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewGeneration\ViewGenResults.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Mapping\ViewValidator.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\MappingException.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\MetadataException.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\AspProxy.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\CacheForPrimitiveTypes.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ClrPerspective.cs" />
@@ -443,6 +443,13 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\CustomAssemblyResolver.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\DataSpace.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\DefaultAssemblyResolver.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmError.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.OcAssemblyCache.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemError.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaError.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaErrorSeverity.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmValidator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationEndMember.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationSet.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\AssociationSetEnd.cs" />
@@ -493,8 +500,8 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifestFunctionBuilder.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\Provider\EdmProviderManifestSpatialFunctions.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ReadOnlyMetadataCollection.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ReferentialConstraint.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RefType.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\ReferentialConstraint.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipEndMember.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipMultiplicity.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\RelationshipSet.cs" />
@@ -506,13 +513,6 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\StructuralType.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\TypeUsage.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Edm\util.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmError.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemCollection.OcAssemblyCache.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmItemError.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaError.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmSchemaErrorSeverity.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\EdmValidator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Helper.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MappingMetadataHelper.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\MetadataArtifactAssemblyResolver.cs" />
@@ -545,13 +545,12 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ObjectLayer\ObjectItemNoOpAssemblyLoader.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\ParameterTypeSemantics.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\Perspective.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\StoreItemCollection.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\StoreItemCollection.Loader.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\StoreItemCollection.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\TargetPerspective.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\TypeHelpers.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\TypeSemantics.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Metadata\XmlConstants.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\MetadataException.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\ObjectNotFoundException.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\AdditionalEntityFunctions.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\CompiledQuery.cs" />
@@ -604,6 +603,9 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\EntityEntry.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\EntityFunctions.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\FieldDescriptor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\IObjectSet.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\IObjectView.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\IObjectViewData.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\BaseEntityWrapper.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\ComplexTypeMaterializer.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\EntityProxyFactory.cs" />
@@ -630,9 +632,6 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\PocoPropertyAccessorStrategy.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\SnapshotChangeTrackingStrategy.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\Internal\TransactionManager.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\IObjectSet.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\IObjectView.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\IObjectViewData.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\MergeOption.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\NextResultGenerator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Objects\ObjectContext.cs" />
@@ -694,12 +693,12 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Vars.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\InternalTrees\Visitors.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\AggregatePushdown.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CTreeGenerator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CodeGen.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ColumnMapProcessor.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ColumnMapTranslator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CommandPlan.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ConstraintManager.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\CTreeGenerator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ITreeGenerator.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\JoinElimination.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\JoinGraph.cs" />
@@ -709,8 +708,8 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Normalizer.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PlanCompiler.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PlanCompilerUtil.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Predicate.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PreProcessor.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\Predicate.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\ProjectionPruner.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PropertyPushdownHelper.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\Query\PlanCompiler\PropertyRef.cs" />
@@ -758,12 +757,13 @@
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderServices.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlProviderUtilities.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialDataReader.cs" />
-    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialServices.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialServices.Generated.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlSpatialServices.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlTypesAssembly.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\SqlClient\SqlVersion.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\System\Data\UpdateException.cs" />
     <Compile Include="..\referencesource\System.Data.Entity\Util\AppSettings.cs" />
+    <Compile Include="..\referencesource\System.Data.Entity\misc\HResults.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="EntityRes.cs" />
     <Compile Include="EntityResCategoryAttribute.cs" />
@@ -772,6 +772,7 @@
     <Compile Include="ReferenceSources\SR.cs" />
     <Compile Include="ReferenceSources\Strings.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Data.Linq/System.Data.Linq.csproj b/mcs/class/System.Data.Linq/System.Data.Linq.csproj
index 976bf02a824..74e75cadfa5 100644
--- a/mcs/class/System.Data.Linq/System.Data.Linq.csproj
+++ b/mcs/class/System.Data.Linq/System.Data.Linq.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -56,80 +57,82 @@
     <Compile Include="src\DbLinq.Firebird\FirebirdExpressionTranslator.cs" />
     <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Columns.cs" />
     <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Constraints.cs" />
-    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.cs" />
     <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.StoredProcedures.cs" />
     <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.Tables.cs" />
+    <Compile Include="src\DbLinq.Firebird\FirebirdSchemaLoader.cs" />
     <Compile Include="src\DbLinq.Firebird\FirebirdSqlProvider.cs" />
     <Compile Include="src\DbLinq.Firebird\FirebirdVendor.cs" />
     <Compile Include="src\DbLinq.Ingres\IngresDataContext.cs" />
     <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Columns.cs" />
     <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Constraints.cs" />
-    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.cs" />
     <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.StoredProcedures.cs" />
     <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.Tables.cs" />
+    <Compile Include="src\DbLinq.Ingres\IngresSchemaLoader.cs" />
     <Compile Include="src\DbLinq.Ingres\IngresSqlProvider.cs" />
     <Compile Include="src\DbLinq.Ingres\IngresVendor.cs" />
     <Compile Include="src\DbLinq.MySql\MySqlDataContext.cs" />
     <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Columns.cs" />
     <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Constraints.cs" />
-    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.cs" />
     <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.StoredProcedures.cs" />
     <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.Tables.cs" />
+    <Compile Include="src\DbLinq.MySql\MySqlSchemaLoader.cs" />
     <Compile Include="src\DbLinq.MySql\MySqlSqlProvider.cs" />
     <Compile Include="src\DbLinq.MySql\MySqlVendor.cs" />
     <Compile Include="src\DbLinq.Oracle\OracleDataContext.cs" />
     <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Columns.cs" />
     <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Constraints.cs" />
-    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.cs" />
     <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.StoredProcedures.cs" />
     <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.Tables.cs" />
+    <Compile Include="src\DbLinq.Oracle\OracleSchemaLoader.cs" />
     <Compile Include="src\DbLinq.Oracle\OracleSqlProvider.cs" />
     <Compile Include="src\DbLinq.Oracle\OracleVendor.cs" />
     <Compile Include="src\DbLinq.PostgreSql\PgsqlDataContext.cs" />
     <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Columns.cs" />
     <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Constraints.cs" />
-    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.cs" />
     <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.StoredProcedures.cs" />
     <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.Tables.cs" />
+    <Compile Include="src\DbLinq.PostgreSql\PgsqlSchemaLoader.cs" />
     <Compile Include="src\DbLinq.PostgreSql\PgsqlSqlProvider.cs" />
     <Compile Include="src\DbLinq.PostgreSql\PgsqlVendor.cs" />
+    <Compile Include="src\DbLinq.SqlServer\SqlServerDataContext.cs" />
+    <Compile Include="src\DbLinq.SqlServer\SqlServerExpressionTranslator.cs" />
+    <Compile Include="src\DbLinq.SqlServer\SqlServerSchemaLoader.cs" />
+    <Compile Include="src\DbLinq.SqlServer\SqlServerSqlProvider.cs" />
+    <Compile Include="src\DbLinq.SqlServer\SqlServerTypeConversions.cs" />
+    <Compile Include="src\DbLinq.SqlServer\SqlServerVendor.cs" />
     <Compile Include="src\DbLinq.Sqlite\Schema\DataCommand.cs" />
     <Compile Include="src\DbLinq.Sqlite\SqliteDataContext.cs" />
     <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Columns.cs" />
     <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Constraints.cs" />
-    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.cs" />
     <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.Tables.cs" />
+    <Compile Include="src\DbLinq.Sqlite\SqliteSchemaLoader.cs" />
     <Compile Include="src\DbLinq.Sqlite\SqliteSqlProvider.cs" />
     <Compile Include="src\DbLinq.Sqlite\SqliteVendor.cs" />
-    <Compile Include="src\DbLinq.SqlServer\SqlServerDataContext.cs" />
-    <Compile Include="src\DbLinq.SqlServer\SqlServerExpressionTranslator.cs" />
-    <Compile Include="src\DbLinq.SqlServer\SqlServerSchemaLoader.cs" />
-    <Compile Include="src\DbLinq.SqlServer\SqlServerSqlProvider.cs" />
-    <Compile Include="src\DbLinq.SqlServer\SqlServerTypeConversions.cs" />
-    <Compile Include="src\DbLinq.SqlServer\SqlServerVendor.cs" />
     <Compile Include="src\DbLinq\Data\Linq\ChangeAction.cs" />
     <Compile Include="src\DbLinq\Data\Linq\ChangeSet.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\DBLinqExtendedAttributte.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\DataContext.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\DataLoadOptions.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseContext.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Database\IDatabaseTransaction.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Database\ITransactionalCommand.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseConnection.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseContext.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\DatabaseTransaction.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Database\Implementation\TransactionalCommand.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Database\ITransactionalCommand.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\DataContext.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\DataLoadOptions.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\DBLinqExtendedAttributte.cs" />
     <Compile Include="src\DbLinq\Data\Linq\EntityRef.cs" />
     <Compile Include="src\DbLinq\Data\Linq\EntitySet.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Identity\IdentityKey.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\IExecuteResult.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\IMemberModificationHandler.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\ITable.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\IVendorProvider.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityProvider.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReader.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Identity\IIdentityReaderFactory.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Identity\IdentityKey.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityProviderReader.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReader.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Identity\Implementation\IdentityReaderFactory.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\IExecuteResult.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\IMemberModificationHandler.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Implementation\DisabledEntityTracker.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityState.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Implementation\EntityTrack.cs" />
@@ -138,8 +141,7 @@
     <Compile Include="src\DbLinq\Data\Linq\Implementation\MemberModificationHandler.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Implementation\QueryProvider.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Implementation\VendorProvider.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\ITable.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\IVendorProvider.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributeMappingSource.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAbstractMetaDataMember.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedAssociationMetaDataMember.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedColumnMetaDataMember.cs" />
@@ -148,16 +150,10 @@
     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaModel.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaTable.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributedMetaType.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Mapping\AttributeMappingSource.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Mapping\LambdaMetaAccessor.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Mapping\MappingContext.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Mapping\XmlMappingSource.cs" />
     <Compile Include="src\DbLinq\Data\Linq\RefreshMode.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlLiteralPart.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlParameterPart.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlPart.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatement.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatementBuilder.cs" />
     <Compile Include="src\DbLinq\Data\Linq\SqlClient\FirebirdProvider.cs" />
     <Compile Include="src\DbLinq\Data\Linq\SqlClient\IngresProvider.cs" />
     <Compile Include="src\DbLinq\Data\Linq\SqlClient\MySqlProvider.cs" />
@@ -166,8 +162,13 @@
     <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2000Provider.cs" />
     <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2005Provider.cs" />
     <Compile Include="src\DbLinq\Data\Linq\SqlClient\Sql2008Provider.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqliteProvider.cs" />
     <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqlServerProvider.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\SqlClient\SqliteProvider.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlLiteralPart.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlParameterPart.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlPart.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatement.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sql\SqlStatementBuilder.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\AbstractQuery.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\BuilderContext.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\DeleteQuery.cs" />
@@ -197,6 +198,7 @@
     <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionMutator\Implementation\UnaryExpressionMutator.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionPrecedence.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionQuery.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionTier.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\ColumnExpression.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\CustomExpressionType.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\EntitySetExpression.cs" />
@@ -219,35 +221,34 @@
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\SubSelectExpression.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableExpression.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Expressions\TableJoinType.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ExpressionTier.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataMapper.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\IDataRecordReader.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionDispatcher.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionLanguageParser.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionOptimizer.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\IExpressionQualifier.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sugar\IPrequelAnalyzer.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryBuilder.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryCache.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryRunner.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISpecialExpressionTranslator.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISqlBuilder.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataMapper.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\DataRecordReader.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Analyzer.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.Registrar.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionDispatcher.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionLanguageParser.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionOptimizer.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\ExpressionQualifier.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\LineGrouping.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\PrequelAnalyzer.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.Upsert.cs" />
+    <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryBuilder.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryCache.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\QueryRunner.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SpecialExpressionTranslator.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\Implementation\SqlBuilder.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IPrequelAnalyzer.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryBuilder.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryCache.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\IQueryRunner.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISpecialExpressionTranslator.cs" />
-    <Compile Include="src\DbLinq\Data\Linq\Sugar\ISqlBuilder.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\ParameterizedQuery.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\QueryContext.cs" />
     <Compile Include="src\DbLinq\Data\Linq\Sugar\SelectQuery.cs" />
@@ -255,11 +256,11 @@
     <Compile Include="src\DbLinq\Data\Linq\Table.cs" />
     <Compile Include="src\DbLinq\DbLinqToDoAttribute.cs" />
     <Compile Include="src\DbLinq\Factory\DbLinqAttribute.cs" />
-    <Compile Include="src\DbLinq\Factory\Implementation\ReflectionObjectFactory.cs" />
     <Compile Include="src\DbLinq\Factory\IObjectFactory.cs" />
+    <Compile Include="src\DbLinq\Factory\Implementation\ReflectionObjectFactory.cs" />
     <Compile Include="src\DbLinq\Factory\ObjectFactory.cs" />
-    <Compile Include="src\DbLinq\Language\ILanguages.cs" />
     <Compile Include="src\DbLinq\Language\ILanguageWords.cs" />
+    <Compile Include="src\DbLinq\Language\ILanguages.cs" />
     <Compile Include="src\DbLinq\Language\Implementation\AbstractEndPluralWords.cs" />
     <Compile Include="src\DbLinq\Language\Implementation\AbstractWords.cs" />
     <Compile Include="src\DbLinq\Language\Implementation\Languages.cs" />
@@ -277,8 +278,8 @@
     <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.Adapter.cs" />
     <Compile Include="src\DbLinq\Schema\Dbml\DbmlSchema.cs" />
     <Compile Include="src\DbLinq\Schema\Dbml\DbmlSerializer.cs" />
-    <Compile Include="src\DbLinq\Schema\Implementation\NameFormatter.cs" />
     <Compile Include="src\DbLinq\Schema\INameFormatter.cs" />
+    <Compile Include="src\DbLinq\Schema\Implementation\NameFormatter.cs" />
     <Compile Include="src\DbLinq\Schema\Name.cs" />
     <Compile Include="src\DbLinq\Schema\NameFormat.cs" />
     <Compile Include="src\DbLinq\Schema\ParameterName.cs" />
@@ -356,8 +357,11 @@
     <Compile Include="src\DbLinq\Vendor\IDataName.cs" />
     <Compile Include="src\DbLinq\Vendor\IDataTableColumn.cs" />
     <Compile Include="src\DbLinq\Vendor\IDataType.cs" />
+    <Compile Include="src\DbLinq\Vendor\INameAliases.cs" />
+    <Compile Include="src\DbLinq\Vendor\ISchemaLoader.cs" />
+    <Compile Include="src\DbLinq\Vendor\ISqlProvider.cs" />
+    <Compile Include="src\DbLinq\Vendor\IVendor.cs" />
     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Columns.cs" />
-    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.cs" />
     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataName.cs" />
     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.DataTableColumn.cs" />
     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.ForeignKey.cs" />
@@ -365,15 +369,13 @@
     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.StoredProcedures.cs" />
     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.Tables.cs" />
     <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.TypeMapping.cs" />
+    <Compile Include="src\DbLinq\Vendor\Implementation\SchemaLoader.cs" />
     <Compile Include="src\DbLinq\Vendor\Implementation\SqlProvider.cs" />
-    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.cs" />
     <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.ProcedureResult.cs" />
-    <Compile Include="src\DbLinq\Vendor\INameAliases.cs" />
-    <Compile Include="src\DbLinq\Vendor\ISchemaLoader.cs" />
-    <Compile Include="src\DbLinq\Vendor\ISqlProvider.cs" />
-    <Compile Include="src\DbLinq\Vendor\IVendor.cs" />
+    <Compile Include="src\DbLinq\Vendor\Implementation\Vendor.cs" />
     <Compile Include="src\DbLinq\Vendor\VendorAttribute.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj
index b1b597a8a02..925617a8ccb 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -116,6 +116,7 @@
     <Compile Include="System.Data.OracleClient\OracleTransaction.cs" />
     <Compile Include="System.Data.OracleClient\OracleType.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj
index ab0ffb32df8..77faeef931d 100644
--- a/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj
+++ b/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj
@@ -103,6 +103,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -206,9 +207,9 @@
     <Compile Include="Client\System\Data\Services\Client\SendingRequestEventArgs.cs" />
     <Compile Include="Client\System\Data\Services\Client\Util.cs" />
     <Compile Include="Client\System\Data\Services\Client\WebUtil.cs" />
+    <Compile Include="Client\System\Data\Services\Client\XmlUtil.cs" />
     <Compile Include="Client\System\Data\Services\Client\Xml\XmlAtomErrorReader.cs" />
     <Compile Include="Client\System\Data\Services\Client\Xml\XmlWrappingReader.cs" />
-    <Compile Include="Client\System\Data\Services\Client\XmlUtil.cs" />
     <Compile Include="Server\System\Data\Services\Epm\EpmContentSerializerBase.cs" />
     <Compile Include="Server\System\Data\Services\Epm\EpmCustomContentSerializer.cs" />
     <Compile Include="Server\System\Data\Services\Epm\EpmCustomContentWriterNodeData.cs" />
@@ -221,6 +222,7 @@
     <Compile Include="Server\System\Data\Services\Providers\EntityPropertyMappingInfo.cs" />
     <Compile Include="Server\System\Data\Services\XmlConstants.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Data.Services/System.Data.Services.csproj b/mcs/class/System.Data.Services/System.Data.Services.csproj
index 761b4141c23..3d0bb8794b3 100644
--- a/mcs/class/System.Data.Services/System.Data.Services.csproj
+++ b/mcs/class/System.Data.Services/System.Data.Services.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -101,19 +101,19 @@
     <Compile Include="System.Data.Services\DataServiceOperationContext.cs" />
     <Compile Include="System.Data.Services\DataServiceProcessingPipeline.cs" />
     <Compile Include="System.Data.Services\DataServiceProcessingPipelineEventArgs.cs" />
-    <Compile Include="System.Data.Services\EntitySetRights.cs" />
     <Compile Include="System.Data.Services\ETagAttribute.cs" />
+    <Compile Include="System.Data.Services\EntitySetRights.cs" />
     <Compile Include="System.Data.Services\ExpandSegment.cs" />
     <Compile Include="System.Data.Services\ExpandSegmentCollection.cs" />
     <Compile Include="System.Data.Services\HandleExceptionArgs.cs" />
     <Compile Include="System.Data.Services\IDataServiceConfiguration.cs" />
     <Compile Include="System.Data.Services\IDataServiceHost.cs" />
     <Compile Include="System.Data.Services\IDataServiceHost2.cs" />
-    <Compile Include="System.Data.Services\IExpandedResult.cs" />
     <Compile Include="System.Data.Services\IExpandProvider.cs" />
-    <Compile Include="System.Data.Services\IgnorePropertiesAttribute.cs" />
+    <Compile Include="System.Data.Services\IExpandedResult.cs" />
     <Compile Include="System.Data.Services\IRequestHandler.cs" />
     <Compile Include="System.Data.Services\IUpdatable.cs" />
+    <Compile Include="System.Data.Services\IgnorePropertiesAttribute.cs" />
     <Compile Include="System.Data.Services\MimeTypeAttribute.cs" />
     <Compile Include="System.Data.Services\ProcessRequestArgs.cs" />
     <Compile Include="System.Data.Services\QueryInterceptorAttribute.cs" />
@@ -121,6 +121,7 @@
     <Compile Include="System.Data.Services\SingleResultAttribute.cs" />
     <Compile Include="System.Data.Services\UpdateOperations.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Data/System.Data.csproj b/mcs/class/System.Data/System.Data.csproj
index 0511acd10b0..d1caa9f168e 100644
--- a/mcs/class/System.Data/System.Data.csproj
+++ b/mcs/class/System.Data/System.Data.csproj
@@ -104,13 +104,10 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\AdapterUtil.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\AdapterUtil.Drivers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\AdapterUtil.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\BasicFieldNameLookup.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\DbConnectionOptions.Common.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\Common\DbConnectionPoolKey.cs" />
@@ -125,7 +122,6 @@
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\ProviderBase\DbMetaDataFactory.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\ProviderBase\DbReferenceCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Data\ProviderBase\TimeoutTimer.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsPal.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\DebugSafeHandle.cs" />
@@ -133,14 +129,9 @@
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Logging\DebugThreadTracking.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Logging\NetEventSource.Common.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\NegotiationInfoClass.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\SecurityStatusPal.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SecurityBuffer.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SecurityBufferType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\SecurityStatusPal.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\NotImplemented.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Threading\Tasks\TaskToApm.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\AcceptRejectRule.cs" />
@@ -156,6 +147,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\BooleanStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\ByteStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\CharStorage.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBCommandBuilder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBSchemaRow.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBSchemaTable.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataAdapter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataColumnMapping.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DataColumnMappingCollection.cs" />
@@ -168,7 +162,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DateTimeStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbColumn.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbCommand.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBCommandBuilder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbConnection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbConnectionOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbConnectionStringBuilder.cs" />
@@ -187,14 +180,11 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbProviderFactory.CreatePermission.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbProviderFactory.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbProviderSpecificTypePropertyAttribute.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBSchemaRow.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DBSchemaTable.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DbTransaction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DecimalStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\DoubleStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\Groupbybehavior.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\IDbColumnSchemaGenerator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\identifiercase.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\Int16Storage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\Int32Storage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\Int64Storage.cs" />
@@ -202,14 +192,10 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\RowUpdatedEventArgs.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\RowUpdatingEventArgs.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SByteStorage.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SchemaTableColumn.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SchemaTableOptionalColumn.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SingleStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLConvert.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLBinaryStorage.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQlBooleanStorage.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLBytesStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLByteStorage.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLBytesStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLCharsStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLDateTimeStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLDecimalStorage.cs" />
@@ -221,6 +207,10 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLMoneyStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLSingleStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQLStringStorage.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SQLTypes\SQlBooleanStorage.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SchemaTableColumn.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SchemaTableOptionalColumn.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SingleStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SqlUDTStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\StringStorage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\SupportedJoinOperators.cs" />
@@ -228,12 +218,14 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\UInt16Storage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\UInt32Storage.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\UInt64Storage.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Common\identifiercase.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConflictOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConnectionState.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Constraint.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConstraintCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConstraintConverter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ConstraintEnumerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DBConcurrencyException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataColumn.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataColumnChangeEvent.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataColumnChangeEventHandler.cs" />
@@ -275,7 +267,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataViewRowState.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataViewSetting.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DataViewSettingCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DBConcurrencyException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DbType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\DefaultValueTypeConverter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\FillErrorEventArgs.cs" />
@@ -307,9 +298,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDbDataAdapter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDbDataParameter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IDbTransaction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IsolationLevel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ITableMapping.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\ITableMappingCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\IsolationLevel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\KeyRestrictionBehavior.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\LoadOption.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\MappingType.cs" />
@@ -329,19 +320,12 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\RelatedView.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\RelationshipConverter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Rule.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SchemaSerializationMode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SchemaType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Select.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Selection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SimpleType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SqlDbType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\INullable.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLBinary.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLBoolean.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLByte.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLBytes.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLChars.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SqlCharStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLDateTime.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLDecimal.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLDouble.cs" />
@@ -353,7 +337,14 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLSingle.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLString.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SQLUtility.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SqlCharStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SQLTypes\SqlXml.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SchemaSerializationMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SchemaType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Select.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\Selection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SimpleType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\SqlDbType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\StateChangeEvent.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\StateChangeEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\StatementCompletedEventArgs.cs" />
@@ -362,16 +353,16 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\StrongTypingException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\UniqueConstraint.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\UpdateRowSource.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\updatestatus.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XDRSchema.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlDataLoader.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XMLDiffLoader.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XMLSchema.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlDataLoader.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlKeywords.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlReadMode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\xmlsaver.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XMLSchema.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlToDatasetMap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\XmlWriteMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\updatestatus.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Data\xmlsaver.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\HResults.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\BaseTreeIterator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\DataDocumentXPathNavigator.cs" />
@@ -380,16 +371,15 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\IXmlDataVirtualNode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\RegionIterator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\TreeIterator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XPathNodePointer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlBoundElement.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlDataDocument.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlDataImplementation.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XPathNodePointer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\DBConnectionString.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\NameValuePermission.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\SafeNativeMethods.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\ProviderBase\DbBuffer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Common.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\ExtendedClrTypeCode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\ITypedGetters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Microsoft\SqlServer\Server\ITypedGettersV3.cs" />
@@ -421,21 +411,14 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPool.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolProviderInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlMetaData.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlNorm.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlNotificationRequest.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlSer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\ApplicationIntent.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\OnChangedEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\ParameterPeekAheadValue.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\RowsCopiedEventArgs.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\RowsCopiedEventHandler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNICommon.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIError.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIHandle.cs" />
@@ -447,9 +430,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIPacket.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNIProxy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SNITcpHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SSRP.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SslOverTdsStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SspiClientContextStatus.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\SSRP.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SortOrder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBuffer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopyColumnMapping.cs" />
@@ -500,7 +483,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsEnums.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParameterSetter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserHelperClasses.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserSessionPool.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserStateObject.cs" />
@@ -510,6 +492,10 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsRecordBufferSetter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsValueSetter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlTypes\SqlTypeWorkarounds.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlMetaData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlNorm.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlNotificationRequest.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlSer.cs" />
     <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -522,8 +508,8 @@
     <Compile Include="..\referencesource\System.Data\System\Data\DataSet.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbType.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\OleDb\PropertyAttributes.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlClientPermission.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\IBinarySerialize.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\Sql\invalidudtexception.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlDataSourceEnumerator.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlFacetAttribute.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlFunctionAttribute.cs" />
@@ -534,62 +520,38 @@
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlUserDefinedAggregateAttribute.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\SqlUserDefinedTypeAttribute.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\Sql\TriggerAction.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlClientPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Sql\invalidudtexception.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="System.Data.SqlClient\SQLDebugging.cs" />
+    <Compile Include="System.Data.SqlClient\SqlCredential.cs" />
     <Compile Include="corefx\DbConnectionOptions.cs" />
     <Compile Include="corefx\DiagnosticListener.cs" />
-    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
     <Compile Include="corefx\Odbc\AdapterUtil.cs" />
     <Compile Include="corefx\Odbc\Res.cs" />
+    <Compile Include="corefx\SR.cs" />
     <Compile Include="corefx\SqlClientFactory.cs" />
     <Compile Include="corefx\SqlConnection.cs" />
     <Compile Include="corefx\SqlConnectionStringBuilder.cs" />
     <Compile Include="corefx\SqlDependencyUtils.cs" />
     <Compile Include="corefx\SqlParameterCollection.cs" />
-    <Compile Include="corefx\SR.cs" />
     <Compile Include="corefx\TdsEnums.cs" />
     <Compile Include="corefx\ThisAssembly.cs" />
-    <Compile Include="System.Data.SqlClient\SqlCredential.cs" />
-    <Compile Include="System.Data.SqlClient\SQLDebugging.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Interop.Odbc.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Linux\Interop.Libraries.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\HResults.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\DbDataRecord.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\Odbc32.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommand.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommandBuilder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionFactory.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHandle.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionPoolProviderInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionString.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionStringbuilder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataAdapter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataReader.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironment.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironmentHandle.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcError.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcErrorCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcException.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcFactory.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcHandle.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcInfoMessageEvent.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataCollectionNames.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataColumnNames.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataFactory.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollectionHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcRowUpdatingEvent.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcStatementHandle.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcTransaction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcUtils.cs" />
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -602,25 +564,26 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
-    <Compile Include="..\referencesource\System.Data\Misc\PrivilegedConfigurationManager.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\CodeGen\datacache.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderConfigurationHandler.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactories.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactoriesConfigurationHandler.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\Common\HandlerBase.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionOpen.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcPermission.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbPermission.cs" />
-    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />
-    <Compile Include="corefx\Odbc\DbConnectionStringCommon.cs" />
-    <Compile Include="corefx\Odbc\OdbcFactory.cs" />
-    <Compile Include="corefx\OleDbStubs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
-    <Compile Include="Microsoft.SqlServer.Server\SqlContext.cs" />
-    <Compile Include="Microsoft.SqlServer.Server\SqlPipe.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -633,10 +596,26 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -649,10 +628,27 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
     <Compile Include="System.Data.SqlClient\SqlBulkCopy.platformnotsupported.cs" />
     <Compile Include="System.Data.SqlClient\SqlCommand.platformnotsupported.cs" />
     <Compile Include="System.Data.SqlClient\SqlCommandBuilder.platformnotsupported.cs" />
@@ -662,40 +658,60 @@
     <Compile Include="System.Data.SqlClient\SqlParameter.platformnotsupported.cs" />
     <Compile Include="System.Data.SqlClient\SqlParameterCollection.platformnotsupported.cs" />
     <Compile Include="System.Data.SqlClient\SqlTransaction.platformnotsupported.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDataAdapter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlException.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
-    <Compile Include="corefx\SqlCommand.cs" />
-    <Compile Include="corefx\SqlException.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDataAdapter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlException.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
-    <Compile Include="corefx\SqlCommand.cs" />
-    <Compile Include="corefx\SqlException.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|linux' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Interop.Odbc.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Linux\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\HResults.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\DbDataRecord.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\Odbc32.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommand.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommandBuilder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionPoolProviderInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionString.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionStringbuilder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataAdapter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataReader.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironmentHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcError.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcErrorCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcInfoMessageEvent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataCollectionNames.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataColumnNames.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcReferenceCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcRowUpdatingEvent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcStatementHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -708,10 +724,78 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="..\referencesource\System.Data\Misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\CodeGen\datacache.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderConfigurationHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactories.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactoriesConfigurationHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\HandlerBase.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionOpen.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />
+    <Compile Include="Microsoft.SqlServer.Server\SqlContext.cs" />
+    <Compile Include="Microsoft.SqlServer.Server\SqlPipe.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
+    <Compile Include="corefx\Odbc\DbConnectionStringCommon.cs" />
+    <Compile Include="corefx\Odbc\OdbcFactory.cs" />
+    <Compile Include="corefx\OleDbStubs.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|macos' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Interop.Odbc.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\HResults.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\DbDataRecord.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\Odbc32.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommand.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommandBuilder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionPoolProviderInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionString.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionStringbuilder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataAdapter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataReader.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironmentHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcError.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcErrorCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcInfoMessageEvent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataCollectionNames.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataColumnNames.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcReferenceCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcRowUpdatingEvent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcStatementHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -724,10 +808,78 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="..\referencesource\System.Data\Misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\CodeGen\datacache.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderConfigurationHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactories.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactoriesConfigurationHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\HandlerBase.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionOpen.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />
+    <Compile Include="Microsoft.SqlServer.Server\SqlContext.cs" />
+    <Compile Include="Microsoft.SqlServer.Server\SqlPipe.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
+    <Compile Include="corefx\Odbc\DbConnectionStringCommon.cs" />
+    <Compile Include="corefx\Odbc\OdbcFactory.cs" />
+    <Compile Include="corefx\OleDbStubs.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|unix' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Interop.Odbc.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Linux\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\HResults.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\DbDataRecord.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\Odbc32.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommand.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommandBuilder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionPoolProviderInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionString.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcConnectionStringbuilder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataAdapter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcDataReader.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcEnvironmentHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcError.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcErrorCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcInfoMessageEvent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataCollectionNames.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataColumnNames.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcMetaDataFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterCollectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcParameterHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcReferenceCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcRowUpdatingEvent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcStatementHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -740,12 +892,62 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="..\referencesource\System.Data\Misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\CodeGen\datacache.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderConfigurationHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactories.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderFactoriesConfigurationHandler.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Common\HandlerBase.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcConnectionOpen.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbPermission.cs" />
+    <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />
+    <Compile Include="Microsoft.SqlServer.Server\SqlContext.cs" />
+    <Compile Include="Microsoft.SqlServer.Server\SqlPipe.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
+    <Compile Include="corefx\Odbc\DbConnectionStringCommon.cs" />
+    <Compile Include="corefx\Odbc\OdbcFactory.cs" />
+    <Compile Include="corefx\OleDbStubs.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|win32' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Interop.Odbc.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\Crypt32\Interop.certificates.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\Crypt32\Interop.certificates_types.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\kernel32\Interop.CloseHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\kernel32\Interop.FreeLibrary.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\kernel32\Interop.GetProcAddress.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\kernel32\Interop.LoadLibraryEx.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\GlobalSSPI.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\Interop.SSPI.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\NegotiationInfoClass.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SSPIAuthType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SSPIInterface.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SSPISecureChannelType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SSPIWrapper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SecPkgContext_Bindings.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SecPkgContext_Sizes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SecurityPackageInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SecurityPackageInfoClass.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\sspicli\SecuritySafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\BidirectionalDictionary.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Windows.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\SecurityStatusAdapterPal.Windows.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Windows.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NetEventSource.Security.Windows.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NetEventSource.Security.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SecurityContextTokenHandle.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\HResults.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\DbDataRecord.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\Odbc32.cs" />
@@ -781,6 +983,11 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcTransaction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Windows.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Common.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Windows.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Windows.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -793,6 +1000,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Windows.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParserStateObjectNative.cs" />
     <Compile Include="..\referencesource\System.Data\Misc\PrivilegedConfigurationManager.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\CodeGen\datacache.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\Common\DbProviderConfigurationHandler.cs" />
@@ -803,15 +1013,29 @@
     <Compile Include="..\referencesource\System.Data\System\Data\Odbc\OdbcPermission.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\OleDb\OleDbPermission.cs" />
     <Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />
+    <Compile Include="Microsoft.SqlServer.Server\SqlContext.cs" />
+    <Compile Include="Microsoft.SqlServer.Server\SqlPipe.cs" />
     <Compile Include="corefx\Odbc\DbConnectionStringCommon.cs" />
     <Compile Include="corefx\Odbc\OdbcFactory.cs" />
     <Compile Include="corefx\OleDbStubs.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
-    <Compile Include="Microsoft.SqlServer.Server\SqlContext.cs" />
-    <Compile Include="Microsoft.SqlServer.Server\SqlPipe.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -824,10 +1048,26 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -840,10 +1080,58 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDataAdapter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
+    <Compile Include="corefx\SqlCommand.cs" />
+    <Compile Include="corefx\SqlException.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
@@ -856,6 +1144,40 @@
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
+    <Compile Include="corefx\SqlCommand.cs" />
+    <Compile Include="corefx\SqlException.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextFlagsAdapterPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\NegotiateStreamPal.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeDeleteNegoContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\Unix\SafeFreeNegoCredentials.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\Interop\SNINativeMethodWrapper.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SNI\LocalDB.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlBulkCopy.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommand.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlCommandBuilder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlConnectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlDataAdapter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterCollectionHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlParameterHelper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParser.Unix.cs" />
+    <Compile Include="corefx\Interop.NetSecurityNative.cs" />
     <Compile Include="corefx\SqlCommand.cs" />
     <Compile Include="corefx\SqlException.cs" />
   </ItemGroup>
diff --git a/mcs/class/System.Deployment/System.Deployment.csproj b/mcs/class/System.Deployment/System.Deployment.csproj
index 86a1ea2c5fe..5255a0ca8d1 100644
--- a/mcs/class/System.Deployment/System.Deployment.csproj
+++ b/mcs/class/System.Deployment/System.Deployment.csproj
@@ -44,11 +44,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Design/System.Design.csproj b/mcs/class/System.Design/System.Design.csproj
index 58cb94794c0..8c24fae054c 100644
--- a/mcs/class/System.Design/System.Design.csproj
+++ b/mcs/class/System.Design/System.Design.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptor.cs" />
     <Compile Include="System.ComponentModel.Design.Data\DataSourceDescriptorCollection.cs" />
@@ -97,6 +97,14 @@
     <Compile Include="System.ComponentModel.Design\ComponentActionsType.cs" />
     <Compile Include="System.ComponentModel.Design\ComponentDesigner.cs" />
     <Compile Include="System.ComponentModel.Design\DateTimeEditor.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignModeNestedContainer.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignModeSite.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurface.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceCollection.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventArgs.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventHandler.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceManager.cs" />
+    <Compile Include="System.ComponentModel.Design\DesignSurfaceServiceContainer.cs" />
     <Compile Include="System.ComponentModel.Design\DesignerActionHeaderItem.cs" />
     <Compile Include="System.ComponentModel.Design\DesignerActionItem.cs" />
     <Compile Include="System.ComponentModel.Design\DesignerActionItemCollection.cs" />
@@ -116,14 +124,6 @@
     <Compile Include="System.ComponentModel.Design\DesignerCommandSet.cs" />
     <Compile Include="System.ComponentModel.Design\DesignerEventService.cs" />
     <Compile Include="System.ComponentModel.Design\DesignerHost.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignModeNestedContainer.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignModeSite.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignSurface.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceCollection.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventArgs.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceEventHandler.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceManager.cs" />
-    <Compile Include="System.ComponentModel.Design\DesignSurfaceServiceContainer.cs" />
     <Compile Include="System.ComponentModel.Design\DisplayMode.cs" />
     <Compile Include="System.ComponentModel.Design\EventBindingService.cs" />
     <Compile Include="System.ComponentModel.Design\ExceptionCollection.cs" />
@@ -134,10 +134,10 @@
     <Compile Include="System.ComponentModel.Design\LoadedEventArgs.cs" />
     <Compile Include="System.ComponentModel.Design\LoadedEventHandler.cs" />
     <Compile Include="System.ComponentModel.Design\LocalizationExtenderProvider.cs" />
+    <Compile Include="System.ComponentModel.Design\MenuCommandService.cs" />
     <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventArgs.cs" />
     <Compile Include="System.ComponentModel.Design\MenuCommandsChangedEventHandler.cs" />
     <Compile Include="System.ComponentModel.Design\MenuCommandsChangedType.cs" />
-    <Compile Include="System.ComponentModel.Design\MenuCommandService.cs" />
     <Compile Include="System.ComponentModel.Design\MultilineStringEditor.cs" />
     <Compile Include="System.ComponentModel.Design\ObjectSelectorEditor.cs" />
     <Compile Include="System.ComponentModel.Design\ReferenceService.cs" />
@@ -216,6 +216,8 @@
     <Compile Include="System.Web.UI.Design\DataSourceConverter.cs" />
     <Compile Include="System.Web.UI.Design\DataSourceDesigner.cs" />
     <Compile Include="System.Web.UI.Design\DataSourceViewSchemaConverter.cs" />
+    <Compile Include="System.Web.UI.Design\DesignTimeData.cs" />
+    <Compile Include="System.Web.UI.Design\DesignTimeResourceProviderFactory.cs" />
     <Compile Include="System.Web.UI.Design\DesignerAutoFormat.cs" />
     <Compile Include="System.Web.UI.Design\DesignerAutoFormatCollection.cs" />
     <Compile Include="System.Web.UI.Design\DesignerAutoFormatStyle.cs" />
@@ -225,8 +227,6 @@
     <Compile Include="System.Web.UI.Design\DesignerRegion.cs" />
     <Compile Include="System.Web.UI.Design\DesignerRegionCollection.cs" />
     <Compile Include="System.Web.UI.Design\DesignerRegionMouseEventArgs.cs" />
-    <Compile Include="System.Web.UI.Design\DesignTimeData.cs" />
-    <Compile Include="System.Web.UI.Design\DesignTimeResourceProviderFactory.cs" />
     <Compile Include="System.Web.UI.Design\EditableDesignerRegion.cs" />
     <Compile Include="System.Web.UI.Design\ExpressionEditor.cs" />
     <Compile Include="System.Web.UI.Design\ExpressionEditorSheet.cs" />
@@ -253,7 +253,6 @@
     <Compile Include="System.Web.UI.Design\IFolderProjectItem.cs" />
     <Compile Include="System.Web.UI.Design\IHierarchicalDataSourceDesigner.cs" />
     <Compile Include="System.Web.UI.Design\IHtmlControlDesignerBehavior.cs" />
-    <Compile Include="System.Web.UI.Design\ImageUrlEditor.cs" />
     <Compile Include="System.Web.UI.Design\IProjectItem.cs" />
     <Compile Include="System.Web.UI.Design\ITemplateEditingFrame.cs" />
     <Compile Include="System.Web.UI.Design\ITemplateEditingService.cs" />
@@ -262,6 +261,7 @@
     <Compile Include="System.Web.UI.Design\IWebFormReferenceManager.cs" />
     <Compile Include="System.Web.UI.Design\IWebFormsBuilderUIService.cs" />
     <Compile Include="System.Web.UI.Design\IWebFormsDocumentService.cs" />
+    <Compile Include="System.Web.UI.Design\ImageUrlEditor.cs" />
     <Compile Include="System.Web.UI.Design\MailFileEditor.cs" />
     <Compile Include="System.Web.UI.Design\MdbDataFileEditor.cs" />
     <Compile Include="System.Web.UI.Design\ReadWriteControlDesigner.cs" />
@@ -269,14 +269,14 @@
     <Compile Include="System.Web.UI.Design\ResourceExpressionEditorSheet.cs" />
     <Compile Include="System.Web.UI.Design\SkinIDTypeConverter.cs" />
     <Compile Include="System.Web.UI.Design\SupportsPreviewControlAttribute.cs" />
-    <Compile Include="System.Web.UI.Design\TemplatedControlDesigner.cs" />
-    <Compile Include="System.Web.UI.Design\TemplatedEditableDesignerRegion.cs" />
     <Compile Include="System.Web.UI.Design\TemplateDefinition.cs" />
     <Compile Include="System.Web.UI.Design\TemplateEditingService.cs" />
     <Compile Include="System.Web.UI.Design\TemplateEditingVerb.cs" />
     <Compile Include="System.Web.UI.Design\TemplateGroup.cs" />
     <Compile Include="System.Web.UI.Design\TemplateGroupCollection.cs" />
     <Compile Include="System.Web.UI.Design\TemplateModeChangedEventArgs.cs" />
+    <Compile Include="System.Web.UI.Design\TemplatedControlDesigner.cs" />
+    <Compile Include="System.Web.UI.Design\TemplatedEditableDesignerRegion.cs" />
     <Compile Include="System.Web.UI.Design\TextControlDesigner.cs" />
     <Compile Include="System.Web.UI.Design\TextDataBindingHandler.cs" />
     <Compile Include="System.Web.UI.Design\TransactedChangeCallback.cs" />
@@ -340,17 +340,17 @@
     <Compile Include="System.Windows.Forms.Design\EventHandlerService.cs" />
     <Compile Include="System.Windows.Forms.Design\FileNameEditor.cs" />
     <Compile Include="System.Windows.Forms.Design\FolderNameEditor.cs" />
-    <Compile Include="System.Windows.Forms.Design\FormatStringEditor.cs" />
     <Compile Include="System.Windows.Forms.Design\FormDocumentDesigner.cs" />
-    <Compile Include="System.Windows.Forms.Design\ImageCollectionEditor.cs" />
-    <Compile Include="System.Windows.Forms.Design\ImageIndexEditor.cs" />
-    <Compile Include="System.Windows.Forms.Design\ImageListCodeDomSerializer.cs" />
-    <Compile Include="System.Windows.Forms.Design\ImageListImageEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\FormatStringEditor.cs" />
     <Compile Include="System.Windows.Forms.Design\IMenuEditorService.cs" />
     <Compile Include="System.Windows.Forms.Design\IMessageReceiver.cs" />
     <Compile Include="System.Windows.Forms.Design\IOleDragClient.cs" />
     <Compile Include="System.Windows.Forms.Design\ISelectionUIHandler.cs" />
     <Compile Include="System.Windows.Forms.Design\IUISelectionService.cs" />
+    <Compile Include="System.Windows.Forms.Design\ImageCollectionEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\ImageIndexEditor.cs" />
+    <Compile Include="System.Windows.Forms.Design\ImageListCodeDomSerializer.cs" />
+    <Compile Include="System.Windows.Forms.Design\ImageListImageEditor.cs" />
     <Compile Include="System.Windows.Forms.Design\ListControlStringCollectionEditor.cs" />
     <Compile Include="System.Windows.Forms.Design\MaskDescriptor.cs" />
     <Compile Include="System.Windows.Forms.Design\MenuCommands.cs" />
@@ -369,6 +369,7 @@
     <Compile Include="System.Windows.Forms.Design\WindowsFormsDesignerOptionService.cs" />
     <Compile Include="System.Windows.Forms.Design\WndProcRouter.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj
index 32a48909dd3..a7312b2ae7a 100644
--- a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj
+++ b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -63,6 +63,8 @@
     <Compile Include="System.DirectoryServices.Protocols\DeleteResponse.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DereferenceAlias.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DereferenceConnectionCallback.cs" />
+    <Compile Include="System.DirectoryServices.Protocols\DirSyncRequestControl.cs" />
+    <Compile Include="System.DirectoryServices.Protocols\DirSyncResponseControl.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DirectoryAttribute.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeCollection.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DirectoryAttributeModification.cs" />
@@ -79,8 +81,6 @@
     <Compile Include="System.DirectoryServices.Protocols\DirectoryRequest.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DirectoryResponse.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DirectorySynchronizationOptions.cs" />
-    <Compile Include="System.DirectoryServices.Protocols\DirSyncRequestControl.cs" />
-    <Compile Include="System.DirectoryServices.Protocols\DirSyncResponseControl.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DomainScopeControl.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DsmlAuthRequest.cs" />
     <Compile Include="System.DirectoryServices.Protocols\DsmlAuthResponse.cs" />
@@ -148,6 +148,7 @@
     <Compile Include="System.DirectoryServices.Protocols\VlvRequestControl.cs" />
     <Compile Include="System.DirectoryServices.Protocols\VlvResponseControl.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj
index f9170ea9be3..7ab854b91a0 100644
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -148,6 +148,7 @@
     <Compile Include="System.DirectoryServices\ActiveDirectoryRights.cs" />
     <Compile Include="System.DirectoryServices\ActiveDirectorySecurityInheritance.cs" />
     <Compile Include="System.DirectoryServices\AuthenticationTypes.cs" />
+    <Compile Include="System.DirectoryServices\DSDescriptionAttribute.cs" />
     <Compile Include="System.DirectoryServices\DirectoryEntries.cs" />
     <Compile Include="System.DirectoryServices\DirectoryEntry.cs" />
     <Compile Include="System.DirectoryServices\DirectorySearcher.cs" />
@@ -161,7 +162,6 @@
     <Compile Include="System.DirectoryServices\DirectorySynchronizationOptions.cs" />
     <Compile Include="System.DirectoryServices\DirectoryVirtualListView.cs" />
     <Compile Include="System.DirectoryServices\DirectoryVirtualListViewContext.cs" />
-    <Compile Include="System.DirectoryServices\DSDescriptionAttribute.cs" />
     <Compile Include="System.DirectoryServices\ExtendedDN.cs" />
     <Compile Include="System.DirectoryServices\ExtendedRightAccessRule.cs" />
     <Compile Include="System.DirectoryServices\ListChildrenAccessRule.cs" />
@@ -181,6 +181,7 @@
     <Compile Include="System.DirectoryServices\SortDirection.cs" />
     <Compile Include="System.DirectoryServices\SortOption.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj b/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj
index c5413bdd404..9f19f644ba2 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -62,6 +62,7 @@
     <Compile Include="System.Drawing.Design\ToolboxItemCreator.cs" />
     <Compile Include="System.Drawing.Design\ToolboxService.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Drawing/System.Drawing.csproj b/mcs/class/System.Drawing/System.Drawing.csproj
index 3400c7c0089..4b481337474 100644
--- a/mcs/class/System.Drawing/System.Drawing.csproj
+++ b/mcs/class/System.Drawing/System.Drawing.csproj
@@ -64,6 +64,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -77,11 +78,10 @@
     <Compile Include="System.Drawing\Size.cs" />
     <Compile Include="System.Drawing\SizeF.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorUtil.netcoreapp21.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\AssemblyRef.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Brush.cs" />
@@ -112,8 +112,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingQuality.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CoordinateSpace.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCapType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\DashStyle.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FillMode.cs" />
@@ -123,9 +123,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchBrush.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchStyle.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\InterpolationMode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineCap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineJoin.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\MatrixOrder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathPointType.cs" />
@@ -154,8 +154,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\Encoder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameterValueType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderValue.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\FrameDimension.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageAttributes.cs" />
@@ -179,26 +179,240 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECTF.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\NativeMethods.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Duplex.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.Serializable.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperKinds.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.Serializable.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSourceKind.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PreviewPageInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintAction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintRange.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolutionKind.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnit.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnitConvert.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\PropertyItemInternal.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\RotateFlipType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SolidBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringDigitSubstitute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringFormatFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringTrimming.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SystemBrushes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\FontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\GenericFontFamilies.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\HotkeyPrefix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\InstalledFontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\TextRenderingHint.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\TextureBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\UnsafeNativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermission.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionLevel.cs" />
+    <Compile Include="..\..\build\common\Locale.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="System.Drawing.Design\ToolboxItem.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />
+    <Compile Include="System.Drawing.Drawing2D\LinearGradientBrush.cs" />
+    <Compile Include="System.Drawing.Drawing2D\Matrix.cs" />
+    <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />
+    <Compile Include="System.Drawing.Imaging\BitmapData.cs" />
+    <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />
+    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
+    <Compile Include="System.Drawing.Imaging\Metafile.cs" />
+    <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />
+    <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />
+    <Compile Include="System.Drawing.Printing\PageSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintDocument.cs" />
+    <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServices.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />
+    <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />
+    <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
+    <Compile Include="System.Drawing\Bitmap.cs" />
+    <Compile Include="System.Drawing\Brushes.cs" />
+    <Compile Include="System.Drawing\BufferedGraphics.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsManager.cs" />
+    <Compile Include="System.Drawing\CharacterRange.cs" />
+    <Compile Include="System.Drawing\ColorConverter.cs" />
+    <Compile Include="System.Drawing\ColorTranslator.cs" />
+    <Compile Include="System.Drawing\ComIStreamMarshaler.cs" />
+    <Compile Include="System.Drawing\ComIStreamWrapper.cs" />
+    <Compile Include="System.Drawing\ContentAlignment.cs" />
+    <Compile Include="System.Drawing\CopyPixelOperation.cs" />
+    <Compile Include="System.Drawing\ExternDll.cs" />
+    <Compile Include="System.Drawing\Font.cs" />
+    <Compile Include="System.Drawing\FontConverter.cs" />
+    <Compile Include="System.Drawing\FontFamily.cs" />
+    <Compile Include="System.Drawing\Graphics.cs" />
+    <Compile Include="System.Drawing\GraphicsUnit.cs" />
+    <Compile Include="System.Drawing\Icon.cs" />
+    <Compile Include="System.Drawing\IconConverter.cs" />
+    <Compile Include="System.Drawing\Image.cs" />
+    <Compile Include="System.Drawing\ImageAnimator.cs" />
+    <Compile Include="System.Drawing\ImageConverter.cs" />
+    <Compile Include="System.Drawing\ImageFormatConverter.cs" />
+    <Compile Include="System.Drawing\Pen.cs" />
+    <Compile Include="System.Drawing\Pens.cs" />
+    <Compile Include="System.Drawing\PointConverter.cs" />
+    <Compile Include="System.Drawing\RectangleConverter.cs" />
+    <Compile Include="System.Drawing\Region.cs" />
+    <Compile Include="System.Drawing\SR.cs" />
+    <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />
+    <Compile Include="System.Drawing\SizeConverter.cs" />
+    <Compile Include="System.Drawing\SizeFConverter.cs" />
+    <Compile Include="System.Drawing\StringFormat.cs" />
+    <Compile Include="System.Drawing\SystemColors.cs" />
+    <Compile Include="System.Drawing\SystemFonts.cs" />
+    <Compile Include="System.Drawing\SystemIcons.cs" />
+    <Compile Include="System.Drawing\SystemPens.cs" />
+    <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />
+    <Compile Include="System.Drawing\gdipEnums.cs" />
+    <Compile Include="System.Drawing\gdipFunctions.cs" />
+    <Compile Include="System.Drawing\gdipStructs.cs" />
+    <Compile Include="System.Drawing\macFunctions.cs" />
+    <Compile Include="corefx\SR.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorUtil.netcoreapp21.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\AssemblyRef.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Brush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\ClientUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\DashCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\CategoryNameCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IPropertyValueUIService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxItemProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxUser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PaintValueEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItemInvokeHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCreatorCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditor.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditorEditStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\AdjustableArrowCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\Blend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\BrushType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\ColorBlend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CombineMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingQuality.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CoordinateSpace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\DashStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FillMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FlushIntention.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsPathIterator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsState.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\InterpolationMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineJoin.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\MatrixOrder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathPointType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PixelOffsetMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\QualityMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\RegionData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SafeCustomLineCapHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SmoothingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WarpMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WrapMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\FontStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Gdiplus.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\IDeviceContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorAdjustType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorChannelFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrixFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorPalette.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusRecordType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\Encoder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameterValueType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderValue.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\FrameDimension.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageAttributes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfoPrivate.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageLockMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileFrameUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderEmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderWmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PaletteFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PixelFormat.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PlayRecordCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PropertyItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\WmfPlaceableFileHeader.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\NativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Duplex.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperKinds.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSourceKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PreviewPageInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintAction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintRange.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolutionKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnitConvert.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventArgs.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\PropertyItemInternal.cs" />
@@ -217,12 +431,12 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\TextRenderingHint.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\TextureBrush.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\UnsafeNativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermission.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionLevel.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="corefx\SR.cs" />
     <Compile Include="System.Drawing.Design\ToolboxItem.cs" />
     <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />
     <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />
@@ -231,20 +445,20 @@
     <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />
     <Compile Include="System.Drawing.Imaging\BitmapData.cs" />
     <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />
+    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
     <Compile Include="System.Drawing.Imaging\Metafile.cs" />
     <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />
-    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
     <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />
     <Compile Include="System.Drawing.Printing\PageSettings.cs" />
     <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />
     <Compile Include="System.Drawing.Printing\PrintController.cs" />
     <Compile Include="System.Drawing.Printing\PrintDocument.cs" />
-    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
     <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServices.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />
-    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
     <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />
     <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
     <Compile Include="System.Drawing\Bitmap.cs" />
@@ -263,9 +477,220 @@
     <Compile Include="System.Drawing\Font.cs" />
     <Compile Include="System.Drawing\FontConverter.cs" />
     <Compile Include="System.Drawing\FontFamily.cs" />
+    <Compile Include="System.Drawing\Graphics.cs" />
+    <Compile Include="System.Drawing\GraphicsUnit.cs" />
+    <Compile Include="System.Drawing\Icon.cs" />
+    <Compile Include="System.Drawing\IconConverter.cs" />
+    <Compile Include="System.Drawing\Image.cs" />
+    <Compile Include="System.Drawing\ImageAnimator.cs" />
+    <Compile Include="System.Drawing\ImageConverter.cs" />
+    <Compile Include="System.Drawing\ImageFormatConverter.cs" />
+    <Compile Include="System.Drawing\Pen.cs" />
+    <Compile Include="System.Drawing\Pens.cs" />
+    <Compile Include="System.Drawing\PointConverter.cs" />
+    <Compile Include="System.Drawing\RectangleConverter.cs" />
+    <Compile Include="System.Drawing\Region.cs" />
+    <Compile Include="System.Drawing\SR.cs" />
+    <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />
+    <Compile Include="System.Drawing\SizeConverter.cs" />
+    <Compile Include="System.Drawing\SizeFConverter.cs" />
+    <Compile Include="System.Drawing\StringFormat.cs" />
+    <Compile Include="System.Drawing\SystemColors.cs" />
+    <Compile Include="System.Drawing\SystemFonts.cs" />
+    <Compile Include="System.Drawing\SystemIcons.cs" />
+    <Compile Include="System.Drawing\SystemPens.cs" />
+    <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />
     <Compile Include="System.Drawing\gdipEnums.cs" />
     <Compile Include="System.Drawing\gdipFunctions.cs" />
     <Compile Include="System.Drawing\gdipStructs.cs" />
+    <Compile Include="System.Drawing\macFunctions.cs" />
+    <Compile Include="corefx\SR.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorUtil.netcoreapp21.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\AssemblyRef.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Brush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\ClientUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\DashCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\CategoryNameCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IPropertyValueUIService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxItemProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxUser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PaintValueEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItemInvokeHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCreatorCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditor.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditorEditStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\AdjustableArrowCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\Blend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\BrushType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\ColorBlend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CombineMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingQuality.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CoordinateSpace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\DashStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FillMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FlushIntention.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsPathIterator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsState.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\InterpolationMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineJoin.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\MatrixOrder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathPointType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PixelOffsetMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\QualityMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\RegionData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SafeCustomLineCapHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SmoothingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WarpMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WrapMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\FontStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Gdiplus.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\IDeviceContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorAdjustType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorChannelFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrixFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorPalette.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusRecordType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\Encoder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameterValueType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderValue.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\FrameDimension.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageAttributes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfoPrivate.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageLockMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileFrameUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderEmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderWmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PaletteFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PixelFormat.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PlayRecordCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PropertyItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\WmfPlaceableFileHeader.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\NativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Duplex.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperKinds.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSourceKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PreviewPageInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintAction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintRange.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolutionKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnitConvert.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\PropertyItemInternal.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\RotateFlipType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SolidBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringDigitSubstitute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringFormatFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringTrimming.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SystemBrushes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\FontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\GenericFontFamilies.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\HotkeyPrefix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\InstalledFontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\TextRenderingHint.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\TextureBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\UnsafeNativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermission.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionLevel.cs" />
+    <Compile Include="..\..\build\common\Locale.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="System.Drawing.Design\ToolboxItem.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />
+    <Compile Include="System.Drawing.Drawing2D\LinearGradientBrush.cs" />
+    <Compile Include="System.Drawing.Drawing2D\Matrix.cs" />
+    <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />
+    <Compile Include="System.Drawing.Imaging\BitmapData.cs" />
+    <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />
+    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
+    <Compile Include="System.Drawing.Imaging\Metafile.cs" />
+    <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />
+    <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />
+    <Compile Include="System.Drawing.Printing\PageSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintDocument.cs" />
+    <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServices.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />
+    <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />
+    <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
+    <Compile Include="System.Drawing\Bitmap.cs" />
+    <Compile Include="System.Drawing\Brushes.cs" />
+    <Compile Include="System.Drawing\BufferedGraphics.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsManager.cs" />
+    <Compile Include="System.Drawing\CharacterRange.cs" />
+    <Compile Include="System.Drawing\ColorConverter.cs" />
+    <Compile Include="System.Drawing\ColorTranslator.cs" />
+    <Compile Include="System.Drawing\ComIStreamMarshaler.cs" />
+    <Compile Include="System.Drawing\ComIStreamWrapper.cs" />
+    <Compile Include="System.Drawing\ContentAlignment.cs" />
+    <Compile Include="System.Drawing\CopyPixelOperation.cs" />
+    <Compile Include="System.Drawing\ExternDll.cs" />
+    <Compile Include="System.Drawing\Font.cs" />
+    <Compile Include="System.Drawing\FontConverter.cs" />
+    <Compile Include="System.Drawing\FontFamily.cs" />
     <Compile Include="System.Drawing\Graphics.cs" />
     <Compile Include="System.Drawing\GraphicsUnit.cs" />
     <Compile Include="System.Drawing\Icon.cs" />
@@ -274,28 +699,31 @@
     <Compile Include="System.Drawing\ImageAnimator.cs" />
     <Compile Include="System.Drawing\ImageConverter.cs" />
     <Compile Include="System.Drawing\ImageFormatConverter.cs" />
-    <Compile Include="System.Drawing\macFunctions.cs" />
     <Compile Include="System.Drawing\Pen.cs" />
     <Compile Include="System.Drawing\Pens.cs" />
     <Compile Include="System.Drawing\PointConverter.cs" />
     <Compile Include="System.Drawing\RectangleConverter.cs" />
     <Compile Include="System.Drawing\Region.cs" />
-    <Compile Include="System.Drawing\SizeConverter.cs" />
-    <Compile Include="System.Drawing\SizeFConverter.cs" />
     <Compile Include="System.Drawing\SR.cs" />
     <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />
+    <Compile Include="System.Drawing\SizeConverter.cs" />
+    <Compile Include="System.Drawing\SizeFConverter.cs" />
     <Compile Include="System.Drawing\StringFormat.cs" />
     <Compile Include="System.Drawing\SystemColors.cs" />
     <Compile Include="System.Drawing\SystemFonts.cs" />
     <Compile Include="System.Drawing\SystemIcons.cs" />
     <Compile Include="System.Drawing\SystemPens.cs" />
     <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />
+    <Compile Include="System.Drawing\gdipEnums.cs" />
+    <Compile Include="System.Drawing\gdipFunctions.cs" />
+    <Compile Include="System.Drawing\gdipStructs.cs" />
+    <Compile Include="System.Drawing\macFunctions.cs" />
+    <Compile Include="corefx\SR.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorUtil.netcoreapp21.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\AssemblyRef.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Brush.cs" />
@@ -326,8 +754,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingQuality.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CoordinateSpace.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCapType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\DashStyle.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FillMode.cs" />
@@ -337,9 +765,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchBrush.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchStyle.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\InterpolationMode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineCap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineJoin.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\MatrixOrder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathPointType.cs" />
@@ -368,8 +796,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\Encoder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameterValueType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderValue.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\FrameDimension.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageAttributes.cs" />
@@ -393,26 +821,240 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECTF.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\NativeMethods.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Duplex.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.Serializable.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperKinds.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.Serializable.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSourceKind.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PreviewPageInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintAction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintRange.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolutionKind.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnit.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnitConvert.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\PropertyItemInternal.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\RotateFlipType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SolidBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringDigitSubstitute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringFormatFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringTrimming.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SystemBrushes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\FontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\GenericFontFamilies.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\HotkeyPrefix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\InstalledFontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\TextRenderingHint.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\TextureBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\UnsafeNativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermission.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionLevel.cs" />
+    <Compile Include="..\..\build\common\Locale.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="System.Drawing.Design\ToolboxItem.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />
+    <Compile Include="System.Drawing.Drawing2D\LinearGradientBrush.cs" />
+    <Compile Include="System.Drawing.Drawing2D\Matrix.cs" />
+    <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />
+    <Compile Include="System.Drawing.Imaging\BitmapData.cs" />
+    <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />
+    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
+    <Compile Include="System.Drawing.Imaging\Metafile.cs" />
+    <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />
+    <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />
+    <Compile Include="System.Drawing.Printing\PageSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintDocument.cs" />
+    <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServices.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />
+    <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />
+    <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
+    <Compile Include="System.Drawing\Bitmap.cs" />
+    <Compile Include="System.Drawing\Brushes.cs" />
+    <Compile Include="System.Drawing\BufferedGraphics.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsManager.cs" />
+    <Compile Include="System.Drawing\CharacterRange.cs" />
+    <Compile Include="System.Drawing\ColorConverter.cs" />
+    <Compile Include="System.Drawing\ColorTranslator.cs" />
+    <Compile Include="System.Drawing\ComIStreamMarshaler.cs" />
+    <Compile Include="System.Drawing\ComIStreamWrapper.cs" />
+    <Compile Include="System.Drawing\ContentAlignment.cs" />
+    <Compile Include="System.Drawing\CopyPixelOperation.cs" />
+    <Compile Include="System.Drawing\ExternDll.cs" />
+    <Compile Include="System.Drawing\Font.cs" />
+    <Compile Include="System.Drawing\FontConverter.cs" />
+    <Compile Include="System.Drawing\FontFamily.cs" />
+    <Compile Include="System.Drawing\Graphics.cs" />
+    <Compile Include="System.Drawing\GraphicsUnit.cs" />
+    <Compile Include="System.Drawing\Icon.cs" />
+    <Compile Include="System.Drawing\IconConverter.cs" />
+    <Compile Include="System.Drawing\Image.cs" />
+    <Compile Include="System.Drawing\ImageAnimator.cs" />
+    <Compile Include="System.Drawing\ImageConverter.cs" />
+    <Compile Include="System.Drawing\ImageFormatConverter.cs" />
+    <Compile Include="System.Drawing\Pen.cs" />
+    <Compile Include="System.Drawing\Pens.cs" />
+    <Compile Include="System.Drawing\PointConverter.cs" />
+    <Compile Include="System.Drawing\RectangleConverter.cs" />
+    <Compile Include="System.Drawing\Region.cs" />
+    <Compile Include="System.Drawing\SR.cs" />
+    <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />
+    <Compile Include="System.Drawing\SizeConverter.cs" />
+    <Compile Include="System.Drawing\SizeFConverter.cs" />
+    <Compile Include="System.Drawing\StringFormat.cs" />
+    <Compile Include="System.Drawing\SystemColors.cs" />
+    <Compile Include="System.Drawing\SystemFonts.cs" />
+    <Compile Include="System.Drawing\SystemIcons.cs" />
+    <Compile Include="System.Drawing\SystemPens.cs" />
+    <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />
+    <Compile Include="System.Drawing\gdipEnums.cs" />
+    <Compile Include="System.Drawing\gdipFunctions.cs" />
+    <Compile Include="System.Drawing\gdipStructs.cs" />
+    <Compile Include="System.Drawing\macFunctions.cs" />
+    <Compile Include="corefx\SR.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorUtil.netcoreapp21.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\AssemblyRef.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Brush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\ClientUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\DashCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\CategoryNameCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IPropertyValueUIService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxItemProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxUser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PaintValueEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItemInvokeHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCreatorCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditor.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditorEditStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\AdjustableArrowCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\Blend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\BrushType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\ColorBlend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CombineMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingQuality.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CoordinateSpace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\DashStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FillMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FlushIntention.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsPathIterator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsState.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\InterpolationMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineJoin.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\MatrixOrder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathPointType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PixelOffsetMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\QualityMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\RegionData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SafeCustomLineCapHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SmoothingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WarpMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WrapMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\FontStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Gdiplus.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\IDeviceContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorAdjustType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorChannelFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrixFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorPalette.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusRecordType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\Encoder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameterValueType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderValue.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\FrameDimension.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageAttributes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfoPrivate.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageLockMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileFrameUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderEmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderWmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PaletteFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PixelFormat.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PlayRecordCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PropertyItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\WmfPlaceableFileHeader.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\NativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Duplex.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperKinds.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSourceKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PreviewPageInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintAction.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintRange.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolutionKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnitConvert.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventArgs.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\PropertyItemInternal.cs" />
@@ -431,12 +1073,12 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\TextRenderingHint.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\TextureBrush.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\UnsafeNativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermission.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionLevel.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="corefx\SR.cs" />
     <Compile Include="System.Drawing.Design\ToolboxItem.cs" />
     <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />
     <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />
@@ -445,20 +1087,20 @@
     <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />
     <Compile Include="System.Drawing.Imaging\BitmapData.cs" />
     <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />
+    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
     <Compile Include="System.Drawing.Imaging\Metafile.cs" />
     <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />
-    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
     <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />
     <Compile Include="System.Drawing.Printing\PageSettings.cs" />
     <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />
     <Compile Include="System.Drawing.Printing\PrintController.cs" />
     <Compile Include="System.Drawing.Printing\PrintDocument.cs" />
-    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
     <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServices.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />
-    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
     <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />
     <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
     <Compile Include="System.Drawing\Bitmap.cs" />
@@ -477,9 +1119,221 @@
     <Compile Include="System.Drawing\Font.cs" />
     <Compile Include="System.Drawing\FontConverter.cs" />
     <Compile Include="System.Drawing\FontFamily.cs" />
+    <Compile Include="System.Drawing\Graphics.cs" />
+    <Compile Include="System.Drawing\GraphicsUnit.cs" />
+    <Compile Include="System.Drawing\Icon.cs" />
+    <Compile Include="System.Drawing\IconConverter.cs" />
+    <Compile Include="System.Drawing\Image.cs" />
+    <Compile Include="System.Drawing\ImageAnimator.cs" />
+    <Compile Include="System.Drawing\ImageConverter.cs" />
+    <Compile Include="System.Drawing\ImageFormatConverter.cs" />
+    <Compile Include="System.Drawing\Pen.cs" />
+    <Compile Include="System.Drawing\Pens.cs" />
+    <Compile Include="System.Drawing\PointConverter.cs" />
+    <Compile Include="System.Drawing\RectangleConverter.cs" />
+    <Compile Include="System.Drawing\Region.cs" />
+    <Compile Include="System.Drawing\SR.cs" />
+    <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />
+    <Compile Include="System.Drawing\SizeConverter.cs" />
+    <Compile Include="System.Drawing\SizeFConverter.cs" />
+    <Compile Include="System.Drawing\StringFormat.cs" />
+    <Compile Include="System.Drawing\SystemColors.cs" />
+    <Compile Include="System.Drawing\SystemFonts.cs" />
+    <Compile Include="System.Drawing\SystemIcons.cs" />
+    <Compile Include="System.Drawing\SystemPens.cs" />
+    <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />
     <Compile Include="System.Drawing\gdipEnums.cs" />
     <Compile Include="System.Drawing\gdipFunctions.cs" />
     <Compile Include="System.Drawing\gdipStructs.cs" />
+    <Compile Include="System.Drawing\macFunctions.cs" />
+    <Compile Include="corefx\SR.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorUtil.netcoreapp21.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\AssemblyRef.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Brush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\ClientUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\DashCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\CategoryNameCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IPropertyValueUIService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxItemProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxUser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PaintValueEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItemInvokeHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCreatorCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditor.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditorEditStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\AdjustableArrowCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\Blend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\BrushType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\ColorBlend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CombineMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingQuality.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CoordinateSpace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\DashStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FillMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FlushIntention.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsPathIterator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsState.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\InterpolationMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineJoin.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\MatrixOrder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathPointType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PixelOffsetMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\QualityMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\RegionData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SafeCustomLineCapHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SmoothingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WarpMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WrapMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\FontStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Gdiplus.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\IDeviceContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorAdjustType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorChannelFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrixFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorPalette.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusRecordType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\Encoder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameterValueType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderValue.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\FrameDimension.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageAttributes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfoPrivate.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageLockMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileFrameUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderEmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderWmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PaletteFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PixelFormat.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PlayRecordCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PropertyItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\WmfPlaceableFileHeader.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\NativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Duplex.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperKinds.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSourceKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PreviewPageInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintAction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintRange.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolutionKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnitConvert.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\PropertyItemInternal.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\RotateFlipType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SolidBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringDigitSubstitute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringFormatFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringTrimming.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SystemBrushes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\FontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\GenericFontFamilies.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\HotkeyPrefix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\InstalledFontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\TextRenderingHint.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\TextureBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\UnsafeNativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermission.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionLevel.cs" />
+    <Compile Include="..\..\build\common\Locale.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="System.Drawing.Design\ToolboxItem.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />
+    <Compile Include="System.Drawing.Drawing2D\LinearGradientBrush.cs" />
+    <Compile Include="System.Drawing.Drawing2D\Matrix.cs" />
+    <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />
+    <Compile Include="System.Drawing.Imaging\BitmapData.cs" />
+    <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />
+    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
+    <Compile Include="System.Drawing.Imaging\Metafile.cs" />
+    <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />
+    <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />
+    <Compile Include="System.Drawing.Printing\PageSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintDocument.cs" />
+    <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServices.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />
+    <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />
+    <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
+    <Compile Include="System.Drawing\Bitmap.cs" />
+    <Compile Include="System.Drawing\Brushes.cs" />
+    <Compile Include="System.Drawing\BufferedGraphics.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsManager.cs" />
+    <Compile Include="System.Drawing\CharacterRange.cs" />
+    <Compile Include="System.Drawing\ColorConverter.cs" />
+    <Compile Include="System.Drawing\ColorTranslator.cs" />
+    <Compile Include="System.Drawing\ComIStreamMarshaler.cs" />
+    <Compile Include="System.Drawing\ComIStreamWrapper.cs" />
+    <Compile Include="System.Drawing\ContentAlignment.cs" />
+    <Compile Include="System.Drawing\CopyPixelOperation.cs" />
+    <Compile Include="System.Drawing\ExternDll.cs" />
+    <Compile Include="System.Drawing\Font.cs" />
+    <Compile Include="System.Drawing\FontConverter.cs" />
+    <Compile Include="System.Drawing\FontFamily.cs" />
     <Compile Include="System.Drawing\Graphics.cs" />
     <Compile Include="System.Drawing\GraphicsUnit.cs" />
     <Compile Include="System.Drawing\Icon.cs" />
@@ -488,28 +1342,31 @@
     <Compile Include="System.Drawing\ImageAnimator.cs" />
     <Compile Include="System.Drawing\ImageConverter.cs" />
     <Compile Include="System.Drawing\ImageFormatConverter.cs" />
-    <Compile Include="System.Drawing\macFunctions.cs" />
     <Compile Include="System.Drawing\Pen.cs" />
     <Compile Include="System.Drawing\Pens.cs" />
     <Compile Include="System.Drawing\PointConverter.cs" />
     <Compile Include="System.Drawing\RectangleConverter.cs" />
     <Compile Include="System.Drawing\Region.cs" />
-    <Compile Include="System.Drawing\SizeConverter.cs" />
-    <Compile Include="System.Drawing\SizeFConverter.cs" />
     <Compile Include="System.Drawing\SR.cs" />
     <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />
+    <Compile Include="System.Drawing\SizeConverter.cs" />
+    <Compile Include="System.Drawing\SizeFConverter.cs" />
     <Compile Include="System.Drawing\StringFormat.cs" />
     <Compile Include="System.Drawing\SystemColors.cs" />
     <Compile Include="System.Drawing\SystemFonts.cs" />
     <Compile Include="System.Drawing\SystemIcons.cs" />
     <Compile Include="System.Drawing\SystemPens.cs" />
     <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />
+    <Compile Include="System.Drawing\gdipEnums.cs" />
+    <Compile Include="System.Drawing\gdipFunctions.cs" />
+    <Compile Include="System.Drawing\gdipStructs.cs" />
+    <Compile Include="System.Drawing\macFunctions.cs" />
+    <Compile Include="corefx\SR.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorUtil.netcoreapp21.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\AssemblyRef.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Brush.cs" />
@@ -540,8 +1397,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingQuality.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CoordinateSpace.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCapType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\DashStyle.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FillMode.cs" />
@@ -551,9 +1408,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchBrush.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchStyle.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\InterpolationMode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineCap.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineJoin.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\MatrixOrder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathPointType.cs" />
@@ -582,8 +1439,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\Encoder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameterValueType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderValue.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\FrameDimension.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageAttributes.cs" />
@@ -607,26 +1464,26 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECTF.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\NativeMethods.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Duplex.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.Serializable.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperKinds.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.Serializable.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSourceKind.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PreviewPageInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintAction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintRange.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolutionKind.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnit.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnitConvert.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintRange.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventArgs.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\PropertyItemInternal.cs" />
@@ -645,12 +1502,12 @@
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\TextRenderingHint.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\TextureBrush.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\UnsafeNativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermission.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionLevel.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="corefx\SR.cs" />
     <Compile Include="System.Drawing.Design\ToolboxItem.cs" />
     <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />
     <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />
@@ -659,20 +1516,20 @@
     <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />
     <Compile Include="System.Drawing.Imaging\BitmapData.cs" />
     <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />
+    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
     <Compile Include="System.Drawing.Imaging\Metafile.cs" />
     <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />
-    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
     <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />
     <Compile Include="System.Drawing.Printing\PageSettings.cs" />
     <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />
     <Compile Include="System.Drawing.Printing\PrintController.cs" />
     <Compile Include="System.Drawing.Printing\PrintDocument.cs" />
-    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
     <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServices.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />
     <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />
-    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
     <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />
     <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
     <Compile Include="System.Drawing\Bitmap.cs" />
@@ -691,9 +1548,221 @@
     <Compile Include="System.Drawing\Font.cs" />
     <Compile Include="System.Drawing\FontConverter.cs" />
     <Compile Include="System.Drawing\FontFamily.cs" />
+    <Compile Include="System.Drawing\Graphics.cs" />
+    <Compile Include="System.Drawing\GraphicsUnit.cs" />
+    <Compile Include="System.Drawing\Icon.cs" />
+    <Compile Include="System.Drawing\IconConverter.cs" />
+    <Compile Include="System.Drawing\Image.cs" />
+    <Compile Include="System.Drawing\ImageAnimator.cs" />
+    <Compile Include="System.Drawing\ImageConverter.cs" />
+    <Compile Include="System.Drawing\ImageFormatConverter.cs" />
+    <Compile Include="System.Drawing\Pen.cs" />
+    <Compile Include="System.Drawing\Pens.cs" />
+    <Compile Include="System.Drawing\PointConverter.cs" />
+    <Compile Include="System.Drawing\RectangleConverter.cs" />
+    <Compile Include="System.Drawing\Region.cs" />
+    <Compile Include="System.Drawing\SR.cs" />
+    <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />
+    <Compile Include="System.Drawing\SizeConverter.cs" />
+    <Compile Include="System.Drawing\SizeFConverter.cs" />
+    <Compile Include="System.Drawing\StringFormat.cs" />
+    <Compile Include="System.Drawing\SystemColors.cs" />
+    <Compile Include="System.Drawing\SystemFonts.cs" />
+    <Compile Include="System.Drawing\SystemIcons.cs" />
+    <Compile Include="System.Drawing\SystemPens.cs" />
+    <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />
     <Compile Include="System.Drawing\gdipEnums.cs" />
     <Compile Include="System.Drawing\gdipFunctions.cs" />
     <Compile Include="System.Drawing\gdipStructs.cs" />
+    <Compile Include="System.Drawing\macFunctions.cs" />
+    <Compile Include="corefx\SR.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorTable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Drawing\ColorUtil.netcoreapp21.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\AssemblyRef.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSameAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\BitmapSuffixInSatelliteAssemblyAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Brush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\ClientUtils.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\DashCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\CategoryNameCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IPropertyValueUIService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxItemProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\IToolboxUser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PaintValueEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\PropertyValueUIItemInvokeHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatedEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxComponentsCreatingEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\ToolboxItemCreatorCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditor.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Design\UITypeEditorEditStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\AdjustableArrowCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\Blend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\BrushType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\ColorBlend.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CombineMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CompositingQuality.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CoordinateSpace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\CustomLineCapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\DashStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FillMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\FlushIntention.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsPathIterator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\GraphicsState.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\HatchStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\InterpolationMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineCap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LineJoin.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\LinearGradientMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\MatrixOrder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PathPointType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PenType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\PixelOffsetMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\QualityMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\RegionData.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SafeCustomLineCapHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\SmoothingMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WarpMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Drawing2D\WrapMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\FontStyle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Gdiplus.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\IDeviceContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorAdjustType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorChannelFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMap.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMapType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMatrixFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ColorPalette.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfPlusRecordType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EmfType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\Encoder.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameterValueType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderParameters.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\EncoderValue.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\FrameDimension.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageAttributes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageCodecInfoPrivate.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\ImageLockMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileFrameUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderEmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileHeaderWmf.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\MetafileType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PaletteFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PixelFormat.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PlayRecordCallback.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\PropertyItem.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Imaging\WmfPlaceableFileHeader.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPPOINTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECT.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Internal\GPRECTF.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\NativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Duplex.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\InvalidPrinterException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\Margins.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperKinds.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSize.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSource.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PaperSourceKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PreviewPageInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintAction.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintPageEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrintRange.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.Serializable.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolution.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterResolutionKind.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\PrinterUnitConvert.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventArgs.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Printing\QueryPageSettingsEventHandler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\PropertyItemInternal.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\RotateFlipType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SolidBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringAlignment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringDigitSubstitute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringFormatFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringTrimming.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\StringUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\SystemBrushes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\FontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\GenericFontFamilies.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\HotkeyPrefix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\InstalledFontCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\Text\TextRenderingHint.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\TextureBrush.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\System\Drawing\UnsafeNativeMethods.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Drawing.Common\src\misc\HandleCollector.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermission.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Permissions\src\System\Drawing\Printing\PrintingPermissionLevel.cs" />
+    <Compile Include="..\..\build\common\Locale.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="System.Drawing.Design\ToolboxItem.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsContainer.cs" />
+    <Compile Include="System.Drawing.Drawing2D\GraphicsPath.cs" />
+    <Compile Include="System.Drawing.Drawing2D\LinearGradientBrush.cs" />
+    <Compile Include="System.Drawing.Drawing2D\Matrix.cs" />
+    <Compile Include="System.Drawing.Drawing2D\PathGradientBrush.cs" />
+    <Compile Include="System.Drawing.Imaging\BitmapData.cs" />
+    <Compile Include="System.Drawing.Imaging\ImageFormat.cs" />
+    <Compile Include="System.Drawing.Imaging\MetaHeader.cs" />
+    <Compile Include="System.Drawing.Imaging\Metafile.cs" />
+    <Compile Include="System.Drawing.Imaging\MetafileHeader.cs" />
+    <Compile Include="System.Drawing.Printing\MarginsConverter.cs" />
+    <Compile Include="System.Drawing.Printing\PageSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PreviewPrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintController.cs" />
+    <Compile Include="System.Drawing.Printing\PrintDocument.cs" />
+    <Compile Include="System.Drawing.Printing\PrintEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrintPageEventArgs.cs" />
+    <Compile Include="System.Drawing.Printing\PrinterSettings.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServices.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesUnix.cs" />
+    <Compile Include="System.Drawing.Printing\PrintingServicesWin32.cs" />
+    <Compile Include="System.Drawing.Printing\StandardPrintController.cs" />
+    <Compile Include="System.Drawing.Text\PrivateFontCollection.cs" />
+    <Compile Include="System.Drawing\Bitmap.cs" />
+    <Compile Include="System.Drawing\Brushes.cs" />
+    <Compile Include="System.Drawing\BufferedGraphics.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsContext.cs" />
+    <Compile Include="System.Drawing\BufferedGraphicsManager.cs" />
+    <Compile Include="System.Drawing\CharacterRange.cs" />
+    <Compile Include="System.Drawing\ColorConverter.cs" />
+    <Compile Include="System.Drawing\ColorTranslator.cs" />
+    <Compile Include="System.Drawing\ComIStreamMarshaler.cs" />
+    <Compile Include="System.Drawing\ComIStreamWrapper.cs" />
+    <Compile Include="System.Drawing\ContentAlignment.cs" />
+    <Compile Include="System.Drawing\CopyPixelOperation.cs" />
+    <Compile Include="System.Drawing\ExternDll.cs" />
+    <Compile Include="System.Drawing\Font.cs" />
+    <Compile Include="System.Drawing\FontConverter.cs" />
+    <Compile Include="System.Drawing\FontFamily.cs" />
     <Compile Include="System.Drawing\Graphics.cs" />
     <Compile Include="System.Drawing\GraphicsUnit.cs" />
     <Compile Include="System.Drawing\Icon.cs" />
@@ -702,22 +1771,26 @@
     <Compile Include="System.Drawing\ImageAnimator.cs" />
     <Compile Include="System.Drawing\ImageConverter.cs" />
     <Compile Include="System.Drawing\ImageFormatConverter.cs" />
-    <Compile Include="System.Drawing\macFunctions.cs" />
     <Compile Include="System.Drawing\Pen.cs" />
     <Compile Include="System.Drawing\Pens.cs" />
     <Compile Include="System.Drawing\PointConverter.cs" />
     <Compile Include="System.Drawing\RectangleConverter.cs" />
     <Compile Include="System.Drawing\Region.cs" />
-    <Compile Include="System.Drawing\SizeConverter.cs" />
-    <Compile Include="System.Drawing\SizeFConverter.cs" />
     <Compile Include="System.Drawing\SR.cs" />
     <Compile Include="System.Drawing\SRDescriptionAttribute.cs" />
+    <Compile Include="System.Drawing\SizeConverter.cs" />
+    <Compile Include="System.Drawing\SizeFConverter.cs" />
     <Compile Include="System.Drawing\StringFormat.cs" />
     <Compile Include="System.Drawing\SystemColors.cs" />
     <Compile Include="System.Drawing\SystemFonts.cs" />
     <Compile Include="System.Drawing\SystemIcons.cs" />
     <Compile Include="System.Drawing\SystemPens.cs" />
     <Compile Include="System.Drawing\ToolboxBitmapAttribute.cs" />
+    <Compile Include="System.Drawing\gdipEnums.cs" />
+    <Compile Include="System.Drawing\gdipFunctions.cs" />
+    <Compile Include="System.Drawing\gdipStructs.cs" />
+    <Compile Include="System.Drawing\macFunctions.cs" />
+    <Compile Include="corefx\SR.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
diff --git a/mcs/class/System.Dynamic/System.Dynamic.csproj b/mcs/class/System.Dynamic/System.Dynamic.csproj
index 2d818bd1eb8..71b78dee0d1 100644
--- a/mcs/class/System.Dynamic/System.Dynamic.csproj
+++ b/mcs/class/System.Dynamic/System.Dynamic.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -80,9 +80,9 @@
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ConvertibleArgBuilder.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\CurrencyArgBuilder.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DateTimeArgBuilder.cs" />
-    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispatchArgBuilder.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispCallable.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispCallableMetaObject.cs" />
+    <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\DispatchArgBuilder.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ErrorArgBuilder.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\Errors.cs" />
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\ExcepInfo.cs" />
@@ -102,6 +102,7 @@
     <Compile Include="..\dlr\Runtime\Microsoft.Dynamic\VariantBuilder.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj
index fda596e7ebc..f3ac6a895a6 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -95,11 +96,11 @@
     <Compile Include="System.EnterpriseServices\ApplicationQueuingAttribute.cs" />
     <Compile Include="System.EnterpriseServices\AuthenticationOption.cs" />
     <Compile Include="System.EnterpriseServices\AutoCompleteAttribute.cs" />
-    <Compile Include="System.EnterpriseServices\BindingOption.cs" />
     <Compile Include="System.EnterpriseServices\BOID.cs" />
     <Compile Include="System.EnterpriseServices\BYOT.cs" />
-    <Compile Include="System.EnterpriseServices\ComponentAccessControlAttribute.cs" />
+    <Compile Include="System.EnterpriseServices\BindingOption.cs" />
     <Compile Include="System.EnterpriseServices\COMTIIntrinsicsAttribute.cs" />
+    <Compile Include="System.EnterpriseServices\ComponentAccessControlAttribute.cs" />
     <Compile Include="System.EnterpriseServices\ConstructionEnabledAttribute.cs" />
     <Compile Include="System.EnterpriseServices\ContextUtil.cs" />
     <Compile Include="System.EnterpriseServices\DescriptionAttribute.cs" />
@@ -109,10 +110,6 @@
     <Compile Include="System.EnterpriseServices\IAsyncErrorNotify.cs" />
     <Compile Include="System.EnterpriseServices\IConfigurationAttribute.cs" />
     <Compile Include="System.EnterpriseServices\IISIntrinsicsAttribute.cs" />
-    <Compile Include="System.EnterpriseServices\ImpersonationLevelOption.cs" />
-    <Compile Include="System.EnterpriseServices\InheritanceOption.cs" />
-    <Compile Include="System.EnterpriseServices\InstallationFlags.cs" />
-    <Compile Include="System.EnterpriseServices\InterfaceQueuingAttribute.cs" />
     <Compile Include="System.EnterpriseServices\IPlaybackControl.cs" />
     <Compile Include="System.EnterpriseServices\IProcessInitControl.cs" />
     <Compile Include="System.EnterpriseServices\IProcessInitializer.cs" />
@@ -126,6 +123,10 @@
     <Compile Include="System.EnterpriseServices\ISharedProperty.cs" />
     <Compile Include="System.EnterpriseServices\ISharedPropertyGroup.cs" />
     <Compile Include="System.EnterpriseServices\ITransaction.cs" />
+    <Compile Include="System.EnterpriseServices\ImpersonationLevelOption.cs" />
+    <Compile Include="System.EnterpriseServices\InheritanceOption.cs" />
+    <Compile Include="System.EnterpriseServices\InstallationFlags.cs" />
+    <Compile Include="System.EnterpriseServices\InterfaceQueuingAttribute.cs" />
     <Compile Include="System.EnterpriseServices\JustInTimeActivationAttribute.cs" />
     <Compile Include="System.EnterpriseServices\LoadBalancingSupportedAttribute.cs" />
     <Compile Include="System.EnterpriseServices\MustRunInClientContextAttribute.cs" />
@@ -146,9 +147,9 @@
     <Compile Include="System.EnterpriseServices\SecurityIdentity.cs" />
     <Compile Include="System.EnterpriseServices\SecurityRoleAttribute.cs" />
     <Compile Include="System.EnterpriseServices\ServiceConfig.cs" />
+    <Compile Include="System.EnterpriseServices\ServiceDomain.cs" />
     <Compile Include="System.EnterpriseServices\ServicedComponent.cs" />
     <Compile Include="System.EnterpriseServices\ServicedComponentException.cs" />
-    <Compile Include="System.EnterpriseServices\ServiceDomain.cs" />
     <Compile Include="System.EnterpriseServices\SharedProperty.cs" />
     <Compile Include="System.EnterpriseServices\SharedPropertyGroup.cs" />
     <Compile Include="System.EnterpriseServices\SharedPropertyGroupManager.cs" />
@@ -163,6 +164,7 @@
     <Compile Include="System.EnterpriseServices\TransactionVote.cs" />
     <Compile Include="System.EnterpriseServices\XACTTRANSINFO.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System.Transactions/System.Transactions.csproj" />
diff --git a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj
index c4dd9adbee8..3aa59c92d1a 100644
--- a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj
+++ b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj
@@ -104,6 +104,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\IO\PathInternal.CaseSensitivity.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression.ZipFile\src\System\IO\Compression\ZipFile.cs" />
@@ -112,6 +113,7 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="corefx\SR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.IO.Compression/System.IO.Compression.csproj b/mcs/class/System.IO.Compression/System.IO.Compression.csproj
index 72064437279..74a003ea462 100644
--- a/mcs/class/System.IO.Compression/System.IO.Compression.csproj
+++ b/mcs/class/System.IO.Compression/System.IO.Compression.csproj
@@ -103,6 +103,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Threading\Tasks\TaskToApm.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.Compression\src\System\IO\Compression\DeflateManaged\BlockType.cs" />
@@ -133,11 +134,12 @@
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="TypeForwarders.cs" />
     <Compile Include="corefx\Crc32Helper.cs" />
     <Compile Include="corefx\SR.cs" />
     <Compile Include="corefx\ZipArchiveEntry.Mono.cs" />
-    <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj
index ecb87fcd318..9691ab72eab 100644
--- a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj
+++ b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -65,6 +66,7 @@
     <Compile Include="System.IdentityModel.Selectors\UntrustedRecipientException.cs" />
     <Compile Include="System.IdentityModel.Selectors\UserCancellationException.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.csproj b/mcs/class/System.IdentityModel/System.IdentityModel.csproj
index 3be54b74212..59ee0483e75 100644
--- a/mcs/class/System.IdentityModel/System.IdentityModel.csproj
+++ b/mcs/class/System.IdentityModel/System.IdentityModel.csproj
@@ -103,6 +103,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -110,6 +111,10 @@
     <Compile Include="System.IdentityModel.Selectors\X509CertificateValidator.cs" />
     <Compile Include="System.ServiceModel.Security\X509CertificateValidationMode.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' "></ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="System.IdentityModel.Claims\Claim.cs" />
     <Compile Include="System.IdentityModel.Claims\ClaimSet.cs" />
@@ -129,143 +134,9 @@
     <Compile Include="System.IdentityModel.Protocols\WSTrust\Entropy.cs" />
     <Compile Include="System.IdentityModel.Protocols\WSTrust\Lifetime.cs" />
     <Compile Include="System.IdentityModel.Protocols\WSTrust\ProtectedKey.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\RequestedProofToken.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\RequestedSecurityToken.cs" />
     <Compile Include="System.IdentityModel.Protocols\WSTrust\RequestSecurityTokenResponse.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\Status.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\UseKey.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\WSTrustMessage.cs" />
-    <Compile Include="System.IdentityModel.Selectors\AudienceUriMode.cs" />
-    <Compile Include="System.IdentityModel.Selectors\CustomUserNameSecurityTokenAuthenticator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\KerberosSecurityTokenAuthenticator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\KerberosSecurityTokenProvider.cs" />
-    <Compile Include="System.IdentityModel.Selectors\RsaSecurityTokenAuthenticator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\SamlSecurityTokenAuthenticator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenAuthenticator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenManager.cs" />
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenProvider.cs" />
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenRequirement.cs" />
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenResolver.cs" />
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenSerializer.cs" />
-    <Compile Include="System.IdentityModel.Selectors\SecurityTokenVersion.cs" />
-    <Compile Include="System.IdentityModel.Selectors\SystemIdentityAuthorizationPolicy.cs" />
-    <Compile Include="System.IdentityModel.Selectors\UserNamePasswordValidator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\UserNameSecurityTokenAuthenticator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\UserNameSecurityTokenProvider.cs" />
-    <Compile Include="System.IdentityModel.Selectors\WindowsSecurityTokenAuthenticator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\WindowsUserNameSecurityTokenAuthenticator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\X509SecurityTokenAuthenticator.cs" />
-    <Compile Include="System.IdentityModel.Selectors\X509SecurityTokenProvider.cs" />
-    <Compile Include="System.IdentityModel.Tokens\AsymmetricSecurityKey.cs" />
-    <Compile Include="System.IdentityModel.Tokens\AudienceRestriction.cs" />
-    <Compile Include="System.IdentityModel.Tokens\AuthenticationContext.cs" />
-    <Compile Include="System.IdentityModel.Tokens\AuthenticationInformation.cs" />
-    <Compile Include="System.IdentityModel.Tokens\BinaryKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\BootstrapContext.cs" />
-    <Compile Include="System.IdentityModel.Tokens\EncryptedKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\EncryptingCredentials.cs" />
-    <Compile Include="System.IdentityModel.Tokens\GenericXmlSecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\InMemorySymmetricSecurityKey.cs" />
-    <Compile Include="System.IdentityModel.Tokens\IssuerNameRegistry.cs" />
-    <Compile Include="System.IdentityModel.Tokens\KerberosReceiverSecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\KerberosRequestorSecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\LocalIdKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\ProofDescriptor.cs" />
-    <Compile Include="System.IdentityModel.Tokens\RsaKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\RsaSecurityKey.cs" />
-    <Compile Include="System.IdentityModel.Tokens\RsaSecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAccessDecision.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAction.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAdvice.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAssertion.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAssertionKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAttribute.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAttributeStatement.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAudienceRestrictionCondition.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthenticationClaimResource.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthenticationStatement.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorityBinding.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorizationDecisionClaimResource.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlAuthorizationDecisionStatement.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlCondition.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlConditions.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlConstants.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlDoNotCacheCondition.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlEvidence.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlNameIdentifierClaimResource.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlSecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlSerializer.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlStatement.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlSubject.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SamlSubjectStatement.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityAlgorithms.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityKey.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyIdentifier.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyType.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityKeyUsage.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenDescriptor.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenException.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenExpiredException.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenHandler.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenHandlerCollection.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenHandlerConfiguration.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenNotYetValidException.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenReplayDetectedException.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenTypes.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SecurityTokenValidationException.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SessionSecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SessionSecurityTokenCache.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SessionSecurityTokenCacheKey.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SessionSecurityTokenHandler.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SigningCredentials.cs" />
-    <Compile Include="System.IdentityModel.Tokens\SymmetricSecurityKey.cs" />
-    <Compile Include="System.IdentityModel.Tokens\TlsHMAC.cs" />
-    <Compile Include="System.IdentityModel.Tokens\TokenReplayCache.cs" />
-    <Compile Include="System.IdentityModel.Tokens\UserNameSecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\WindowsSecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\X509AsymmetricSecurityKey.cs" />
-    <Compile Include="System.IdentityModel.Tokens\X509IssuerSerialKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\X509RawDataKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\X509SecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Tokens\X509SigningCredentials.cs" />
-    <Compile Include="System.IdentityModel.Tokens\X509SubjectKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\X509ThumbprintKeyIdentifierClause.cs" />
-    <Compile Include="System.IdentityModel.Tokens\X509WindowsSecurityToken.cs" />
-    <Compile Include="System.IdentityModel\CookieTransform.cs" />
-    <Compile Include="System.IdentityModel\OpenObject.cs" />
-    <Compile Include="System.IdentityModel\SignatureVerificationFailedException.cs" />
-    <Compile Include="System.Security.Claims\AuthenticationTypes.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\BinarySecretSecurityToken.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\InternalEncryptedKeyIdentifierClause.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\WrappedKeySecurityToken.cs" />
-    <Compile Include="System.ServiceModel.Security\BinarySecretKeyIdentifierClause.cs" />
-    <Compile Include="System.ServiceModel.Security\KeyNameIdentifierClause.cs" />
-    <Compile Include="System.ServiceModel.Security\SecurityContextKeyIdentifierClause.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
-    <Compile Include="System.IdentityModel.Claims\Claim.cs" />
-    <Compile Include="System.IdentityModel.Claims\ClaimSet.cs" />
-    <Compile Include="System.IdentityModel.Claims\ClaimTypes.cs" />
-    <Compile Include="System.IdentityModel.Claims\DefaultClaimSet.cs" />
-    <Compile Include="System.IdentityModel.Claims\Rights.cs" />
-    <Compile Include="System.IdentityModel.Claims\WindowsClaimSet.cs" />
-    <Compile Include="System.IdentityModel.Claims\X509CertificateClaimSet.cs" />
-    <Compile Include="System.IdentityModel.Configuration\ICustomIdentityConfiguration.cs" />
-    <Compile Include="System.IdentityModel.Configuration\IdentityModelCaches.cs" />
-    <Compile Include="System.IdentityModel.Policy\AuthorizationContext.cs" />
-    <Compile Include="System.IdentityModel.Policy\EvaluationContext.cs" />
-    <Compile Include="System.IdentityModel.Policy\IAuthorizationComponent.cs" />
-    <Compile Include="System.IdentityModel.Policy\IAuthorizationPolicy.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\BinaryExchange.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\EndpointReference.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\Entropy.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\Lifetime.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\ProtectedKey.cs" />
     <Compile Include="System.IdentityModel.Protocols\WSTrust\RequestedProofToken.cs" />
     <Compile Include="System.IdentityModel.Protocols\WSTrust\RequestedSecurityToken.cs" />
-    <Compile Include="System.IdentityModel.Protocols\WSTrust\RequestSecurityTokenResponse.cs" />
     <Compile Include="System.IdentityModel.Protocols\WSTrust\Status.cs" />
     <Compile Include="System.IdentityModel.Protocols\WSTrust\UseKey.cs" />
     <Compile Include="System.IdentityModel.Protocols\WSTrust\WSTrustMessage.cs" />
@@ -378,6 +249,11 @@
     <Compile Include="System.ServiceModel.Security\KeyNameIdentifierClause.cs" />
     <Compile Include="System.ServiceModel.Security\SecurityContextKeyIdentifierClause.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' "></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj
index 81bb975bd59..ac4ee7f19ac 100644
--- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj
+++ b/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />
@@ -53,6 +53,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="System.Json\Extensions\JsonValueExtensions.cs" />
     <Compile Include="System.Json\GlobalSuppressions.cs" />
+    <Compile Include="System.Json\JXmlToJsonValueConverter.cs" />
     <Compile Include="System.Json\JsonArray.cs" />
     <Compile Include="System.Json\JsonObject.cs" />
     <Compile Include="System.Json\JsonPrimitive.cs" />
@@ -62,11 +63,11 @@
     <Compile Include="System.Json\JsonValueChangeEventArgs.cs" />
     <Compile Include="System.Json\JsonValueDynamicMetaObject.cs" />
     <Compile Include="System.Json\JsonValueLinqExtensions.cs" />
-    <Compile Include="System.Json\JXmlToJsonValueConverter.cs" />
     <Compile Include="System.Json\NGenWrapper.cs" />
     <Compile Include="System.Json\Properties\AssemblyInfo.cs" />
     <Compile Include="System.Json\Properties\Resources.Designer.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Json/System.Json.csproj b/mcs/class/System.Json/System.Json.csproj
index 8562d3adb0b..3c7dcb989a6 100644
--- a/mcs/class/System.Json/System.Json.csproj
+++ b/mcs/class/System.Json/System.Json.csproj
@@ -103,6 +103,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\System.Json\src\System\Json\JavaScriptReader.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Json\src\System\Json\JsonArray.cs" />
@@ -115,6 +116,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="corefx\SR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Management/System.Management.csproj b/mcs/class/System.Management/System.Management.csproj
index 557689690f5..3aef6e9bd81 100644
--- a/mcs/class/System.Management/System.Management.csproj
+++ b/mcs/class/System.Management/System.Management.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -52,8 +52,8 @@
     <Compile Include="System.Management.Instrumentation\BaseEvent.cs" />
     <Compile Include="System.Management.Instrumentation\DefaultManagementProjectInstaller.cs" />
     <Compile Include="System.Management.Instrumentation\IEvent.cs" />
-    <Compile Include="System.Management.Instrumentation\IgnoreMemberAttribute.cs" />
     <Compile Include="System.Management.Instrumentation\IInstance.cs" />
+    <Compile Include="System.Management.Instrumentation\IgnoreMemberAttribute.cs" />
     <Compile Include="System.Management.Instrumentation\Instance.cs" />
     <Compile Include="System.Management.Instrumentation\Instrumentation.cs" />
     <Compile Include="System.Management.Instrumentation\InstrumentationClassAttribute.cs" />
@@ -117,6 +117,7 @@
     <Compile Include="System.Management\WqlEventQuery.cs" />
     <Compile Include="System.Management\WqlObjectQuery.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Messaging/System.Messaging.csproj b/mcs/class/System.Messaging/System.Messaging.csproj
index 00b87d33622..7a30c1e4280 100644
--- a/mcs/class/System.Messaging/System.Messaging.csproj
+++ b/mcs/class/System.Messaging/System.Messaging.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -104,6 +105,7 @@
     <Compile Include="System.Messaging\TrusteeType.cs" />
     <Compile Include="System.Messaging\XmlMessageFormatter.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
index 95a3058b8f4..2476b1242fa 100644
--- a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
+++ b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
@@ -44,89 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\CommonWebApiResources.Designer.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\DictionaryExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\Error.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpers.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpersExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\CloneableExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\BufferedMediaTypeFormatter.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ContentNegotiationResult.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\DefaultContentNegotiator.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\DelegatingEnumerable.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\FormDataCollection.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\FormUrlEncodedJson.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\FormUrlEncodedMediaTypeFormatter.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\IContentNegotiator.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\IFormatterLogger.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\IRequiredMemberSelector.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\JsonContractResolver.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\JsonMediaTypeFormatter.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\JsonReaderQuotaException.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaRangeMapping.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeConstants.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeFormatter.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeFormatterCollection.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeFormatterExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeHeaderValueExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeMapping.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeMatch.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeWithQualityHeaderValueComparer.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ParsedMediaTypeHeaderValue.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\FormUrlEncodedParser.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpRequestHeaderParser.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpRequestLineParser.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpResponseHeaderParser.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpStatusLineParser.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\InternetMessageFormatHeaderParser.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\MimeMultipartBodyPartParser.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\MimeMultipartParser.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\ParserState.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\QueryStringMapping.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\RequestHeaderMapping.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ResponseFormatterSelectionResult.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ResponseMediaTypeMatch.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\SecureJsonTextReader.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\StringComparisonHelper.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\StringWithQualityHeaderValueComparer.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\XHRRequestHeaderMapping.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\XmlMediaTypeFormatter.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\FormattingUtilities.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\GlobalSuppressions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Headers\CookieHeaderValue.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Headers\CookieState.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpClientExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentCollectionExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentMessageExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentMultipartExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpHeaderExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpMessageContent.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpRequestHeadersExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpRequestMessageExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpResponseHeadersExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpUnsortedHeaders.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpUnsortedRequest.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpUnsortedResponse.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\IMultipartStreamProvider.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\AsyncResultWithExtraData.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\DelegatingStream.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\HttpValueCollection.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\NonClosingDelegatingStream.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\UriQueryUtility.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MimeBodyPart.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MultipartFileStreamProvider.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MultipartFormDataStreamProvider.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MultipartMemoryStreamProvider.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\ObjectContent.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Properties\Resources.Designer.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\UriExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonBinaryType.cs" />
     <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonBinaryWriter.cs" />
     <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Bson\BsonObjectId.cs" />
@@ -282,7 +201,89 @@
     <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\TypeExtensions.cs" />
     <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Utilities\ValidationUtils.cs" />
     <Compile Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\WriteState.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\CommonWebApiResources.Designer.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\DictionaryExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\Error.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpers.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpersExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\CloneableExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\FormattingUtilities.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\BufferedMediaTypeFormatter.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ContentNegotiationResult.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\DefaultContentNegotiator.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\DelegatingEnumerable.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\FormDataCollection.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\FormUrlEncodedJson.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\FormUrlEncodedMediaTypeFormatter.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\IContentNegotiator.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\IFormatterLogger.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\IRequiredMemberSelector.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\JsonContractResolver.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\JsonMediaTypeFormatter.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\JsonReaderQuotaException.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaRangeMapping.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeConstants.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeFormatter.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeFormatterCollection.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeFormatterExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeHeaderValueExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeMapping.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeMatch.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\MediaTypeWithQualityHeaderValueComparer.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ParsedMediaTypeHeaderValue.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\FormUrlEncodedParser.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpRequestHeaderParser.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpRequestLineParser.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpResponseHeaderParser.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\HttpStatusLineParser.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\InternetMessageFormatHeaderParser.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\MimeMultipartBodyPartParser.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\MimeMultipartParser.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\Parsers\ParserState.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\QueryStringMapping.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\RequestHeaderMapping.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ResponseFormatterSelectionResult.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\ResponseMediaTypeMatch.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\SecureJsonTextReader.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\StringComparisonHelper.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\StringWithQualityHeaderValueComparer.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\XHRRequestHeaderMapping.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Formatting\XmlMediaTypeFormatter.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\GlobalSuppressions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Headers\CookieHeaderValue.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Headers\CookieState.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpClientExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentCollectionExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentMessageExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpContentMultipartExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpHeaderExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpMessageContent.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpRequestHeadersExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpRequestMessageExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpResponseHeadersExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpUnsortedHeaders.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpUnsortedRequest.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\HttpUnsortedResponse.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\IMultipartStreamProvider.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\AsyncResultWithExtraData.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\DelegatingStream.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\HttpValueCollection.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\NonClosingDelegatingStream.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Internal\UriQueryUtility.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MimeBodyPart.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MultipartFileStreamProvider.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MultipartFormDataStreamProvider.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\MultipartMemoryStreamProvider.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\ObjectContent.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\Properties\Resources.Designer.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Net.Http.Formatting\UriExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj b/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj
index 23f708eacd9..48509e56a34 100644
--- a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj
+++ b/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj
@@ -48,11 +48,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="System.Net.Http.WebRequest\WebRequestHandler.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System.Net.Http/System.Net.Http.csproj" />
diff --git a/mcs/class/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.csproj b/mcs/class/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.csproj
index 2aca954736f..9361bea3c43 100644
--- a/mcs/class/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.csproj
+++ b/mcs/class/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.csproj
@@ -98,15 +98,17 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="System.Net.Http\CookieUsePolicy.cs" />
-    <Compile Include="System.Net.Http\WindowsProxyUsePolicy.cs" />
     <Compile Include="System.Net.Http\WinHttpHandler.cs" />
+    <Compile Include="System.Net.Http\WindowsProxyUsePolicy.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Net.Http/System.Net.Http.csproj b/mcs/class/System.Net.Http/System.Net.Http.csproj
index 170a678bfbb..e033c7c3f93 100644
--- a/mcs/class/System.Net.Http/System.Net.Http.csproj
+++ b/mcs/class/System.Net.Http/System.Net.Http.csproj
@@ -103,6 +103,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -117,8 +118,8 @@
     <Compile Include="System.Net.Http.Headers\HeaderInfo.cs" />
     <Compile Include="System.Net.Http.Headers\HttpContentHeaders.cs" />
     <Compile Include="System.Net.Http.Headers\HttpHeaderKind.cs" />
-    <Compile Include="System.Net.Http.Headers\HttpHeaders.cs" />
     <Compile Include="System.Net.Http.Headers\HttpHeaderValueCollection.cs" />
+    <Compile Include="System.Net.Http.Headers\HttpHeaders.cs" />
     <Compile Include="System.Net.Http.Headers\HttpRequestHeaders.cs" />
     <Compile Include="System.Net.Http.Headers\HttpResponseHeaders.cs" />
     <Compile Include="System.Net.Http.Headers\Lexer.cs" />
@@ -158,9 +159,6 @@
     <Compile Include="System.Net.Http\StreamContent.cs" />
     <Compile Include="System.Net.Http\StringContent.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="System.Net.Http\HttpClientHandler.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="System.Net.Http\HttpClient.android.cs" />
     <Compile Include="System.Net.Http\HttpClientHandler.cs" />
@@ -168,36 +166,29 @@
   <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
     <Compile Include="System.Net.Http\HttpClientHandler.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="System.Net.Http\HttpClientHandler.platformnotsupported.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
     <Compile Include="System.Net.Http\HttpClientHandler.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
-    <Compile Include="System.Net.Http\HttpClientHandler.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
-    <Compile Include="System.Net.Http\HttpClientHandler.cs" />
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+    <Compile Include="System.Net.Http\HttpClientHandler.platformnotsupported.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="System.Net.Http\HttpClientHandler.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
-    <Compile Include="System.Net.Http\HttpClient.mac.cs" />
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
     <Compile Include="System.Net.Http\HttpClientHandler.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
-    <Compile Include="System.Net.Http\HttpClient.mac.cs" />
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
     <Compile Include="System.Net.Http\HttpClientHandler.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="System.Net.Http\HttpClientHandler.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
     <Compile Include="System.Net.Http\HttpClientHandler.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="System.Net.Http\HttpClient.mac.cs" />
     <Compile Include="System.Net.Http\HttpClientHandler.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
diff --git a/mcs/class/System.Net/System.Net.csproj b/mcs/class/System.Net/System.Net.csproj
index 0f76abba0ec..2027f04b2a8 100644
--- a/mcs/class/System.Net/System.Net.csproj
+++ b/mcs/class/System.Net/System.Net.csproj
@@ -102,6 +102,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -109,6 +110,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Assembly\TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj
index e9efff93eb7..7c978042f1b 100644
--- a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj
+++ b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj
@@ -104,11 +104,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Assembly\TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Numerics/System.Numerics.csproj b/mcs/class/System.Numerics/System.Numerics.csproj
index 7bd6fde03eb..f1419400020 100644
--- a/mcs/class/System.Numerics/System.Numerics.csproj
+++ b/mcs/class/System.Numerics/System.Numerics.csproj
@@ -104,6 +104,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IntrinsicAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\ValueStringBuilder.cs" />
@@ -137,6 +138,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="corefx\SR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj b/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj
index 3ed52380655..f01f190bda6 100644
--- a/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj
+++ b/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\GlobalSuppressions.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\InternalsVisibleTo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\NamespaceDocs.cs" />
@@ -57,30 +57,30 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousSafeObserver.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\AsyncLock.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\CatchScheduler.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.Default.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\CurrentThreadScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\DefaultScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\DisableOptimizationsScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ImmediateScheduler.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.TimerQueue.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ScheduledItem.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Async.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Recursive.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.Emulation.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Simple.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Wrappers.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerDefaults.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerOperation.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerQueue.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerWrapper.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Stopwatch.Default.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.ObserveOn.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.Synchronize.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SynchronizationContextScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\AnonymousDisposable.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\BooleanDisposable.cs" />
@@ -100,8 +100,8 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ConcurrentDictionary.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ConcurrentQueue.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Constants.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ExceptionServices.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ExceptionServices.Default.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ExceptionServices.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\HostLifecycleService.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ImmutableList.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Lazy.cs" />
@@ -117,8 +117,8 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Stubs.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SynchronizationContextExtensions.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SynchronizedObserver.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SystemClock.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SystemClock.Default.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SystemClock.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Notification.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\ObservableBase.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\ObserverBase.cs" />
@@ -126,6 +126,7 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Strings_Core.Generated.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.csproj b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.csproj
index 8eea11d4edf..e3a50693393 100644
--- a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.csproj
+++ b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.csproj
@@ -44,12 +44,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Debugger\Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Debugger\Reactive\Linq\QueryDebugger.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.csproj b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.csproj
index 380778fad7d..2aa25c8ebed 100644
--- a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.csproj
+++ b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.csproj
@@ -44,20 +44,21 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\ExperimentalAttribute.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\InternalsVisibleTo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Internal\BinaryObserver.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\IQueryLanguageEx.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\ObservableEx.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QbservableEx.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QbservableEx.Generated.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QbservableEx.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QueryLanguageEx.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\ListObservable.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj
index 95572c722a0..8f5f99a9ea5 100644
--- a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj
+++ b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\AssemblyFileVersionAttribute.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\DateTimeOffset.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\GlobalSuppressions.cs" />
@@ -68,10 +68,11 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IQbservable.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IQbservableProvider.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\IConnectableObservable.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj b/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj
index ae90ea738d4..8452b279230 100644
--- a/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj
+++ b/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj
@@ -44,15 +44,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\GlobalSuppressions.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\InternalsVisibleTo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\NamespaceDocs.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\HistoricalScheduler.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.Extensions.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPattern.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPatternSource.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPatternSourceBase.cs" />
@@ -93,7 +93,6 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Single.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.StandardSequenceOperators.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Time.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\_.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\AddRef.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Aggregate.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\All.cs" />
@@ -189,6 +188,7 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\While.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Window.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Zip.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\_.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable_.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Aggregates.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Async.cs" />
@@ -210,8 +210,8 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\BehaviorSubject.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\ConnectableObservable.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\ReplaySubject.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\Subject.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\Subject.Extensions.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\Subject.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Threading\Tasks\NamespaceDoc.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Threading\Tasks\TaskObservableExtensions.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\TimeInterval.cs" />
@@ -219,6 +219,7 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Strings_Linq.Generated.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
index eee9b39c4ec..356a3fb450e 100644
--- a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
+++ b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
@@ -44,12 +44,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Observable.Aliases\Observable.Aliases.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Observable.Aliases\Qbservable.Aliases.Generated.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj
index 2b31bd71a72..c9acc4b3871 100644
--- a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj
+++ b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj
@@ -44,18 +44,18 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\GlobalSuppressions.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.Windows.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\EventLoopScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\NewThreadScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\TaskPoolScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\Thread.Stub.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.Windows.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\EnlightenmentProvider.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\ExceptionServicesImpl.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\HostLifecycleNotifications.Windows.cs" />
@@ -67,6 +67,7 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Strings_PlatformServices.Generated.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers.csproj b/mcs/class/System.Reactive.Providers/System.Reactive.Providers.csproj
index 665cfbf18b0..07db1c0af78 100644
--- a/mcs/class/System.Reactive.Providers/System.Reactive.Providers.csproj
+++ b/mcs/class/System.Reactive.Providers/System.Reactive.Providers.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\GlobalSuppressions.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Internal\Constants.cs" />
@@ -53,13 +53,14 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Joins\QueryablePlan.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\ExpressionVisitor.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Observable.Queryable.cs" />
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Generated.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Joins.cs" />
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\ObservableQuery.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Strings_Providers.Generated.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.csproj b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.csproj
index 76723f0d9a5..487a7a71c1b 100644
--- a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.csproj
+++ b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.csproj
@@ -44,14 +44,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\GlobalSuppressions.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Reactive\Linq\Observable.Remoting.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Reactive\Linq\QueryLanguage.Remoting.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.csproj b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.csproj
index ff277f40409..9c8f2789634 100644
--- a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.csproj
+++ b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.csproj
@@ -44,14 +44,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\GlobalSuppressions.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\Reactive\Concurrency\ControlScheduler.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Forms\Reactive\Linq\ControlObservable.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj
index 1be63d3ac74..04f09d17739 100644
--- a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj
+++ b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\GlobalSuppressions.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Reactive\Concurrency\CoreDispatcherScheduler.cs" />
@@ -56,6 +56,7 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Windows.Threading\Strings_WindowsThreading.Generated.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj b/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj
index 9d0c0011a26..335075d93f6 100644
--- a/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj
+++ b/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj
@@ -103,6 +103,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -110,6 +111,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="System.Reflection.Context\CustomReflectionContext.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj
index 42dce12e93f..54a511e76cb 100644
--- a/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj
+++ b/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj
@@ -43,11 +43,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="..\System.Web\System.Web.Configuration_2.0\NullableStringValidator.cs" />
     <Compile Include="..\referencesource\System.Runtime.Caching\Resources\RH.cs" />
     <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheEntryChangeMonitor.cs" />
     <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\CacheEntryRemovedArguments.cs" />
@@ -87,17 +88,17 @@
     <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\PerfCounterName.cs" />
     <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\PerfCounters.cs" />
     <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\PhysicalMemoryMonitor.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\SRef.cs" />
     <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\SafeBitVector32.cs" />
     <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\SafeRegistryHandle.cs" />
     <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\SqlChangeMonitor.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Caching\System\Caching\SRef.cs" />
-    <Compile Include="..\System.Web\System.Web.Configuration_2.0\NullableStringValidator.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\CacheEntryCollection.cs" />
     <Compile Include="ReferenceSources\CacheExpires.cs" />
     <Compile Include="ReferenceSources\CacheUsage.cs" />
     <Compile Include="ReferenceSources\R.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.csproj b/mcs/class/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.csproj
index 88aa9b741fb..b430488998b 100644
--- a/mcs/class/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.csproj
+++ b/mcs/class/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.csproj
@@ -101,20 +101,9 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' "></ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' "></ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup></ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../corlib/corlib.csproj" />
diff --git a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing.csproj b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing.csproj
index 84a38edbbee..2cdf2d5f8f1 100644
--- a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing.csproj
+++ b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\AssemblyInfo.cs" />
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\DisassociateInstanceKeysExtension.cs" />
@@ -60,9 +60,9 @@
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyNotReadyException.cs" />
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyState.cs" />
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceKeyView.cs" />
-    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockedException.cs" />
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockLostException.cs" />
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockQueryResult.cs" />
+    <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceLockedException.cs" />
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceNormalEvent.cs" />
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceNotReadyException.cs" />
     <Compile Include="..\referencesource\System.Runtime.DurableInstancing\System\Runtime\DurableInstancing\InstanceOwner.cs" />
@@ -93,6 +93,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="SRCore.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj
index 5e2abccce3d..609efa0a7a0 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -104,15 +104,25 @@
     <Compile Include="System.Runtime.Remoting.MetadataServices\MetaData.cs" />
     <Compile Include="System.Runtime.Remoting.MetadataServices\MetaDataCodeGenerator.cs" />
     <Compile Include="System.Runtime.Remoting.MetadataServices\MetaDataExporter.cs" />
+    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSGeneratorException.cs" />
+    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSParserException.cs" />
     <Compile Include="System.Runtime.Remoting.MetadataServices\SdlChannelSink.cs" />
     <Compile Include="System.Runtime.Remoting.MetadataServices\SdlChannelSinkProvider.cs" />
     <Compile Include="System.Runtime.Remoting.MetadataServices\SdlType.cs" />
     <Compile Include="System.Runtime.Remoting.MetadataServices\ServiceType.cs" />
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSGeneratorException.cs" />
-    <Compile Include="System.Runtime.Remoting.MetadataServices\SUDSParserException.cs" />
     <Compile Include="System.Runtime.Remoting.Services\RemotingClientProxy.cs" />
     <Compile Include="System.Runtime.Remoting.Services\RemotingService.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' "></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj
index 0ba28ca97cf..89432e1b04d 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj
@@ -48,6 +48,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -58,6 +59,7 @@
     <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapTypeMapper.cs" />
     <Compile Include="System.Runtime.Serialization.Formatters.Soap\SoapWriter.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System.XML/System.Xml.csproj" />
diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.csproj
index 998475dcd20..e851f131fd4 100644
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.csproj
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.csproj
@@ -102,6 +102,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\System.Runtime.Serialization.Primitives\src\System\Runtime\Serialization\ISerializationSurrogateProvider.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
@@ -180,6 +181,7 @@
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SpecialTypeDataContract.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SurrogateDataContract.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\TypeInformation.cs" />
+    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XPathQueryGenerator.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlDataContract.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatGeneratorStatics.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlFormatReaderGenerator.cs" />
@@ -195,7 +197,6 @@
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableServices.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlSerializableWriter.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XmlWriterDelegator.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XPathQueryGenerator.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Text\Base64Encoding.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Text\BinHexEncoding.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Text\SurrogateChar.cs" />
@@ -252,68 +253,27 @@
     <Compile Include="ReferenceSources\XmlFormatReaderGenerator_static.cs" />
     <Compile Include="ReferenceSources\XmlFormatWriterGenerator_static.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CodeExporter.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ConfigurationStrings.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DataContractSerializerSection.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeElement.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeElementCollection.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeValidator.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DeclaredTypeValidatorAttribute.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\NetDataContractSerializerSection.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ParameterElement.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ParameterElementCollection.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\Properties.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\SerializationSectionGroup.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\TypeElement.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\TypeElementCollection.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ContractCodeDomInfo.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\ImportOptions.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\SchemaImporter.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XsdDataContractExporter.cs" />
-    <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\XsdDataContractImporter.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
-    <Compile Include="corefx\DiagnosticUtility.cs" />
     <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
+    <Compile Include="corefx\DiagnosticUtility.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
     <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
-    <Compile Include="corefx\DiagnosticUtility.cs" />
     <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
     <Compile Include="corefx\DiagnosticUtility.cs" />
-    <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
     <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
-    <Compile Include="corefx\DiagnosticUtility.cs" />
     <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
-    <Compile Include="corefx\DiagnosticUtility.cs" />
-    <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
     <Compile Include="corefx\DiagnosticUtility.cs" />
-    <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
     <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
-    <Compile Include="corefx\DiagnosticUtility.cs" />
     <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
     <Compile Include="corefx\DiagnosticUtility.cs" />
-    <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\CodeExporter.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\ConfigurationStrings.cs" />
     <Compile Include="..\referencesource\System.Runtime.Serialization\System\Runtime\Serialization\Configuration\DataContractSerializerSection.cs" />
@@ -336,18 +296,28 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
     <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
-    <Compile Include="corefx\DiagnosticUtility.cs" />
     <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
+    <Compile Include="corefx\DiagnosticUtility.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
     <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
-    <Compile Include="corefx\DiagnosticUtility.cs" />
     <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
+    <Compile Include="corefx\DiagnosticUtility.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
+    <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
     <Compile Include="corefx\DiagnosticUtility.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+    <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
     <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
+    <Compile Include="corefx\DiagnosticUtility.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="..\..\..\external\corefx\src\System.Private.DataContractSerialization\src\System\Runtime\Serialization\XsdDataContractExporter.cs" />
+    <Compile Include="ReferenceSources\SimplifiedCodeTypeReference.cs" />
+    <Compile Include="corefx\DiagnosticUtility.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
diff --git a/mcs/class/System.Security/System.Security.csproj b/mcs/class/System.Security/System.Security.csproj
index fa4782f3bb5..1321d6a7f80 100644
--- a/mcs/class/System.Security/System.Security.csproj
+++ b/mcs/class/System.Security/System.Security.csproj
@@ -104,9 +104,10 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Security\Cryptography\Asn1V2.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Security\Cryptography\Asn1V2.Serializer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Security\Cryptography\Asn1V2.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Security\Cryptography\AsnReader.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Security\Cryptography\AsnWriter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\DecryptorPal.cs" />
@@ -117,13 +118,13 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Oids.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\AsnHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\ManagedPal.Asn.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\ManagedPal.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\ManagedPal.Decode.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\ManagedPal.Decrypt.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\ManagedPal.Encrypt.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\ManagedPal.Exceptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\ManagedPal.KeyAgree.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\ManagedPal.KeyTrans.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\ManagedPal.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\Pal\AnyOS\PkcsPal.AnyOS.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\PkcsPal.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\Internal\Cryptography\RecipientInfoPal.cs" />
@@ -165,10 +166,10 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\CmsRecipient.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\CmsRecipientCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\CmsRecipientEnumerator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\CmsSignature.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\CmsSignature.DSA.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\CmsSignature.ECDsa.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\CmsSignature.RSA.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\CmsSignature.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\CmsSigner.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\ContentInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\EnvelopedCms.cs" />
@@ -184,8 +185,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\RecipientInfoCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\RecipientInfoEnumerator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\RecipientInfoType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\SignedCms.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\SignedCms.CtorOverloads.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\SignedCms.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\SignerInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\SignerInfoCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Pkcs\src\System\Security\Cryptography\Pkcs\SignerInfoEnumerator.cs" />
@@ -200,17 +201,20 @@
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="corefx\SR.cs" />
     <Compile Include="System.Security.Cryptography.Pkcs\AlgorithmIdentifier.cs" />
     <Compile Include="System.Security.Cryptography.Pkcs\EnvelopedCms.cs" />
     <Compile Include="System.Security.Cryptography.Pkcs\Pkcs9SigningTime.cs" />
     <Compile Include="System.Security.Cryptography\ProtectedData.cs" />
+    <Compile Include="corefx\SR.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' "></ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AncestralNamespaceContextManager.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AttributeSortOrder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\C14NAncestralNamespaceContextManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalizationDispatcher.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXml.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlCDataSection.cs" />
@@ -223,16 +227,17 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlSignificantWhitespace.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlText.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlWhitespace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalizationDispatcher.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CertUsageType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherReference.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoSignedXmlRecursionException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSAKeyValue.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSASignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataObject.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataReference.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DocPosition.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSAKeyValue.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSASignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedKey.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedReference.cs" />
@@ -256,104 +261,15 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\MyXmlDocument.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceFrame.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceSortOrder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Reference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceTargetType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAKeyValue.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA1SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA256SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA384SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA512SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Signature.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedXmlDebugLog.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SymmetricKeyWrap.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Transform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\TransformChain.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Utils.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDecryptionTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigBase64Transform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigC14NTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigC14NWithCommentsTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigEnvelopedSignatureTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigExcC14NTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigExcC14NWithCommentsTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigXPathTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigXsltTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlLicenseTransform.cs" />
-    <Compile Include="Mono.Security.Cryptography\ManagedProtection.cs" />
-    <Compile Include="Mono.Security.Cryptography\NativeDapiProtection.cs" />
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyAgreeKeyChoice.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2UI.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SelectionFlag.cs" />
-    <Compile Include="System.Security.Cryptography.Xml\SignedXml.cs" />
-    <Compile Include="System.Security.Cryptography\MemoryProtectionScope.cs" />
-    <Compile Include="System.Security.Cryptography\ProtectedMemory.cs" />
-    <Compile Include="System.Security.Permissions\DataProtectionPermission.cs" />
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionFlags.cs" />
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AncestralNamespaceContextManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AttributeSortOrder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\C14NAncestralNamespaceContextManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalizationDispatcher.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXml.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlAttribute.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlCDataSection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlComment.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlDocument.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlElement.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlEntityReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlNodeList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlProcessingInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlSignificantWhitespace.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlText.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlWhitespace.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CertUsageType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherData.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoHelpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoSignedXmlRecursionException.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataObject.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DocPosition.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSAKeyValue.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSASignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedData.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedKey.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedXml.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptionMethod.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptionProperty.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptionPropertyCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ExcAncestralNamespaceContextManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ExcCanonicalXml.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ICanonicalizableNode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\IRelDecryptor.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoClause.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoEncryptedKey.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoName.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoNode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoRetrievalMethod.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoX509Data.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\MyXmlDocument.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceFrame.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceSortOrder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Reference.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceList.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceTargetType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAKeyValue.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA1SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA256SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA384SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA512SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Signature.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedXmlDebugLog.cs" />
@@ -384,11 +300,11 @@
     <Compile Include="System.Security.Permissions\DataProtectionPermissionFlags.cs" />
     <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AncestralNamespaceContextManager.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AttributeSortOrder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\C14NAncestralNamespaceContextManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalizationDispatcher.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXml.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlCDataSection.cs" />
@@ -401,16 +317,17 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlSignificantWhitespace.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlText.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlWhitespace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalizationDispatcher.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CertUsageType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherReference.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoSignedXmlRecursionException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSAKeyValue.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSASignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataObject.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataReference.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DocPosition.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSAKeyValue.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSASignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedKey.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedReference.cs" />
@@ -434,104 +351,15 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\MyXmlDocument.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceFrame.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceSortOrder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Reference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceTargetType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAKeyValue.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA1SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA256SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA384SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA512SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Signature.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedXmlDebugLog.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SymmetricKeyWrap.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Transform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\TransformChain.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Utils.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDecryptionTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigBase64Transform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigC14NTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigC14NWithCommentsTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigEnvelopedSignatureTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigExcC14NTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigExcC14NWithCommentsTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigXPathTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlDsigXsltTransform.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\XmlLicenseTransform.cs" />
-    <Compile Include="Mono.Security.Cryptography\ManagedProtection.cs" />
-    <Compile Include="Mono.Security.Cryptography\NativeDapiProtection.cs" />
-    <Compile Include="System.Security.Cryptography.Pkcs\KeyAgreeKeyChoice.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509Certificate2UI.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\X509SelectionFlag.cs" />
-    <Compile Include="System.Security.Cryptography.Xml\SignedXml.cs" />
-    <Compile Include="System.Security.Cryptography\MemoryProtectionScope.cs" />
-    <Compile Include="System.Security.Cryptography\ProtectedMemory.cs" />
-    <Compile Include="System.Security.Permissions\DataProtectionPermission.cs" />
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\DataProtectionPermissionFlags.cs" />
-    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AncestralNamespaceContextManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AttributeSortOrder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\C14NAncestralNamespaceContextManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalizationDispatcher.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXml.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlAttribute.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlCDataSection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlComment.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlDocument.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlElement.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlEntityReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlNodeList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlProcessingInstruction.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlSignificantWhitespace.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlText.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlWhitespace.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CertUsageType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherData.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoHelpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoSignedXmlRecursionException.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataObject.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DocPosition.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSAKeyValue.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSASignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedData.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedKey.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedXml.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptionMethod.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptionProperty.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptionPropertyCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ExcAncestralNamespaceContextManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ExcCanonicalXml.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ICanonicalizableNode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\IRelDecryptor.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoClause.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoEncryptedKey.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoName.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoNode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoRetrievalMethod.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyInfoX509Data.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\KeyReference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\MyXmlDocument.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceFrame.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceSortOrder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Reference.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceList.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceTargetType.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAKeyValue.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA1SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA256SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA384SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA512SignatureDescription.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Signature.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedXmlDebugLog.cs" />
@@ -562,11 +390,11 @@
     <Compile Include="System.Security.Permissions\DataProtectionPermissionFlags.cs" />
     <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' "></ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AncestralNamespaceContextManager.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\AttributeSortOrder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\C14NAncestralNamespaceContextManager.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalizationDispatcher.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXml.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlCDataSection.cs" />
@@ -579,16 +407,17 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlSignificantWhitespace.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlText.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalXmlWhitespace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CanonicalizationDispatcher.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CertUsageType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CipherReference.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\CryptoSignedXmlRecursionException.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSAKeyValue.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSASignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataObject.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DataReference.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DocPosition.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSAKeyValue.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\DSASignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedKey.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\EncryptedReference.cs" />
@@ -612,15 +441,15 @@
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\MyXmlDocument.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceFrame.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\NamespaceSortOrder.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Reference.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceTargetType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAKeyValue.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA1SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA256SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA384SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SHA512SignatureDescription.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\RSAPKCS1SignatureDescription.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Reference.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceList.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\ReferenceTargetType.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\Signature.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Security.Cryptography.Xml\src\System\Security\Cryptography\Xml\SignedXmlDebugLog.cs" />
@@ -651,6 +480,7 @@
     <Compile Include="System.Security.Permissions\DataProtectionPermissionFlags.cs" />
     <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' "></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj
index e284095bab0..bd481e8342b 100644
--- a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj
+++ b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj
@@ -43,14 +43,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="System.ServiceModel.Activation\ServiceHostFactory.cs" />
     <Compile Include="System.ServiceModel\ServiceHostingEnvironment.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.csproj
index 4365ea34f06..d2322fc04bf 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.csproj
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="System.ServiceModel.Channels\DiscoveryChannelBase.cs" />
     <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />
@@ -144,6 +144,7 @@
     <Compile Include="System.ServiceModel.Discovery\UdpDiscoveryEndpoint.cs" />
     <Compile Include="System.ServiceModel.Discovery\UdpTransportSettings.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj
index 2b1829dfc03..88b69be54f7 100644
--- a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj
+++ b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj
@@ -102,6 +102,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
@@ -126,6 +127,7 @@
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Collections\ValidatingCollection.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\CompletedAsyncResult.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\ComputerNameFormat.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\DiagnosticStrings.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\ActivityControl.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DiagnosticEventProvider.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\DiagnosticTraceBase.cs" />
@@ -142,7 +144,6 @@
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\PerformanceCounterNameAttribute.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\StringTraceRecord.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Diagnostics\TraceRecord.cs" />
-    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\DiagnosticStrings.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\DuplicateDetector.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\ExceptionTrace.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\FastAsyncCallback.cs" />
@@ -151,11 +152,11 @@
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\FxCop.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\HashHelper.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\IAsyncEventArgs.cs" />
-    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\InputQueue.cs" />
-    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\InternalBufferManager.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\IOThreadCancellationTokenSource.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\IOThreadScheduler.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\IOThreadTimer.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\InputQueue.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\InternalBufferManager.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\MruCache.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\NameGenerator.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\PartialTrustHelpers.cs" />
@@ -173,8 +174,8 @@
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TraceEventOpcode.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TraceLevelHelper.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TracePayload.cs" />
-    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TypedAsyncResult.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TypeHelper.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\TypedAsyncResult.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\UrlUtility.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\WaitCallbackActionItem.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\TraceCore.Designer.cs" />
@@ -183,10 +184,6 @@
     <Compile Include="InternalSR.cs" />
     <Compile Include="ReferenceSources\LocalAppContextSwitches.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\SafeEventLogWriteHandle.cs" />
-    <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\UnsafeNativeMethods.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\SafeEventLogWriteHandle.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\UnsafeNativeMethods.cs" />
@@ -194,37 +191,31 @@
   <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
     <Compile Include="MobileStubs.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="MobileStubs.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
     <Compile Include="MobileStubs.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
-    <Compile Include="MobileStubs.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
     <Compile Include="MobileStubs.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\SafeEventLogWriteHandle.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\UnsafeNativeMethods.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
     <Compile Include="MobileStubs.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\SafeEventLogWriteHandle.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\UnsafeNativeMethods.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="MobileStubs.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\SafeEventLogWriteHandle.cs" />
     <Compile Include="..\referencesource\System.ServiceModel.Internals\System\Runtime\Interop\UnsafeNativeMethods.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
     <Compile Include="MobileStubs.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
diff --git a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj
index e105b6b294a..4115386c2b4 100644
--- a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj
+++ b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -75,6 +75,7 @@
     <Compile Include="System.ServiceModel.Routing\RoutingService.cs" />
     <Compile Include="System.ServiceModel.Routing\SoapProcessingBehavior.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web.csproj
index dd34db9edec..062e36736a2 100644
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web.csproj
+++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web.csproj
@@ -103,6 +103,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Assembly\TypeForwarders.cs" />
@@ -129,28 +130,6 @@
     <Compile Include="System.ServiceModel\WebHttpSecurity.cs" />
     <Compile Include="System.ServiceModel\WebHttpSecurityMode.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="System.ServiceModel.Activation\WebScriptServiceHostFactory.cs" />
-    <Compile Include="System.ServiceModel.Activation\WebServiceHostFactory.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingCollectionElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebHttpElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointCollectionElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebHttpSecurityElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebMessageEncodingElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEnablingElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointCollectionElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointElement.cs" />
-    <Compile Include="System.ServiceModel.Description\WebHttpEndpoint.cs" />
-    <Compile Include="System.ServiceModel.Description\WebScriptEnablingBehavior.cs" />
-    <Compile Include="System.ServiceModel.Description\WebScriptEndpoint.cs" />
-    <Compile Include="System.ServiceModel.Description\WebServiceEndpoint.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\WebHttpDispatchOperationSelector.cs" />
-    <Compile Include="System.ServiceModel.Web\IncomingWebRequestContext.cs" />
-    <Compile Include="System.ServiceModel.Web\OutgoingWebResponseContext.cs" />
-    <Compile Include="System.ServiceModel.Web\WebServiceHost.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -171,16 +150,6 @@
     <Compile Include="System\UriTemplateMatchException.cs" />
     <Compile Include="System\UriTemplateTable.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="System\UriTemplate.cs" />
-    <Compile Include="System\UriTemplateEquivalenceComparer.cs" />
-    <Compile Include="System\UriTemplateMatch.cs" />
-    <Compile Include="System\UriTemplateMatchException.cs" />
-    <Compile Include="System\UriTemplateTable.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -191,17 +160,7 @@
     <Compile Include="System\UriTemplateMatchException.cs" />
     <Compile Include="System\UriTemplateTable.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="System\UriTemplate.cs" />
-    <Compile Include="System\UriTemplateEquivalenceComparer.cs" />
-    <Compile Include="System\UriTemplateMatch.cs" />
-    <Compile Include="System\UriTemplateMatchException.cs" />
-    <Compile Include="System\UriTemplateTable.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -211,17 +170,29 @@
     <Compile Include="System\UriTemplateMatchException.cs" />
     <Compile Include="System\UriTemplateTable.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
-    <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="System\UriTemplate.cs" />
-    <Compile Include="System\UriTemplateEquivalenceComparer.cs" />
-    <Compile Include="System\UriTemplateMatch.cs" />
-    <Compile Include="System\UriTemplateMatchException.cs" />
-    <Compile Include="System\UriTemplateTable.cs" />
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="System.ServiceModel.Activation\WebScriptServiceHostFactory.cs" />
+    <Compile Include="System.ServiceModel.Activation\WebServiceHostFactory.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingCollectionElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebHttpBindingElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebHttpElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointCollectionElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebHttpEndpointElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebHttpSecurityElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebMessageEncodingElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebScriptEnablingElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointCollectionElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WebScriptEndpointElement.cs" />
+    <Compile Include="System.ServiceModel.Description\WebHttpEndpoint.cs" />
+    <Compile Include="System.ServiceModel.Description\WebScriptEnablingBehavior.cs" />
+    <Compile Include="System.ServiceModel.Description\WebScriptEndpoint.cs" />
+    <Compile Include="System.ServiceModel.Description\WebServiceEndpoint.cs" />
+    <Compile Include="System.ServiceModel.Dispatcher\WebHttpDispatchOperationSelector.cs" />
+    <Compile Include="System.ServiceModel.Web\IncomingWebRequestContext.cs" />
+    <Compile Include="System.ServiceModel.Web\OutgoingWebResponseContext.cs" />
+    <Compile Include="System.ServiceModel.Web\WebServiceHost.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -231,64 +202,17 @@
     <Compile Include="System\UriTemplateMatchException.cs" />
     <Compile Include="System\UriTemplateTable.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Channels\UriGenerator.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\DiagnosticUtility.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\App10Constants.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Atom10Constants.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Atom10FeedFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Atom10ItemFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\AtomPub10CategoriesDocumentFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\AtomPub10ServiceDocumentFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\CategoriesDocument.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\CategoriesDocumentFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\DateTimeHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ExtensibleSyndicationObject.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\FeedUtils.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\IExtensibleSyndicationObject.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\InlineCategoriesDocument.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\NullNotAllowedCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ReferencedCategoriesDocument.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ResourceCollectionInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Rss20Constants.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Rss20FeedFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Rss20ItemFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ServiceDocument.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\ServiceDocumentFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationCategory.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationContent.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationElementExtension.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationElementExtensionCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationElementExtensionKindHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationFeed.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationFeedFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationItem.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationItemFormatter.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationLink.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationPerson.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationTextInput.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\SyndicationVersions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\TextSyndicationContent.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\TextSyndicationContentKind.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\TextSyndicationContentKindHelper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\UrlSyndicationContent.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\Workspace.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\XmlDateTimeData.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\XmlSyndicationContent.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\XmlUriData.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\XmlBuffer.cs" />
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="System.ServiceModel.Web\IncomingWebRequestContext.cs" />
-    <Compile Include="System.ServiceModel.Web\OutgoingWebResponseContext.cs" />
     <Compile Include="System\UriTemplate.cs" />
     <Compile Include="System\UriTemplateEquivalenceComparer.cs" />
     <Compile Include="System\UriTemplateMatch.cs" />
     <Compile Include="System\UriTemplateMatchException.cs" />
     <Compile Include="System\UriTemplateTable.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -298,7 +222,7 @@
     <Compile Include="System\UriTemplateMatchException.cs" />
     <Compile Include="System\UriTemplateTable.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -308,7 +232,7 @@
     <Compile Include="System\UriTemplateMatchException.cs" />
     <Compile Include="System\UriTemplateTable.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.csproj b/mcs/class/System.ServiceModel/System.ServiceModel.csproj
index 88a3b63f6ce..3b2d3c5d472 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.csproj
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.csproj
@@ -102,6 +102,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -189,8 +190,8 @@
     <Compile Include="System.ServiceModel.Channels\HttpRequestChannel.cs" />
     <Compile Include="System.ServiceModel.Channels\HttpRequestMessageProperty.cs" />
     <Compile Include="System.ServiceModel.Channels\HttpResponseMessageProperty.cs" />
-    <Compile Include="System.ServiceModel.Channels\HttpsTransportBindingElement.cs" />
     <Compile Include="System.ServiceModel.Channels\HttpTransportBindingElement.cs" />
+    <Compile Include="System.ServiceModel.Channels\HttpsTransportBindingElement.cs" />
     <Compile Include="System.ServiceModel.Channels\IBindingDeliveryCapabilities.cs" />
     <Compile Include="System.ServiceModel.Channels\IBindingRuntimePreferences.cs" />
     <Compile Include="System.ServiceModel.Channels\IChannel.cs" />
@@ -270,8 +271,8 @@
     <Compile Include="System.ServiceModel.Description\ServiceEndpoint.cs" />
     <Compile Include="System.ServiceModel.Description\XmlName.cs" />
     <Compile Include="System.ServiceModel.Description\XmlSerializerOperationBehavior.cs" />
-    <Compile Include="System.ServiceModel.Diagnostics\MessageLoggingSettings.cs" />
     <Compile Include="System.ServiceModel.Diagnostics\MessageLogTraceRecord.cs" />
+    <Compile Include="System.ServiceModel.Diagnostics\MessageLoggingSettings.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\BaseMessagesFormatter.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\ClientOperation.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\ClientRuntime.cs" />
@@ -312,8 +313,8 @@
     <Compile Include="System.ServiceModel\AllEnums.cs" />
     <Compile Include="System.ServiceModel\BasicHttpBinding_4_5.cs" />
     <Compile Include="System.ServiceModel\BasicHttpMessageSecurity.cs" />
-    <Compile Include="System.ServiceModel\BasicHttpsBinding.cs" />
     <Compile Include="System.ServiceModel\BasicHttpSecurity.cs" />
+    <Compile Include="System.ServiceModel\BasicHttpsBinding.cs" />
     <Compile Include="System.ServiceModel\BasicHttpsSecurity.cs" />
     <Compile Include="System.ServiceModel\CallbackBehaviorAttribute.cs" />
     <Compile Include="System.ServiceModel\ChannelFactory.cs" />
@@ -360,10 +361,10 @@
     <Compile Include="System.ServiceModel\MessageBodyAttribute.cs" />
     <Compile Include="System.ServiceModel\MessageContractAttribute.cs" />
     <Compile Include="System.ServiceModel\MessageContractMemberAttribute.cs" />
-    <Compile Include="System.ServiceModel\MessageHeader_1.cs" />
     <Compile Include="System.ServiceModel\MessageHeaderArrayAttribute.cs" />
     <Compile Include="System.ServiceModel\MessageHeaderAttribute.cs" />
     <Compile Include="System.ServiceModel\MessageHeaderException.cs" />
+    <Compile Include="System.ServiceModel\MessageHeader_1.cs" />
     <Compile Include="System.ServiceModel\MessageParameterAttribute.cs" />
     <Compile Include="System.ServiceModel\MessagePropertyAttribute.cs" />
     <Compile Include="System.ServiceModel\MessageSecurityOverTcp.cs" />
@@ -394,6 +395,22 @@
     <Compile Include="System.ServiceModel\UriSchemeKeyedCollection.cs" />
     <Compile Include="System.ServiceModel\XmlSerializerFormatAttribute.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
+    <Compile Include="Dummy_2_1.cs" />
+    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
+    <Compile Include="Dummy_2_1.cs" />
+    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+    <Compile Include="Dummy_2_1.cs" />
+    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+    <Compile Include="Dummy_2_1.cs" />
+    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
+  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Channels\UriGenerator.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\DiagnosticUtility.cs" />
@@ -441,13 +458,12 @@
     <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\Syndication\XmlUriData.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ServiceModel.Syndication\src\System\ServiceModel\XmlBuffer.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include="..\referencesource\System.ServiceModel\System\ServiceModel\Description\UseRequestHeadersForMetadataAddressBehavior.cs" />
     <Compile Include="..\System.ServiceModel.Web\System\UriTemplate.cs" />
     <Compile Include="..\System.ServiceModel.Web\System\UriTemplateEquivalenceComparer.cs" />
     <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatch.cs" />
     <Compile Include="..\System.ServiceModel.Web\System\UriTemplateMatchException.cs" />
     <Compile Include="..\System.ServiceModel.Web\System\UriTemplateTable.cs" />
-    <Compile Include="corefx\SR.cs" />
+    <Compile Include="..\referencesource\System.ServiceModel\System\ServiceModel\Description\UseRequestHeadersForMetadataAddressBehavior.cs" />
     <Compile Include="Mono.Security.Cryptography\MD5SHA1.cs" />
     <Compile Include="Mono.Security.Cryptography\TlsHMAC.cs" />
     <Compile Include="Mono.Security.Protocol.Ntlm\BitConverterLE.cs" />
@@ -499,9 +515,9 @@
     <Compile Include="Mono.Security.Protocol.Tls\HandshakeState.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\HashAlgorithmType.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\HttpsClientStream.cs" />
-    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureDeformatter.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\RSASslSignatureFormatter.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\RecordProtocol.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\SecurityCompressionType.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\SecurityParameters.cs" />
     <Compile Include="Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />
@@ -569,12 +585,12 @@
     <Compile Include="System.ServiceModel.Channels\HostedTransportConfiguration.cs" />
     <Compile Include="System.ServiceModel.Channels\IBindingMulticastCapabilities.cs" />
     <Compile Include="System.ServiceModel.Channels\IChannelListener.cs" />
-    <Compile Include="System.ServiceModel.Channels\InputChannelBase.cs" />
-    <Compile Include="System.ServiceModel.Channels\InvalidChannelBindingException.cs" />
     <Compile Include="System.ServiceModel.Channels\IReplyChannel.cs" />
     <Compile Include="System.ServiceModel.Channels\IReplySessionChannel.cs" />
     <Compile Include="System.ServiceModel.Channels\ITransactedBindingElement.cs" />
     <Compile Include="System.ServiceModel.Channels\ITransportTokenAssertionProvider.cs" />
+    <Compile Include="System.ServiceModel.Channels\InputChannelBase.cs" />
+    <Compile Include="System.ServiceModel.Channels\InvalidChannelBindingException.cs" />
     <Compile Include="System.ServiceModel.Channels\LayeredReplyChannel.cs" />
     <Compile Include="System.ServiceModel.Channels\MessageBuffer.cs" />
     <Compile Include="System.ServiceModel.Channels\MessageEncodingBindingElementImporter.cs" />
@@ -644,9 +660,9 @@
     <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\BasicHttpBindingElement_4_5.cs" />
     <Compile Include="System.ServiceModel.Configuration\BasicHttpMessageSecurityElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\BasicHttpSecurityElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\BasicHttpsBindingCollectionElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\BasicHttpsBindingElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\BasicHttpSecurityElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\BasicHttpsSecurityElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\BehaviorExtensionElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\BehaviorsSection.cs" />
@@ -671,14 +687,14 @@
     <Compile Include="System.ServiceModel.Configuration\ComContractsSection.cs" />
     <Compile Include="System.ServiceModel.Configuration\ComMethodElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ComMethodElementCollection.cs" />
-    <Compile Include="System.ServiceModel.Configuration\CommonBehaviorsSection.cs" />
-    <Compile Include="System.ServiceModel.Configuration\CommonEndpointBehaviorElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\CommonServiceBehaviorElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ComPersistableTypeElementCollection.cs" />
-    <Compile Include="System.ServiceModel.Configuration\CompositeDuplexElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ComUdtElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ComUdtElementCollection.cs" />
+    <Compile Include="System.ServiceModel.Configuration\CommonBehaviorsSection.cs" />
+    <Compile Include="System.ServiceModel.Configuration\CommonEndpointBehaviorElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\CommonServiceBehaviorElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\CompositeDuplexElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ConfigUtil.cs" />
     <Compile Include="System.ServiceModel.Configuration\ConnectionOrientedTransportElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\CustomBindingCollectionElement.cs" />
@@ -688,11 +704,11 @@
     <Compile Include="System.ServiceModel.Configuration\DiagnosticSection.cs" />
     <Compile Include="System.ServiceModel.Configuration\DnsElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\EncodingConverter.cs" />
+    <Compile Include="System.ServiceModel.Configuration\EndToEndTracingElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\EndpointAddressElementBase.cs" />
     <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\EndpointBehaviorElementCollection.cs" />
     <Compile Include="System.ServiceModel.Configuration\EndpointCollectionElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\EndToEndTracingElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ExtensionElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ExtensionElementCollection.cs" />
     <Compile Include="System.ServiceModel.Configuration\ExtensionsSection.cs" />
@@ -701,12 +717,12 @@
     <Compile Include="System.ServiceModel.Configuration\HostTimeoutsElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\HttpBindingBaseElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\HttpDigestClientElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\HttpsTransportElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\HttpTransportElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\HttpTransportSecurityElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\HttpsTransportElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\IBindingConfigurationElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\IdentityElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\IPAddressConverter.cs" />
+    <Compile Include="System.ServiceModel.Configuration\IdentityElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientBehaviorsElementCollection.cs" />
     <Compile Include="System.ServiceModel.Configuration\IssuedTokenClientElement.cs" />
@@ -800,9 +816,9 @@
     <Compile Include="System.ServiceModel.Configuration\ServiceModelSectionGroup.cs" />
     <Compile Include="System.ServiceModel.Configuration\ServicePrincipalNameElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ServiceSecurityAuditElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\ServicesSection.cs" />
     <Compile Include="System.ServiceModel.Configuration\ServiceThrottlingElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\ServiceTimeoutsElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\ServicesSection.cs" />
     <Compile Include="System.ServiceModel.Configuration\SslStreamSecurityElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\StandardBindingCollectionElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\StandardBindingElement.cs" />
@@ -827,15 +843,10 @@
     <Compile Include="System.ServiceModel.Configuration\UseManagedPresentationElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\UserNameServiceElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\UserPrincipalNameElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WindowsClientElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WindowsServiceElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WindowsStreamSecurityElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingCollectionElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\WS2007FederationHttpBindingElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingCollectionElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\WS2007HttpBindingElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElementCollection.cs" />
     <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingCollectionElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\WSDualHttpBindingElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\WSDualHttpSecurityElement.cs" />
@@ -847,6 +858,11 @@
     <Compile Include="System.ServiceModel.Configuration\WSHttpBindingElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\WSHttpSecurityElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\WSHttpTransportSecurityElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WindowsClientElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WindowsServiceElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WindowsStreamSecurityElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\WsdlImporterElementCollection.cs" />
     <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\X509CertificateTrustedIssuerElementCollection.cs" />
     <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateAuthenticationElement.cs" />
@@ -861,12 +877,12 @@
     <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElementCollection.cs" />
     <Compile Include="System.ServiceModel.Configuration\X509ServiceCertificateAuthenticationElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\XmlDictionaryReaderQuotasElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\XmlElementElementCollection.cs" />
     <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElement.cs" />
     <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementCollection.cs" />
     <Compile Include="System.ServiceModel.Configuration\XPathMessageFilterElementComparer.cs" />
+    <Compile Include="System.ServiceModel.Configuration\XmlDictionaryReaderQuotasElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\XmlElementElement.cs" />
+    <Compile Include="System.ServiceModel.Configuration\XmlElementElementCollection.cs" />
     <Compile Include="System.ServiceModel.Description\CallbackDebugBehavior.cs" />
     <Compile Include="System.ServiceModel.Description\CallbackTimeoutsBehavior.cs" />
     <Compile Include="System.ServiceModel.Description\ClientViaBehavior.cs" />
@@ -875,12 +891,12 @@
     <Compile Include="System.ServiceModel.Description\IContractBehaviorAttribute.cs" />
     <Compile Include="System.ServiceModel.Description\IMetadataExchange.cs" />
     <Compile Include="System.ServiceModel.Description\IOperationContractGenerationExtension.cs" />
-    <Compile Include="System.ServiceModel.Description\IpolicyExporter.cs" />
     <Compile Include="System.ServiceModel.Description\IPolicyImporter.cs" />
     <Compile Include="System.ServiceModel.Description\IServiceBehavior.cs" />
     <Compile Include="System.ServiceModel.Description\IServiceContractGenerationExtension.cs" />
     <Compile Include="System.ServiceModel.Description\IWsdlExporter.cs" />
     <Compile Include="System.ServiceModel.Description\IWsdlImporter.cs" />
+    <Compile Include="System.ServiceModel.Description\IpolicyExporter.cs" />
     <Compile Include="System.ServiceModel.Description\LocalServiceSecuritySettings.cs" />
     <Compile Include="System.ServiceModel.Description\MetadataConversionError.cs" />
     <Compile Include="System.ServiceModel.Description\MetadataExchangeBindings.cs" />
@@ -914,12 +930,12 @@
     <Compile Include="System.ServiceModel.Description\SynchronousReceiveBehavior.cs" />
     <Compile Include="System.ServiceModel.Description\TransactedBatchingBehavior.cs" />
     <Compile Include="System.ServiceModel.Description\TypedMessageConverter.cs" />
+    <Compile Include="System.ServiceModel.Description\WSTrustMessageConverters.cs" />
+    <Compile Include="System.ServiceModel.Description\WSTrustSTSContract.cs" />
     <Compile Include="System.ServiceModel.Description\WsdlContractConversionContext.cs" />
     <Compile Include="System.ServiceModel.Description\WsdlEndpointConversionContext.cs" />
     <Compile Include="System.ServiceModel.Description\WsdlExporter.cs" />
     <Compile Include="System.ServiceModel.Description\WsdlImporter.cs" />
-    <Compile Include="System.ServiceModel.Description\WSTrustMessageConverters.cs" />
-    <Compile Include="System.ServiceModel.Description\WSTrustSTSContract.cs" />
     <Compile Include="System.ServiceModel.Description\XmlSerializerMessageContractImporter.cs" />
     <Compile Include="System.ServiceModel.Diagnostics\PerformanceCounterScope.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilter.cs" />
@@ -950,12 +966,12 @@
     <Compile Include="System.ServiceModel.Dispatcher\IInstanceContextProvider.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\IInstanceProvider.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\IMessageFilterTable.cs" />
+    <Compile Include="System.ServiceModel.Dispatcher\IOperationInvoker.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\InitializingHandler.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\InputOrReplyRequestProcessor.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\InstanceContextIdleCallback.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\InstanceManager.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\InvalidBodyAccessException.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\IOperationInvoker.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\MatchAllMessageFilter.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\MatchNoneMessageFilter.cs" />
     <Compile Include="System.ServiceModel.Dispatcher\MessageFilter.cs" />
@@ -1007,8 +1023,8 @@
     <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenProvider.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\DerivedKeySecurityToken.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\IIssuanceSecurityTokenAuthenticator.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\InitiatorServiceModelSecurityTokenRequirement.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\ISecurityContextSecurityTokenCache.cs" />
+    <Compile Include="System.ServiceModel.Security.Tokens\InitiatorServiceModelSecurityTokenRequirement.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenHandler.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenParameters.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenProvider.cs" />
@@ -1026,10 +1042,10 @@
     <Compile Include="System.ServiceModel.Security.Tokens\ServiceModelSecurityTokenTypes.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenAuthenticator.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\SpnegoSecurityTokenProvider.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\SslnegoCookieResolver.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenAuthenticator.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenParameters.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\SslSecurityTokenProvider.cs" />
+    <Compile Include="System.ServiceModel.Security.Tokens\SslnegoCookieResolver.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\SspiClientSecurityTokenAuthenticator.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityToken.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\SspiSecurityTokenParameters.cs" />
@@ -1039,11 +1055,11 @@
     <Compile Include="System.ServiceModel.Security.Tokens\X509SecurityTokenParameters.cs" />
     <Compile Include="System.ServiceModel.Security\DataProtectionSecurityStateEncoder.cs" />
     <Compile Include="System.ServiceModel.Security\ExpiredSecurityTokenException.cs" />
-    <Compile Include="System.ServiceModel.Security\IdentityVerifier.cs" />
     <Compile Include="System.ServiceModel.Security\IEndpointIdentityProvider.cs" />
-    <Compile Include="System.ServiceModel.Security\InfocardInteractiveChannelInitializer.cs" />
     <Compile Include="System.ServiceModel.Security\ISecureConversationSession.cs" />
     <Compile Include="System.ServiceModel.Security\ISecuritySession.cs" />
+    <Compile Include="System.ServiceModel.Security\IdentityVerifier.cs" />
+    <Compile Include="System.ServiceModel.Security\InfocardInteractiveChannelInitializer.cs" />
     <Compile Include="System.ServiceModel.Security\IssuedTokenClientCredential.cs" />
     <Compile Include="System.ServiceModel.Security\IssuedTokenServiceCredential.cs" />
     <Compile Include="System.ServiceModel.Security\KeyEntropyMode.cs" />
@@ -1061,8 +1077,8 @@
     <Compile Include="System.ServiceModel.Security\SupportingTokenSpecification.cs" />
     <Compile Include="System.ServiceModel.Security\UnionSecurityTokenResolver.cs" />
     <Compile Include="System.ServiceModel.Security\UserNamePasswordServiceCredential.cs" />
-    <Compile Include="System.ServiceModel.Security\WindowsServiceCredential.cs" />
     <Compile Include="System.ServiceModel.Security\WSSecurityTokenSerializer.cs" />
+    <Compile Include="System.ServiceModel.Security\WindowsServiceCredential.cs" />
     <Compile Include="System.ServiceModel.Security\X509CertificateInitiatorServiceCredential.cs" />
     <Compile Include="System.ServiceModel.Security\X509CertificateRecipientServiceCredential.cs" />
     <Compile Include="System.ServiceModel.Security\X509ClientCertificateAuthentication.cs" />
@@ -1077,9 +1093,9 @@
     <Compile Include="System.ServiceModel\EndpointAddressAugust2004.cs" />
     <Compile Include="System.ServiceModel\EndpointIdentity.cs" />
     <Compile Include="System.ServiceModel\FederatedMessageSecurityOverHttp.cs" />
-    <Compile Include="System.ServiceModel\InstanceContext.cs" />
     <Compile Include="System.ServiceModel\IOnlineStatus.cs" />
     <Compile Include="System.ServiceModel\IServiceChannel.cs" />
+    <Compile Include="System.ServiceModel\InstanceContext.cs" />
     <Compile Include="System.ServiceModel\MessageSecurityOverHttp.cs" />
     <Compile Include="System.ServiceModel\MessageSecurityOverMsmq.cs" />
     <Compile Include="System.ServiceModel\MsmqBindingBase.cs" />
@@ -1123,28 +1139,17 @@
     <Compile Include="System.ServiceModel\WSHttpBindingBase.cs" />
     <Compile Include="System.ServiceModel\WSHttpSecurity.cs" />
     <Compile Include="System.ServiceModel\X509CertificateEndpointIdentity.cs" />
+    <Compile Include="corefx\SR.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
-    <Compile Include="Dummy_2_1.cs" />
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
-    <Compile Include="Dummy_2_1.cs" />
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="Dummy_2_1.cs" />
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
     <Compile Include="Dummy_2_1.cs" />
     <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
     <Compile Include="Dummy_2_1.cs" />
     <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="Dummy_2_1.cs" />
     <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
   </ItemGroup>
@@ -1156,75 +1161,6 @@
     <Compile Include="Dummy_2_1.cs" />
     <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
-    <Compile Include="corefx\SR.cs" />
-    <Compile Include="Dummy_2_1.cs" />
-    <Compile Include="Dummy_XM_4_5.cs" />
-    <Compile Include="System.ServiceModel.Channels\IChannelListener.cs" />
-    <Compile Include="System.ServiceModel.Channels\IReplyChannel.cs" />
-    <Compile Include="System.ServiceModel.Channels\IReplySessionChannel.cs" />
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
-    <Compile Include="System.ServiceModel.Configuration\CertificateElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\CertificateReferenceElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\ConfigUtil.cs" />
-    <Compile Include="System.ServiceModel.Configuration\DnsElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\IdentityElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\RsaElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\ServicePrincipalNameElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\UserPrincipalNameElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\X509ClientCertificateCredentialsElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\X509DefaultServiceCertificateElement.cs" />
-    <Compile Include="System.ServiceModel.Configuration\X509ScopedServiceCertificateElement.cs" />
-    <Compile Include="System.ServiceModel.Description\MetadataLocation.cs" />
-    <Compile Include="System.ServiceModel.Description\MetadataReference.cs" />
-    <Compile Include="System.ServiceModel.Description\MetadataSection.cs" />
-    <Compile Include="System.ServiceModel.Description\MetadataSectionSerializerBase.cs" />
-    <Compile Include="System.ServiceModel.Description\MetadataSet.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilter.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\ActionMessageFilterTable.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\ICallContextInitializer.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\IErrorHandler.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\IMessageFilterTable.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\IOperationInvoker.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\MatchAllMessageFilter.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\MatchNoneMessageFilter.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilter.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\MessageFilterTable.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\MultipleMessageFilterMatchesException.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\SeekableXPathNavigator.cs" />
-    <Compile Include="System.ServiceModel.Dispatcher\XPathMessageFilter.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\SecurityContextSecurityToken.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\SslnegoCookieResolver.cs" />
-    <Compile Include="System.ServiceModel.Security\IdentityVerifier.cs" />
-    <Compile Include="System.ServiceModel.Security\IssuedTokenClientCredential.cs" />
-    <Compile Include="System.ServiceModel.Security\KeyEntropyMode.cs" />
-    <Compile Include="System.ServiceModel.Security\PeerCredential.cs" />
-    <Compile Include="System.ServiceModel.Security\SecurityAlgorithmSuite.cs" />
-    <Compile Include="System.ServiceModel.Security\SecurityMessageProperty.cs" />
-    <Compile Include="System.ServiceModel.Security\SecurityStateEncoder.cs" />
-    <Compile Include="System.ServiceModel.Security\SecurityTokenAttachmentMode.cs" />
-    <Compile Include="System.ServiceModel.Security\SecurityTokenSpecification.cs" />
-    <Compile Include="System.ServiceModel.Security\SupportingTokenSpecification.cs" />
-    <Compile Include="System.ServiceModel.Security\X509PeerCertificateAuthentication.cs" />
-    <Compile Include="System.ServiceModel\EndpointAddressAugust2004.cs" />
-    <Compile Include="System.ServiceModel\EndpointIdentity.cs" />
-    <Compile Include="System.ServiceModel\OperationBehaviorAttribute.cs" />
-    <Compile Include="System.ServiceModel\RsaEndpointIdentity.cs" />
-    <Compile Include="System.ServiceModel\ServiceSecurityContext.cs" />
-    <Compile Include="System.ServiceModel\X509CertificateEndpointIdentity.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
-    <Compile Include="Dummy_2_1.cs" />
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
-    <Compile Include="Dummy_2_1.cs" />
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
-    <Compile Include="Dummy_2_1.cs" />
-    <Compile Include="System.ServiceModel.Channels\MessageBuffer_2_1.cs" />
-  </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj
index 0a957cb80df..6337bdb9317 100644
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -74,6 +74,7 @@
     <Compile Include="System.ServiceProcess\UnixServiceController.cs" />
     <Compile Include="System.ServiceProcess\Win32ServiceController.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj
index d146b7e38a8..002001fbe38 100644
--- a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj
+++ b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Base\DataflowBlock.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Base\DataflowBlockOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Base\DataflowLinkOptions.cs" />
@@ -70,8 +70,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Internal\DataflowEtwProvider.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Internal\EnumerableDebugView.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Internal\IDebuggerDisplay.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Internal\ImmutableArray.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Internal\IProducerConsumerCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Internal\ImmutableArray.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Internal\Padding.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Internal\ProducerConsumerQueues.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Threading.Tasks.Dataflow\src\Internal\QueuedMap.cs" />
@@ -88,6 +88,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="corefx\SR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Transactions/System.Transactions.csproj b/mcs/class/System.Transactions/System.Transactions.csproj
index ec7065ba874..739f8752a2d 100644
--- a/mcs/class/System.Transactions/System.Transactions.csproj
+++ b/mcs/class/System.Transactions/System.Transactions.csproj
@@ -103,6 +103,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
@@ -123,8 +124,8 @@
     <Compile Include="System.Transactions\IPromotableSinglePhaseNotification.cs" />
     <Compile Include="System.Transactions\ISimpleTransactionSuperior.cs" />
     <Compile Include="System.Transactions\ISinglePhaseNotification.cs" />
-    <Compile Include="System.Transactions\IsolationLevel.cs" />
     <Compile Include="System.Transactions\ITransactionPromoter.cs" />
+    <Compile Include="System.Transactions\IsolationLevel.cs" />
     <Compile Include="System.Transactions\PreparingEnlistment.cs" />
     <Compile Include="System.Transactions\SinglePhaseEnlistment.cs" />
     <Compile Include="System.Transactions\SubordinateTransaction.cs" />
@@ -144,6 +145,7 @@
     <Compile Include="System.Transactions\TransactionScopeOption.cs" />
     <Compile Include="System.Transactions\TransactionStatus.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj
index e6e2dace425..5ec63a46460 100644
--- a/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj
+++ b/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj
@@ -43,11 +43,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
index 5b7c72e5408..055d6f82bd3 100644
--- a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
+++ b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\referencesource\System.Web.ApplicationServices\Configuration\MembershipPasswordCompatibilityMode.cs" />
@@ -66,6 +66,7 @@
     <Compile Include="System.Web.UI\KeyedList.cs" />
     <Compile Include="System.Web.UI\KeyedListEnumerator.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj
index c10c60b1f94..c56c237180a 100644
--- a/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj
+++ b/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -52,11 +52,11 @@
     <Compile Include="System.Web.DynamicData.ModelProviders\AssociationDirection.cs" />
     <Compile Include="System.Web.DynamicData.ModelProviders\AssociationProvider.cs" />
     <Compile Include="System.Web.DynamicData.ModelProviders\ColumnProvider.cs" />
-    <Compile Include="System.Web.DynamicData.ModelProviders\DataModelProvider.cs" />
     <Compile Include="System.Web.DynamicData.ModelProviders\DLinqAssociationProvider.cs" />
     <Compile Include="System.Web.DynamicData.ModelProviders\DLinqColumnProvider.cs" />
     <Compile Include="System.Web.DynamicData.ModelProviders\DLinqDataModelProvider.cs" />
     <Compile Include="System.Web.DynamicData.ModelProviders\DLinqTableProvider.cs" />
+    <Compile Include="System.Web.DynamicData.ModelProviders\DataModelProvider.cs" />
     <Compile Include="System.Web.DynamicData.ModelProviders\TableProvider.cs" />
     <Compile Include="System.Web.DynamicData\ContextConfiguration.cs" />
     <Compile Include="System.Web.DynamicData\DynamicControl.cs" />
@@ -86,6 +86,7 @@
     <Compile Include="System.Web.DynamicData\PageAction.cs" />
     <Compile Include="System.Web.DynamicData\TableNameAttribute.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj
index 416fcfd224d..33cf253d25d 100644
--- a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj
+++ b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -62,6 +62,7 @@
     <Compile Include="System.Web.Extensions.Design\UpdateProgressAssociatedUpdatePanelIDConverter.cs" />
     <Compile Include="System.Web.Extensions.Design\UpdateProgressDesigner.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj
index 94bde1d2427..9cc0d227055 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj
+++ b/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\System.Web\System.Web.Configuration_2.0\MachineKeyRegistryStorage.cs" />
     <Compile Include="..\System.Web\System.Web.Handlers\AssemblyResourceLoader.cs" />
     <Compile Include="..\System.Web\System.Web.Util\MachineKeySectionUtils.cs" />
@@ -79,12 +79,12 @@
     <Compile Include="System.Web.Handlers\ScriptResourceHandler.cs" />
     <Compile Include="System.Web.Query.Dynamic\DynamicClass.cs" />
     <Compile Include="System.Web.Query.Dynamic\ParseException.cs" />
+    <Compile Include="System.Web.Script.Serialization\JSON\JavaScriptUtils.cs" />
+    <Compile Include="System.Web.Script.Serialization\JSON\ReflectionUtils.cs" />
     <Compile Include="System.Web.Script.Serialization\JavaScriptConverter.cs" />
     <Compile Include="System.Web.Script.Serialization\JavaScriptSerializer.cs" />
     <Compile Include="System.Web.Script.Serialization\JavaScriptTypeResolver.cs" />
     <Compile Include="System.Web.Script.Serialization\Json.cs" />
-    <Compile Include="System.Web.Script.Serialization\JSON\JavaScriptUtils.cs" />
-    <Compile Include="System.Web.Script.Serialization\JSON\ReflectionUtils.cs" />
     <Compile Include="System.Web.Script.Serialization\JsonDeserializer.cs" />
     <Compile Include="System.Web.Script.Serialization\JsonSerializer.cs" />
     <Compile Include="System.Web.Script.Serialization\ScriptIgnoreAttribute.cs" />
@@ -108,8 +108,8 @@
     <Compile Include="System.Web.UI.WebControls\DataPagerFieldCommandEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\DataPagerFieldItem.cs" />
     <Compile Include="System.Web.UI.WebControls\HelperExtensions.cs" />
-    <Compile Include="System.Web.UI.WebControls\InsertItemPosition.cs" />
     <Compile Include="System.Web.UI.WebControls\IPageableItemContainer.cs" />
+    <Compile Include="System.Web.UI.WebControls\InsertItemPosition.cs" />
     <Compile Include="System.Web.UI.WebControls\LinqDataSource.cs" />
     <Compile Include="System.Web.UI.WebControls\LinqDataSourceContextEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\LinqDataSourceDeleteEventArgs.cs" />
@@ -126,11 +126,11 @@
     <Compile Include="System.Web.UI.WebControls\ListViewCommandEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewContainer.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewDataItem.cs" />
-    <Compile Include="System.Web.UI.WebControls\ListViewDeletedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewDeleteEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\ListViewDeletedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewEditEventArgs.cs" />
-    <Compile Include="System.Web.UI.WebControls\ListViewInsertedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewInsertEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\ListViewInsertedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewItem.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewItemEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewItemType.cs" />
@@ -139,8 +139,8 @@
     <Compile Include="System.Web.UI.WebControls\ListViewSortEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewTableCell.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewTableRow.cs" />
-    <Compile Include="System.Web.UI.WebControls\ListViewUpdatedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\ListViewUpdateEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\ListViewUpdatedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\NextPreviousPagerField.cs" />
     <Compile Include="System.Web.UI.WebControls\NumericPagerField.cs" />
     <Compile Include="System.Web.UI.WebControls\PageEventArgs.cs" />
@@ -188,6 +188,7 @@
     <Compile Include="System.Web.UI\UpdatePanelUpdateMode.cs" />
     <Compile Include="System.Web.UI\UpdateProgress.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost.csproj b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost.csproj
index 02916c9762a..084620685e3 100644
--- a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost.csproj
+++ b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost.csproj
@@ -44,15 +44,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
+    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\CommonWebApiResources.Designer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\DictionaryExtensions.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\Error.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\HttpMethodHelper.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpers.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpersExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpBinding.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpBindingSecurity.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Channels\HttpBindingSecurityMode.cs" />
@@ -70,8 +70,8 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\Properties\SRResources.Designer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\AsyncResult.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\BufferedOutputStream.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\BufferManagerOutputStream.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\BufferedOutputStream.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\ChannelAcceptor.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\ChannelBindingUtility.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\Channels\CompletedAsyncResult.cs" />
@@ -88,6 +88,7 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.SelfHost\ServiceModel\TransferModeHelper.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost.csproj b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost.csproj
index 4331be3c35e..89c9213b1b7 100644
--- a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost.csproj
+++ b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost.csproj
@@ -44,15 +44,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
+    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\CommonWebApiResources.Designer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\DictionaryExtensions.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\Error.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\HttpMethodHelper.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpers.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpersExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\GlobalConfiguration.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\GlobalSuppressions.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\HttpControllerHandler.cs" />
@@ -76,6 +76,7 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http.WebHost\WebHostHttpControllerTypeResolver.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Http/System.Web.Http.csproj b/mcs/class/System.Web.Http/System.Web.Http.csproj
index 38e732b7b16..018cbfd0d92 100644
--- a/mcs/class/System.Web.Http/System.Web.Http.csproj
+++ b/mcs/class/System.Web.Http/System.Web.Http.csproj
@@ -44,9 +44,10 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\aspnetwebstack\src\AptcaCommonAssemblyInfo.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\CommonWebApiResources.Designer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\DictionaryExtensions.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\Error.cs" />
@@ -54,7 +55,6 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\PrefixContainer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpers.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\Common\TaskHelpersExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\AcceptVerbsAttribute.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ActionNameAttribute.cs" />
@@ -188,8 +188,8 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\CustomModelBinderAttribute.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\DefaultActionValueBinder.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\ErrorParameterBinding.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\FormatterParameterBinding.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\FormDataCollectionExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\FormatterParameterBinding.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\HttpBindingBehavior.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\HttpBindingBehaviorAttribute.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ModelBinding\HttpRequestParameterBinding.cs" />
@@ -241,8 +241,8 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\PathSubsegment.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\UriPathExtensionMapping.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Routing\UrlHelper.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Services\DefaultServices.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ServicesExtensions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Services\DefaultServices.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\FormattingUtilities.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\IFormatterTracer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\ITraceManager.cs" />
@@ -263,8 +263,8 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\ExceptionFilterAttributeTracer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\ExceptionFilterTracer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\FilterTracer.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\FormatterParameterBindingTracer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\FormUrlEncodedMediaTypeFormatterTracer.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\FormatterParameterBindingTracer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpActionBindingTracer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpActionDescriptorTracer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\Tracing\Tracers\HttpActionInvokerTracer.cs" />
@@ -311,6 +311,7 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\ValueProviderFactory.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Http\ValueProviders\ValueProviderResult.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj b/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj
index 2be653f8dc8..d75fa631fff 100644
--- a/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj
+++ b/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj
@@ -44,11 +44,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj
index 0f1281554d2..12a51fa0fbd 100644
--- a/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj
+++ b/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="GlobalAssemblyInfo.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Mvc\AcceptVerbsAttribute.cs" />
@@ -62,18 +62,20 @@
     <Compile Include="Mvc\ActionResult.cs" />
     <Compile Include="Mvc\ActionSelector.cs" />
     <Compile Include="Mvc\AdditionalMetaDataAttribute.cs" />
-    <Compile Include="Mvc\Ajax\AjaxExtensions.cs" />
-    <Compile Include="Mvc\Ajax\AjaxOptions.cs" />
-    <Compile Include="Mvc\Ajax\InsertionMode.cs" />
     <Compile Include="Mvc\AjaxHelper.cs" />
     <Compile Include="Mvc\AjaxHelper`1.cs" />
     <Compile Include="Mvc\AjaxRequestExtensions.cs" />
+    <Compile Include="Mvc\Ajax\AjaxExtensions.cs" />
+    <Compile Include="Mvc\Ajax\AjaxOptions.cs" />
+    <Compile Include="Mvc\Ajax\InsertionMode.cs" />
     <Compile Include="Mvc\AllowHtmlAttribute.cs" />
     <Compile Include="Mvc\AreaHelpers.cs" />
     <Compile Include="Mvc\AreaRegistration.cs" />
     <Compile Include="Mvc\AreaRegistrationContext.cs" />
     <Compile Include="Mvc\AssociatedMetadataProvider.cs" />
     <Compile Include="Mvc\AssociatedValidatorProvider.cs" />
+    <Compile Include="Mvc\AsyncController.cs" />
+    <Compile Include="Mvc\AsyncTimeoutAttribute.cs" />
     <Compile Include="Mvc\Async\ActionDescriptorCreator.cs" />
     <Compile Include="Mvc\Async\AsyncActionDescriptor.cs" />
     <Compile Include="Mvc\Async\AsyncActionMethodSelector.cs" />
@@ -97,8 +99,6 @@
     <Compile Include="Mvc\Async\SynchronousOperationException.cs" />
     <Compile Include="Mvc\Async\Trigger.cs" />
     <Compile Include="Mvc\Async\TriggerListener.cs" />
-    <Compile Include="Mvc\AsyncController.cs" />
-    <Compile Include="Mvc\AsyncTimeoutAttribute.cs" />
     <Compile Include="Mvc\AuthorizationContext.cs" />
     <Compile Include="Mvc\AuthorizeAttribute.cs" />
     <Compile Include="Mvc\BindAttribute.cs" />
@@ -125,8 +125,8 @@
     <Compile Include="Mvc\DataAnnotationsModelMetadata.cs" />
     <Compile Include="Mvc\DataAnnotationsModelMetadataProvider.cs" />
     <Compile Include="Mvc\DataAnnotationsModelValidator.cs" />
-    <Compile Include="Mvc\DataAnnotationsModelValidator`1.cs" />
     <Compile Include="Mvc\DataAnnotationsModelValidatorProvider.cs" />
+    <Compile Include="Mvc\DataAnnotationsModelValidator`1.cs" />
     <Compile Include="Mvc\DataErrorInfoModelValidatorProvider.cs" />
     <Compile Include="Mvc\DataTypeUtil.cs" />
     <Compile Include="Mvc\DefaultControllerFactory.cs" />
@@ -184,6 +184,8 @@
     <Compile Include="Mvc\HandleErrorAttribute.cs" />
     <Compile Include="Mvc\HandleErrorInfo.cs" />
     <Compile Include="Mvc\HiddenInputAttribute.cs" />
+    <Compile Include="Mvc\HtmlHelper.cs" />
+    <Compile Include="Mvc\HtmlHelper`1.cs" />
     <Compile Include="Mvc\Html\ChildActionExtensions.cs" />
     <Compile Include="Mvc\Html\DefaultDisplayTemplates.cs" />
     <Compile Include="Mvc\Html\DefaultEditorTemplates.cs" />
@@ -201,8 +203,6 @@
     <Compile Include="Mvc\Html\TemplateHelpers.cs" />
     <Compile Include="Mvc\Html\TextAreaExtensions.cs" />
     <Compile Include="Mvc\Html\ValidationExtensions.cs" />
-    <Compile Include="Mvc\HtmlHelper.cs" />
-    <Compile Include="Mvc\HtmlHelper`1.cs" />
     <Compile Include="Mvc\HttpDeleteAttribute.cs" />
     <Compile Include="Mvc\HttpFileCollectionValueProvider.cs" />
     <Compile Include="Mvc\HttpFileCollectionValueProviderFactory.cs" />
@@ -232,7 +232,6 @@
     <Compile Include="Mvc\IModelBinderProvider.cs" />
     <Compile Include="Mvc\IMvcControlBuilder.cs" />
     <Compile Include="Mvc\IMvcFilter.cs" />
-    <Compile Include="Mvc\InputType.cs" />
     <Compile Include="Mvc\IResolver.cs" />
     <Compile Include="Mvc\IResultFilter.cs" />
     <Compile Include="Mvc\IRouteWithArea.cs" />
@@ -247,6 +246,7 @@
     <Compile Include="Mvc\IViewLocationCache.cs" />
     <Compile Include="Mvc\IViewPageActivator.cs" />
     <Compile Include="Mvc\IViewStartPageChild.cs" />
+    <Compile Include="Mvc\InputType.cs" />
     <Compile Include="Mvc\JavaScriptResult.cs" />
     <Compile Include="Mvc\JsonRequestBehavior.cs" />
     <Compile Include="Mvc\JsonResult.cs" />
@@ -300,14 +300,14 @@
     <Compile Include="Mvc\QueryStringValueProvider.cs" />
     <Compile Include="Mvc\QueryStringValueProviderFactory.cs" />
     <Compile Include="Mvc\RangeAttributeAdapter.cs" />
+    <Compile Include="Mvc\RazorView.cs" />
+    <Compile Include="Mvc\RazorViewEngine.cs" />
     <Compile Include="Mvc\Razor\MvcCSharpRazorCodeGenerator.cs" />
     <Compile Include="Mvc\Razor\MvcCSharpRazorCodeParser.cs" />
     <Compile Include="Mvc\Razor\MvcVBRazorCodeParser.cs" />
     <Compile Include="Mvc\Razor\MvcWebPageRazorHost.cs" />
     <Compile Include="Mvc\Razor\SetModelTypeCodeGenerator.cs" />
     <Compile Include="Mvc\Razor\StartPageLookupDelegate.cs" />
-    <Compile Include="Mvc\RazorView.cs" />
-    <Compile Include="Mvc\RazorViewEngine.cs" />
     <Compile Include="Mvc\ReaderWriterCache`2.cs" />
     <Compile Include="Mvc\RedirectResult.cs" />
     <Compile Include="Mvc\RedirectToRouteResult.cs" />
@@ -318,8 +318,8 @@
     <Compile Include="Mvc\ReflectedParameterDescriptor.cs" />
     <Compile Include="Mvc\RegularExpressionAttributeAdapter.cs" />
     <Compile Include="Mvc\RemoteAttribute.cs" />
-    <Compile Include="Mvc\RequiredAttributeAdapter.cs" />
     <Compile Include="Mvc\RequireHttpsAttribute.cs" />
+    <Compile Include="Mvc\RequiredAttributeAdapter.cs" />
     <Compile Include="Mvc\Resources\MvcResources.Designer.cs" />
     <Compile Include="Mvc\ResultExecutedContext.cs" />
     <Compile Include="Mvc\ResultExecutingContext.cs" />
@@ -365,11 +365,11 @@
     <Compile Include="Mvc\ViewEngineResult.cs" />
     <Compile Include="Mvc\ViewEngines.cs" />
     <Compile Include="Mvc\ViewMasterPage.cs" />
-    <Compile Include="Mvc\ViewMasterPage`1.cs" />
     <Compile Include="Mvc\ViewMasterPageControlBuilder.cs" />
+    <Compile Include="Mvc\ViewMasterPage`1.cs" />
     <Compile Include="Mvc\ViewPage.cs" />
-    <Compile Include="Mvc\ViewPage`1.cs" />
     <Compile Include="Mvc\ViewPageControlBuilder.cs" />
+    <Compile Include="Mvc\ViewPage`1.cs" />
     <Compile Include="Mvc\ViewResult.cs" />
     <Compile Include="Mvc\ViewResultBase.cs" />
     <Compile Include="Mvc\ViewStartPage.cs" />
@@ -379,8 +379,8 @@
     <Compile Include="Mvc\ViewTypeControlBuilder.cs" />
     <Compile Include="Mvc\ViewTypeParserFilter.cs" />
     <Compile Include="Mvc\ViewUserControl.cs" />
-    <Compile Include="Mvc\ViewUserControl`1.cs" />
     <Compile Include="Mvc\ViewUserControlControlBuilder.cs" />
+    <Compile Include="Mvc\ViewUserControl`1.cs" />
     <Compile Include="Mvc\VirtualPathProviderViewEngine.cs" />
     <Compile Include="Mvc\WebFormView.cs" />
     <Compile Include="Mvc\WebFormViewEngine.cs" />
@@ -388,6 +388,7 @@
     <Compile Include="Mvc\WebViewPage`1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Razor/System.Web.Razor.csproj b/mcs/class/System.Web.Razor/System.Web.Razor.csproj
index d8b52a48bd5..fa60beb2d74 100644
--- a/mcs/class/System.Web.Razor/System.Web.Razor.csproj
+++ b/mcs/class/System.Web.Razor/System.Web.Razor.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\CommonResources.Designer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\ExceptionHelper.cs" />
@@ -55,22 +55,23 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\DocumentParseCompleteEventArgs.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\AutoCompleteEditHandler.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\BackgroundParseTask.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\EditorHints.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\EditResult.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\EditorHints.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\ImplicitExpressionEditHandler.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\SingleLineMarkupEditHandler.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Editor\SpanEditHandler.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\GeneratorResults.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\AddImportCodeGenerator.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\AttributeBlockCodeGenerator.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\BaseCodeWriter.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\BlockCodeGenerator.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CSharpCodeWriter.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CSharpRazorCodeGenerator.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeGenerationCompleteEventArgs.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeGeneratorBase.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeGeneratorContext.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeWriter.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CodeWriterExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CSharpCodeWriter.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\CSharpRazorCodeGenerator.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\DynamicAttributeBlockCodeGenerator.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\ExpressionCodeGenerator.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\ExpressionRenderingMode.cs" />
@@ -96,20 +97,20 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\TypeMemberCodeGenerator.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\VBCodeWriter.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Generator\VBRazorCodeGenerator.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\GeneratorResults.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\GlobalSuppressions.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\ParserResults.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\BalancingModes.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CallbackVisitor.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ConditionalAttributeCollapser.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CSharpCodeParser.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CSharpCodeParser.Directives.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CSharpCodeParser.Statements.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CSharpCodeParser.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CSharpLanguageCharacteristics.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\CallbackVisitor.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ConditionalAttributeCollapser.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlLanguageCharacteristics.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlMarkupParser.Block.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlMarkupParser.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlMarkupParser.Document.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlMarkupParser.Section.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\HtmlMarkupParser.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\ISyntaxTreeRewriter.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\LanguageCharacteristics.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\MarkupCollapser.cs" />
@@ -132,14 +133,13 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\SpanKind.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\SyntaxTree\SyntaxTreeNode.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\TextReaderExtensions.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\TokenizerBackedParser.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\TokenizerBackedParser.Helpers.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\VBCodeParser.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\TokenizerBackedParser.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\VBCodeParser.Directives.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\VBCodeParser.Statements.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\VBCodeParser.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\VBLanguageCharacteristics.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Parser\WhitespaceRewriter.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\ParserResults.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\PartialParseResult.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Properties\AssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\RazorCodeLanguage.cs" />
@@ -190,13 +190,14 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Tokenizer\XmlHelpers.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Utils\CharUtils.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Utils\DisposableAction.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Utils\EnumeratorExtensions.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Utils\EnumUtil.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\Utils\EnumeratorExtensions.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.Razor\VBRazorCodeLanguage.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj
index 7a8dad4834f..9f03e6391f1 100644
--- a/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj
+++ b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj
@@ -44,11 +44,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Routing/System.Web.Routing.csproj b/mcs/class/System.Web.Routing/System.Web.Routing.csproj
index 44988410449..a8bf1da1903 100644
--- a/mcs/class/System.Web.Routing/System.Web.Routing.csproj
+++ b/mcs/class/System.Web.Routing/System.Web.Routing.csproj
@@ -43,11 +43,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.Services/System.Web.Services.csproj b/mcs/class/System.Web.Services/System.Web.Services.csproj
index 8c89ba1d1a6..d7baf65aa4f 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.csproj
+++ b/mcs/class/System.Web.Services/System.Web.Services.csproj
@@ -103,184 +103,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\referencesource\System.Web.Services\inc\InvariantComparer.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\inc\PrivilegedConfigurationManager.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\ComponentModel\CompModSwitches.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\DiagnosticsElement.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\PriorityGroup.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElement.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElementCollection.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\Protocols.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapEnvelopeProcessingElement.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElement.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElementCollection.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElement.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElementCollection.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WebServicesSection.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WsdlHelpGeneratorElement.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElement.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElementCollection.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPointAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPrefixAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpFormatExtensions.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeAnyImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormatExtensions.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameters.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeReturn.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeTextImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SchemaCompiler.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescription.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptions.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionSerializer.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\Soap12FormatExtensions.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapFormatExtensions.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapHttpTransportImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapTransportImporter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebCodeGenerator.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebReference.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceCollection.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceOptions.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebServicesInteroperability.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Diagnostics\TraceUtility.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractReference.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractSearchPattern.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientDocuments.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientReferences.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocument.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentLinksPattern.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentReference.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSearchPattern.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSerializer.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryExceptionDictionary.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReference.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReferences.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryRequestHandler.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoverySearchPattern.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoSearcher.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoveryDocument.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicPhysicalDiscoSearcher.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicVirtualDiscoSearcher.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\ExcludePathInfo.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidContentTypeException.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidDocumentContentsException.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\LinkGrep.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\SchemaReference.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\SoapBinding.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\XmlSchemaSearchPattern.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\CallId.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\INotifyConnection2.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySink2.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySource2.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\NotifyFilter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\UserThread.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\NativeMethods.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\PartialTrustHelpers.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\AnyReturnReader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\BufferedResponseStream.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ClientProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\DiscoveryServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\DocumentationServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterReader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterWriter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpClientProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetClientProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpMethodAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostClientProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostLocalhostServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\LogicalMethodInfo.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MatchAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeFormatter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterReader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterWriter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnReader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnWriter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\NopReturnReader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\PatternMatcher.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\RequestResponse.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\RuntimeUtils.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\Scalars.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ScatterGatherStream.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerType.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap11ServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap12ServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientMessage.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentMethodAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentServiceAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapException.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtension.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionStream.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapFaultCodes.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderDirection.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderException.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaders.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessage.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessageStage.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapParameterStyle.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapProtocolVersion.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapReflector.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcMethodAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcServiceAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMessage.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMethod.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerProtocol.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServiceRoutingStyle.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapUnknownHeader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\TextReturnReader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlEncodedParameterWriter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterReader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterWriter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ValueCollectionParameterReader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandler.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandlerFactory.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnReader.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnWriter.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Soap.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebMethodAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebService.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebServiceAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebServiceBindingAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebServicesDescriptionAttribute.cs" />
-    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WsiProfiles.cs" />
-    <Compile Include="ReferenceSources\Res.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
@@ -340,8 +167,8 @@
     <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
+    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
     <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
     <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
@@ -490,158 +317,8 @@
     <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12BodyBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12FaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12HeaderBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12OperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapAddressBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBindingStyle.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBindingUse.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBodyBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapFaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapHeaderBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapHeaderFaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapOperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Types.cs" />
-    <Compile Include="System.Web.Services.Description\WebReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\ContractReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\ContractSearchPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientDocumentCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientReferenceCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResult.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResultCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocument.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentLinksPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSearchPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSerializer.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryExceptionDictionary.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReferenceCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoverySearchPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DynamicDiscoveryDocument.cs" />
-    <Compile Include="System.Web.Services.Discovery\ExcludePathInfo.cs" />
-    <Compile Include="System.Web.Services.Discovery\SchemaReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\SoapBinding.cs" />
-    <Compile Include="System.Web.Services.Discovery\XmlSchemaSearchPattern.cs" />
-    <Compile Include="System.Web.Services.Protocols\Fault.cs" />
-    <Compile Include="System.Web.Services.Protocols\Fault12.cs" />
-    <Compile Include="System.Web.Services.Protocols\Fault12Serializer.cs" />
-    <Compile Include="System.Web.Services.Protocols\HttpMethodAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\HttpWebClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventArgs.cs" />
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventHandler.cs" />
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodInfo.cs" />
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodTypes.cs" />
-    <Compile Include="System.Web.Services.Protocols\Methods.cs" />
-    <Compile Include="System.Web.Services.Protocols\MimeFormatter.cs" />
-    <Compile Include="System.Web.Services.Protocols\MimeParameterWriter.cs" />
-    <Compile Include="System.Web.Services.Protocols\MimeReturnReader.cs" />
-    <Compile Include="System.Web.Services.Protocols\NopReturnReader.cs" />
-    <Compile Include="System.Web.Services.Protocols\ServerType.cs" />
-    <Compile Include="System.Web.Services.Protocols\Soap12FaultCodes.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapClientMessage.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentMethodAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentServiceAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapException.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapExtension.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapExtensionAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapFaultSubcode.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeader.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderCollection.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderDirection.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderMapping.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHttpClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapMessage.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapMessageStage.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapParameterStyle.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapProtocolVersion.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapRpcMethodAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapRpcServiceAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapServiceRoutingStyle.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapUnknownHeader.cs" />
-    <Compile Include="System.Web.Services.Protocols\TypeStubManager.cs" />
-    <Compile Include="System.Web.Services.Protocols\UrlEncodedParameterWriter.cs" />
-    <Compile Include="System.Web.Services.Protocols\UrlParameterWriter.cs" />
-    <Compile Include="System.Web.Services.Protocols\WebClientAsyncResult.cs" />
-    <Compile Include="System.Web.Services.Protocols\WebClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Protocols\WebServiceHelper.cs" />
-    <Compile Include="System.Web.Services.Protocols\XmlReturnReader.cs" />
-    <Compile Include="System.Web.Services\WebMethodAttribute.cs" />
-    <Compile Include="System.Web.Services\WebServiceAttribute.cs" />
-    <Compile Include="System.Web.Services\WebServiceBindingAttribute.cs" />
-    <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />
-    <Compile Include="System.Web.Services\WsiProfiles.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
-    <Compile Include="..\System.Web\System.Web.Util\HttpEncoder.cs" />
-    <Compile Include="..\System.Web\System.Web\HttpUtility.cs" />
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionAttribute.cs" />
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPointAttribute.cs" />
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPrefixAttribute.cs" />
-    <Compile Include="System.Web.Services.Description\Binding.cs" />
-    <Compile Include="System.Web.Services.Description\BindingCollection.cs" />
-    <Compile Include="System.Web.Services.Description\DocumentableItem.cs" />
-    <Compile Include="System.Web.Services.Description\ExtensionManager.cs" />
-    <Compile Include="System.Web.Services.Description\FaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\FaultBindingCollection.cs" />
-    <Compile Include="System.Web.Services.Description\HttpAddressBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpOperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpUrlEncodedBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpUrlReplacementBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Import.cs" />
-    <Compile Include="System.Web.Services.Description\ImportCollection.cs" />
-    <Compile Include="System.Web.Services.Description\InputBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Message.cs" />
-    <Compile Include="System.Web.Services.Description\MessageBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MessageCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MessagePart.cs" />
-    <Compile Include="System.Web.Services.Description\MessagePartCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MimeContentBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MimeMultipartRelatedBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MimePart.cs" />
-    <Compile Include="System.Web.Services.Description\MimePartCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MimeTextBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MimeTextMatch.cs" />
-    <Compile Include="System.Web.Services.Description\MimeTextMatchCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MimeXmlBinding.cs" />
-    <Compile Include="System.Web.Services.Description\NamedItem.cs" />
-    <Compile Include="System.Web.Services.Description\Operation.cs" />
-    <Compile Include="System.Web.Services.Description\OperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\OperationBindingCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationFault.cs" />
-    <Compile Include="System.Web.Services.Description\OperationFaultCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationFlow.cs" />
-    <Compile Include="System.Web.Services.Description\OperationInput.cs" />
-    <Compile Include="System.Web.Services.Description\OperationMessage.cs" />
-    <Compile Include="System.Web.Services.Description\OperationMessageCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationOutput.cs" />
-    <Compile Include="System.Web.Services.Description\OutputBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Port.cs" />
-    <Compile Include="System.Web.Services.Description\PortCollection.cs" />
-    <Compile Include="System.Web.Services.Description\PortType.cs" />
-    <Compile Include="System.Web.Services.Description\PortTypeCollection.cs" />
-    <Compile Include="System.Web.Services.Description\Service.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescription.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionBaseCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
     <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
     <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
@@ -790,158 +467,8 @@
     <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12BodyBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12FaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12HeaderBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12OperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapAddressBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBindingStyle.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBindingUse.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBodyBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapFaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapHeaderBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapHeaderFaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapOperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Types.cs" />
-    <Compile Include="System.Web.Services.Description\WebReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\ContractReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\ContractSearchPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientDocumentCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientReferenceCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResult.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResultCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocument.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentLinksPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSearchPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSerializer.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryExceptionDictionary.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReferenceCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoverySearchPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DynamicDiscoveryDocument.cs" />
-    <Compile Include="System.Web.Services.Discovery\ExcludePathInfo.cs" />
-    <Compile Include="System.Web.Services.Discovery\SchemaReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\SoapBinding.cs" />
-    <Compile Include="System.Web.Services.Discovery\XmlSchemaSearchPattern.cs" />
-    <Compile Include="System.Web.Services.Protocols\Fault.cs" />
-    <Compile Include="System.Web.Services.Protocols\Fault12.cs" />
-    <Compile Include="System.Web.Services.Protocols\Fault12Serializer.cs" />
-    <Compile Include="System.Web.Services.Protocols\HttpMethodAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\HttpWebClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventArgs.cs" />
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventHandler.cs" />
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodInfo.cs" />
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodTypes.cs" />
-    <Compile Include="System.Web.Services.Protocols\Methods.cs" />
-    <Compile Include="System.Web.Services.Protocols\MimeFormatter.cs" />
-    <Compile Include="System.Web.Services.Protocols\MimeParameterWriter.cs" />
-    <Compile Include="System.Web.Services.Protocols\MimeReturnReader.cs" />
-    <Compile Include="System.Web.Services.Protocols\NopReturnReader.cs" />
-    <Compile Include="System.Web.Services.Protocols\ServerType.cs" />
-    <Compile Include="System.Web.Services.Protocols\Soap12FaultCodes.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapClientMessage.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentMethodAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentServiceAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapException.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapExtension.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapExtensionAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapFaultSubcode.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeader.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderCollection.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderDirection.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderMapping.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHttpClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapMessage.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapMessageStage.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapParameterStyle.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapProtocolVersion.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapRpcMethodAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapRpcServiceAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapServiceRoutingStyle.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapUnknownHeader.cs" />
-    <Compile Include="System.Web.Services.Protocols\TypeStubManager.cs" />
-    <Compile Include="System.Web.Services.Protocols\UrlEncodedParameterWriter.cs" />
-    <Compile Include="System.Web.Services.Protocols\UrlParameterWriter.cs" />
-    <Compile Include="System.Web.Services.Protocols\WebClientAsyncResult.cs" />
-    <Compile Include="System.Web.Services.Protocols\WebClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Protocols\WebServiceHelper.cs" />
-    <Compile Include="System.Web.Services.Protocols\XmlReturnReader.cs" />
-    <Compile Include="System.Web.Services\WebMethodAttribute.cs" />
-    <Compile Include="System.Web.Services\WebServiceAttribute.cs" />
-    <Compile Include="System.Web.Services\WebServiceBindingAttribute.cs" />
-    <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />
-    <Compile Include="System.Web.Services\WsiProfiles.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
-    <Compile Include="..\System.Web\System.Web.Util\HttpEncoder.cs" />
-    <Compile Include="..\System.Web\System.Web\HttpUtility.cs" />
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionAttribute.cs" />
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPointAttribute.cs" />
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPrefixAttribute.cs" />
-    <Compile Include="System.Web.Services.Description\Binding.cs" />
-    <Compile Include="System.Web.Services.Description\BindingCollection.cs" />
-    <Compile Include="System.Web.Services.Description\DocumentableItem.cs" />
-    <Compile Include="System.Web.Services.Description\ExtensionManager.cs" />
-    <Compile Include="System.Web.Services.Description\FaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\FaultBindingCollection.cs" />
-    <Compile Include="System.Web.Services.Description\HttpAddressBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpOperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpUrlEncodedBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpUrlReplacementBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Import.cs" />
-    <Compile Include="System.Web.Services.Description\ImportCollection.cs" />
-    <Compile Include="System.Web.Services.Description\InputBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Message.cs" />
-    <Compile Include="System.Web.Services.Description\MessageBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MessageCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MessagePart.cs" />
-    <Compile Include="System.Web.Services.Description\MessagePartCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MimeContentBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MimeMultipartRelatedBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MimePart.cs" />
-    <Compile Include="System.Web.Services.Description\MimePartCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MimeTextBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MimeTextMatch.cs" />
-    <Compile Include="System.Web.Services.Description\MimeTextMatchCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MimeXmlBinding.cs" />
-    <Compile Include="System.Web.Services.Description\NamedItem.cs" />
-    <Compile Include="System.Web.Services.Description\Operation.cs" />
-    <Compile Include="System.Web.Services.Description\OperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\OperationBindingCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationFault.cs" />
-    <Compile Include="System.Web.Services.Description\OperationFaultCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationFlow.cs" />
-    <Compile Include="System.Web.Services.Description\OperationInput.cs" />
-    <Compile Include="System.Web.Services.Description\OperationMessage.cs" />
-    <Compile Include="System.Web.Services.Description\OperationMessageCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationOutput.cs" />
-    <Compile Include="System.Web.Services.Description\OutputBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Port.cs" />
-    <Compile Include="System.Web.Services.Description\PortCollection.cs" />
-    <Compile Include="System.Web.Services.Description\PortType.cs" />
-    <Compile Include="System.Web.Services.Description\PortTypeCollection.cs" />
-    <Compile Include="System.Web.Services.Description\Service.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescription.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionBaseCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
     <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
     <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
@@ -1031,7 +558,7 @@
     <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />
     <Compile Include="System.Web.Services\WsiProfiles.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
     <Compile Include="..\System.Web\System.Web.Util\HttpEncoder.cs" />
@@ -1090,158 +617,8 @@
     <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12BodyBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12FaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12HeaderBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Soap12OperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapAddressBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBindingStyle.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBindingUse.cs" />
-    <Compile Include="System.Web.Services.Description\SoapBodyBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapFaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapHeaderBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapHeaderFaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\SoapOperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Types.cs" />
-    <Compile Include="System.Web.Services.Description\WebReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\ContractReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\ContractSearchPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientDocumentCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientReferenceCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResult.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryClientResultCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocument.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentLinksPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSearchPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryDocumentSerializer.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryExceptionDictionary.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoveryReferenceCollection.cs" />
-    <Compile Include="System.Web.Services.Discovery\DiscoverySearchPattern.cs" />
-    <Compile Include="System.Web.Services.Discovery\DynamicDiscoveryDocument.cs" />
-    <Compile Include="System.Web.Services.Discovery\ExcludePathInfo.cs" />
-    <Compile Include="System.Web.Services.Discovery\SchemaReference.cs" />
-    <Compile Include="System.Web.Services.Discovery\SoapBinding.cs" />
-    <Compile Include="System.Web.Services.Discovery\XmlSchemaSearchPattern.cs" />
-    <Compile Include="System.Web.Services.Protocols\Fault.cs" />
-    <Compile Include="System.Web.Services.Protocols\Fault12.cs" />
-    <Compile Include="System.Web.Services.Protocols\Fault12Serializer.cs" />
-    <Compile Include="System.Web.Services.Protocols\HttpMethodAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\HttpWebClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventArgs.cs" />
-    <Compile Include="System.Web.Services.Protocols\InvokeCompletedEventHandler.cs" />
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodInfo.cs" />
-    <Compile Include="System.Web.Services.Protocols\LogicalMethodTypes.cs" />
-    <Compile Include="System.Web.Services.Protocols\Methods.cs" />
-    <Compile Include="System.Web.Services.Protocols\MimeFormatter.cs" />
-    <Compile Include="System.Web.Services.Protocols\MimeParameterWriter.cs" />
-    <Compile Include="System.Web.Services.Protocols\MimeReturnReader.cs" />
-    <Compile Include="System.Web.Services.Protocols\NopReturnReader.cs" />
-    <Compile Include="System.Web.Services.Protocols\ServerType.cs" />
-    <Compile Include="System.Web.Services.Protocols\Soap12FaultCodes.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapClientMessage.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentMethodAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapDocumentServiceAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapException.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapExtension.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapExtensionAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapFaultSubcode.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeader.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderCollection.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderDirection.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHeaderMapping.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapHttpClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapMessage.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapMessageStage.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapParameterStyle.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapProtocolVersion.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapRpcMethodAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapRpcServiceAttribute.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapServiceRoutingStyle.cs" />
-    <Compile Include="System.Web.Services.Protocols\SoapUnknownHeader.cs" />
-    <Compile Include="System.Web.Services.Protocols\TypeStubManager.cs" />
-    <Compile Include="System.Web.Services.Protocols\UrlEncodedParameterWriter.cs" />
-    <Compile Include="System.Web.Services.Protocols\UrlParameterWriter.cs" />
-    <Compile Include="System.Web.Services.Protocols\WebClientAsyncResult.cs" />
-    <Compile Include="System.Web.Services.Protocols\WebClientProtocol.cs" />
-    <Compile Include="System.Web.Services.Protocols\WebServiceHelper.cs" />
-    <Compile Include="System.Web.Services.Protocols\XmlReturnReader.cs" />
-    <Compile Include="System.Web.Services\WebMethodAttribute.cs" />
-    <Compile Include="System.Web.Services\WebServiceAttribute.cs" />
-    <Compile Include="System.Web.Services\WebServiceBindingAttribute.cs" />
-    <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />
-    <Compile Include="System.Web.Services\WsiProfiles.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
-    <Compile Include="..\System.Web\System.Web.Util\HttpEncoder.cs" />
-    <Compile Include="..\System.Web\System.Web\HttpUtility.cs" />
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionAttribute.cs" />
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPointAttribute.cs" />
-    <Compile Include="System.Web.Services.Configuration\XmlFormatExtensionPrefixAttribute.cs" />
-    <Compile Include="System.Web.Services.Description\Binding.cs" />
-    <Compile Include="System.Web.Services.Description\BindingCollection.cs" />
-    <Compile Include="System.Web.Services.Description\DocumentableItem.cs" />
-    <Compile Include="System.Web.Services.Description\ExtensionManager.cs" />
-    <Compile Include="System.Web.Services.Description\FaultBinding.cs" />
-    <Compile Include="System.Web.Services.Description\FaultBindingCollection.cs" />
-    <Compile Include="System.Web.Services.Description\HttpAddressBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpOperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpUrlEncodedBinding.cs" />
-    <Compile Include="System.Web.Services.Description\HttpUrlReplacementBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Import.cs" />
-    <Compile Include="System.Web.Services.Description\ImportCollection.cs" />
-    <Compile Include="System.Web.Services.Description\InputBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Message.cs" />
-    <Compile Include="System.Web.Services.Description\MessageBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MessageCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MessagePart.cs" />
-    <Compile Include="System.Web.Services.Description\MessagePartCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MimeContentBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MimeMultipartRelatedBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MimePart.cs" />
-    <Compile Include="System.Web.Services.Description\MimePartCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MimeTextBinding.cs" />
-    <Compile Include="System.Web.Services.Description\MimeTextMatch.cs" />
-    <Compile Include="System.Web.Services.Description\MimeTextMatchCollection.cs" />
-    <Compile Include="System.Web.Services.Description\MimeXmlBinding.cs" />
-    <Compile Include="System.Web.Services.Description\NamedItem.cs" />
-    <Compile Include="System.Web.Services.Description\Operation.cs" />
-    <Compile Include="System.Web.Services.Description\OperationBinding.cs" />
-    <Compile Include="System.Web.Services.Description\OperationBindingCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationFault.cs" />
-    <Compile Include="System.Web.Services.Description\OperationFaultCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationFlow.cs" />
-    <Compile Include="System.Web.Services.Description\OperationInput.cs" />
-    <Compile Include="System.Web.Services.Description\OperationMessage.cs" />
-    <Compile Include="System.Web.Services.Description\OperationMessageCollection.cs" />
-    <Compile Include="System.Web.Services.Description\OperationOutput.cs" />
-    <Compile Include="System.Web.Services.Description\OutputBinding.cs" />
-    <Compile Include="System.Web.Services.Description\Port.cs" />
-    <Compile Include="System.Web.Services.Description\PortCollection.cs" />
-    <Compile Include="System.Web.Services.Description\PortType.cs" />
-    <Compile Include="System.Web.Services.Description\PortTypeCollection.cs" />
-    <Compile Include="System.Web.Services.Description\Service.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescription.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionBaseCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
     <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
     <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
@@ -1331,7 +708,181 @@
     <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />
     <Compile Include="System.Web.Services\WsiProfiles.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="..\referencesource\System.Web.Services\System\ComponentModel\CompModSwitches.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\DiagnosticsElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\PriorityGroup.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\ProtocolElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\Protocols.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapEnvelopeProcessingElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\SoapExtensionTypeElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\TypeElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WebServicesSection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WsdlHelpGeneratorElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElement.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\WsiProfilesElementCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPointAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Configuration\XmlFormatExtensionPrefixAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpFormatExtensions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpGetProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpPostProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\HttpProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeAnyImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeFormatExtensions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeParameters.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeReturn.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeTextImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\MimeXmlReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SchemaCompiler.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescription.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptionSerializer.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\ServiceDescriptions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\Soap12FormatExtensions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\Soap12ProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapExtensionReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapFormatExtensions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapHttpTransportImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapProtocolReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\SoapTransportImporter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebCodeGenerator.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceCollection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebReferenceOptions.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Description\WebServicesInteroperability.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Diagnostics\TraceUtility.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\ContractSearchPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientDocuments.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryClientReferences.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocument.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentLinksPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSearchPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryDocumentSerializer.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryExceptionDictionary.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryReferences.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoveryRequestHandler.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DiscoverySearchPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoSearcher.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicDiscoveryDocument.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicPhysicalDiscoSearcher.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\DynamicVirtualDiscoSearcher.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\ExcludePathInfo.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidContentTypeException.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\InvalidDocumentContentsException.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\LinkGrep.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\SchemaReference.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\SoapBinding.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Discovery\XmlSchemaSearchPattern.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\CallId.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\INotifyConnection2.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySink2.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\INotifySource2.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\NotifyFilter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Interop\UserThread.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\NativeMethods.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\PartialTrustHelpers.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\AnyReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\BufferedResponseStream.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\DiscoveryServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\DocumentationServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HtmlFormParameterWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpGetServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostLocalhostServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpPostServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\HttpServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\LogicalMethodInfo.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MatchAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeFormatter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeParameterWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\MimeReturnWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\NopReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\PatternMatcher.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\RequestResponse.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\RuntimeUtils.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\Scalars.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ScatterGatherStream.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ServerType.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap11ServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\Soap12ServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientMessage.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapClientProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapDocumentServiceAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapException.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtension.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapExtensionStream.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapFaultCodes.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderDirection.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaderException.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapHeaders.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessage.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapMessageStage.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapParameterStyle.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapProtocolVersion.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapReflector.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapRpcServiceAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMessage.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerMethod.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServerProtocol.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapServiceRoutingStyle.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\SoapUnknownHeader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\TextReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlEncodedParameterWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\UrlParameterWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\ValueCollectionParameterReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandler.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\WebServiceHandlerFactory.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnReader.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Protocols\XmlReturnWriter.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\Soap.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebMethodAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebService.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebServiceAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebServiceBindingAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WebServicesDescriptionAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\System\Web\Services\WsiProfiles.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\inc\InvariantComparer.cs" />
+    <Compile Include="..\referencesource\System.Web.Services\inc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="ReferenceSources\Res.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
     <Compile Include="..\System.Web\System.Web.Util\HttpEncoder.cs" />
@@ -1390,8 +941,8 @@
     <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
+    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
     <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
     <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
@@ -1481,7 +1032,7 @@
     <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />
     <Compile Include="System.Web.Services\WsiProfiles.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
     <Compile Include="..\System.Web\System.Web.Util\HttpEncoder.cs" />
@@ -1540,9 +1091,8 @@
     <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImportWarnings.cs" />
+    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
     <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
     <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
@@ -1632,7 +1182,7 @@
     <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />
     <Compile Include="System.Web.Services\WsiProfiles.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
     <Compile Include="..\System.Web\System.Web.Util\HttpEncoder.cs" />
@@ -1691,8 +1241,8 @@
     <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
+    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
     <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
     <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
@@ -1782,7 +1332,7 @@
     <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />
     <Compile Include="System.Web.Services\WsiProfiles.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
     <Compile Include="..\System.Web\System.Web.Util\HttpEncoder.cs" />
@@ -1841,8 +1391,8 @@
     <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
+    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
     <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
     <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
@@ -1932,7 +1482,7 @@
     <Compile Include="System.Web.Services\WebServicesDescriptionAttribute.cs" />
     <Compile Include="System.Web.Services\WsiProfiles.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\System.Web\System.Web.Util\Helpers.cs" />
     <Compile Include="..\System.Web\System.Web.Util\HttpEncoder.cs" />
@@ -1991,8 +1541,8 @@
     <Compile Include="System.Web.Services.Description\ServiceDescriptionCollection.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtension.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs" />
-    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionImportStyle.cs" />
+    <Compile Include="System.Web.Services.Description\ServiceDescriptionImporter.cs" />
     <Compile Include="System.Web.Services.Description\ServiceDescriptionSerializerBase2.cs" />
     <Compile Include="System.Web.Services.Description\Soap12AddressBinding.cs" />
     <Compile Include="System.Web.Services.Description\Soap12Binding.cs" />
diff --git a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj
index 034f704e98f..3ab2b026f13 100644
--- a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj
+++ b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\CommonResources.Designer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\ExceptionHelper.cs" />
@@ -65,6 +65,7 @@
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj
index 1bf229f70ad..b8dc346f1b3 100644
--- a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj
+++ b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\CommonResources.Designer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages.Razor\AssemblyBuilderWrapper.cs" />
@@ -68,6 +68,7 @@
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj b/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj
index 001677db698..c31f0f27202 100644
--- a/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj
+++ b/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\CommonResources.Designer.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\ExceptionHelper.cs" />
@@ -104,7 +104,6 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\UnvalidatedRequestValues.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Helpers\Validation.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Checkbox.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Input.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Internal.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Label.cs" />
@@ -112,11 +111,15 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Select.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.TextArea.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.Validation.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\HtmlHelper.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\ModelState.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\ModelStateDictionary.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Html\SelectListItem.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\HttpContextExtensions.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\IDisplayMode.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ITemplateFile.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\IVirtualPathFactory.cs" />
+    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\IWebPageRequestExecutor.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\HttpContextAdapter.Availability.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\HttpContextAdapter.generated.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\InstrumentationService.cs" />
@@ -124,9 +127,6 @@
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\PageExecutionListenerAdapter.generated.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\PageInstrumentationServiceAdapter.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Instrumentation\PositionTagged.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\ITemplateFile.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\IVirtualPathFactory.cs" />
-    <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\IWebPageRequestExecutor.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\HttpAntiForgeryException.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\ModelClientValidationEqualToRule.cs" />
     <Compile Include="..\..\..\external\aspnetwebstack\src\System.Web.WebPages\Mvc\ModelClientValidationRangeRule.cs" />
@@ -192,6 +192,7 @@
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Web/System.Web.csproj b/mcs/class/System.Web/System.Web.csproj
index a8668525247..e921498bbc5 100644
--- a/mcs/class/System.Web/System.Web.csproj
+++ b/mcs/class/System.Web/System.Web.csproj
@@ -44,12 +44,31 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="System.Web\UplevelHelper.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\..\build\common\SR.cs" />
+    <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\FileRefHandler.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\InMemoryHandler.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\NullRefHandler.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\ResXDataNode.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\ResXFileRef.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\ResXNullRef.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceReader.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceSet.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceWriter.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />
+    <Compile Include="..\System.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />
+    <Compile Include="..\System\System\MonoToolsLocator.cs" />
     <Compile Include="..\referencesource\System.Web\Abstractions\HttpApplicationStateBase.cs" />
     <Compile Include="..\referencesource\System.Web\Abstractions\HttpApplicationStateWrapper.cs" />
     <Compile Include="..\referencesource\System.Web\Abstractions\HttpBrowserCapabilitiesBase.cs" />
@@ -92,9 +111,9 @@
     <Compile Include="..\referencesource\System.Web\Configuration\FormsProtectionEnum.cs" />
     <Compile Include="..\referencesource\System.Web\Configuration\IConfigMapPath.cs" />
     <Compile Include="..\referencesource\System.Web\Configuration\IConfigMapPathFactory.cs" />
-    <Compile Include="..\referencesource\System.Web\Configuration\Internal\IInternalConfigWebHost.cs" />
     <Compile Include="..\referencesource\System.Web\Configuration\IRemoteWebConfigurationHostServer.cs" />
     <Compile Include="..\referencesource\System.Web\Configuration\IServerConfig2.cs" />
+    <Compile Include="..\referencesource\System.Web\Configuration\Internal\IInternalConfigWebHost.cs" />
     <Compile Include="..\referencesource\System.Web\Configuration\MachineKeyCompatibilityMode.cs" />
     <Compile Include="..\referencesource\System.Web\Configuration\MachineKeyValidation.cs" />
     <Compile Include="..\referencesource\System.Web\Configuration\PagesEnableSessionState.cs" />
@@ -116,8 +135,8 @@
     <Compile Include="..\referencesource\System.Web\Configuration\XhtmlConformanceMode.cs" />
     <Compile Include="..\referencesource\System.Web\Hosting\AppDomainProtocolHandler.cs" />
     <Compile Include="..\referencesource\System.Web\Hosting\BackgroundWorkScheduler.cs" />
-    <Compile Include="..\referencesource\System.Web\Hosting\HostingEnvironmentException.cs" />
     <Compile Include="..\referencesource\System.Web\Hosting\HTTP_COOKED_URL.cs" />
+    <Compile Include="..\referencesource\System.Web\Hosting\HostingEnvironmentException.cs" />
     <Compile Include="..\referencesource\System.Web\Hosting\IApplicationHost.cs" />
     <Compile Include="..\referencesource\System.Web\Hosting\ICustomLoader.cs" />
     <Compile Include="..\referencesource\System.Web\Hosting\ICustomRuntime.cs" />
@@ -138,17 +157,16 @@
     <Compile Include="..\referencesource\System.Web\IHttpHandler.cs" />
     <Compile Include="..\referencesource\System.Web\IHttpHandlerFactory.cs" />
     <Compile Include="..\referencesource\System.Web\IHttpModule.cs" />
-    <Compile Include="..\referencesource\System.Web\IntraPartitionAPIs\xsp\PerfCounterEnum.cs" />
     <Compile Include="..\referencesource\System.Web\IPrincipalContainer.cs" />
     <Compile Include="..\referencesource\System.Web\IRequestCompletedNotifier.cs" />
     <Compile Include="..\referencesource\System.Web\ISubscriptionToken.cs" />
     <Compile Include="..\referencesource\System.Web\ITlsTokenBindingInfo.cs" />
+    <Compile Include="..\referencesource\System.Web\IntraPartitionAPIs\xsp\PerfCounterEnum.cs" />
     <Compile Include="..\referencesource\System.Web\Management\IInternalWebEventProvider.cs" />
-    <Compile Include="..\referencesource\System.Web\misc\InvariantComparer.cs" />
-    <Compile Include="..\referencesource\System.Web\ModelBinding\BindingBehavior.cs" />
-    <Compile Include="..\referencesource\System.Web\ModelBinding\BindingBehaviorAttribute.cs" />
     <Compile Include="..\referencesource\System.Web\ModelBinding\BindNeverAttribute.cs" />
     <Compile Include="..\referencesource\System.Web\ModelBinding\BindRequiredAttribute.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindingBehavior.cs" />
+    <Compile Include="..\referencesource\System.Web\ModelBinding\BindingBehaviorAttribute.cs" />
     <Compile Include="..\referencesource\System.Web\ModelBinding\DictionaryHelpers.cs" />
     <Compile Include="..\referencesource\System.Web\ModelBinding\ExtensibleModelBinderAttribute.cs" />
     <Compile Include="..\referencesource\System.Web\ModelBinding\IModelNameProvider.cs" />
@@ -239,22 +257,19 @@
     <Compile Include="..\referencesource\System.Web\UI\ICallbackEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IControlBuilderAccessor.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IControlDesignerAccessor.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IDReferencePropertyAttribute.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IDataBindingsAccessor.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IDataItemContainer.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IDataKeysControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IDataSource.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IDataSourceViewSchemaAccessor.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\IDReferencePropertyAttribute.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IExpressionsAccessor.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IFilterResolutionService.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IHierarchicalDataSource.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IHierarchicalEnumerable.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IHierarchyData.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\ImageClickEventArgs.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\ImageClickEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\INamingContainer.cs" />
     <Compile Include="..\referencesource\System.Web\UI\INavigateUIData.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\IndexedString.cs" />
     <Compile Include="..\referencesource\System.Web\UI\INonBindingContainer.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IParserAccessor.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IPostBackDataHandler.cs" />
@@ -272,6 +287,9 @@
     <Compile Include="..\referencesource\System.Web\UI\IUserControlDesignerAccessor.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IUserControlTypeResolutionService.cs" />
     <Compile Include="..\referencesource\System.Web\UI\IValidator.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ImageClickEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\ImageClickEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\IndexedString.cs" />
     <Compile Include="..\referencesource\System.Web\UI\NonVisualControlAttribute.cs" />
     <Compile Include="..\referencesource\System.Web\UI\PagesConfiguration.cs" />
     <Compile Include="..\referencesource\System.Web\UI\Pair.cs" />
@@ -287,8 +305,8 @@
     <Compile Include="..\referencesource\System.Web\UI\ValidateRequestMode.cs" />
     <Compile Include="..\referencesource\System.Web\UI\ViewStateEncryptionMode.cs" />
     <Compile Include="..\referencesource\System.Web\UI\ViewStateMode.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\Adapters\WmlPostFieldType.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\AdCreatedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\Adapters\WmlPostFieldType.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\AuthenticateEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\AuthenticateEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\AutoCompleteType.cs" />
@@ -325,38 +343,38 @@
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DayRenderEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewCommandEventHandler.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewDeletedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewDeleteEventHandler.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewInsertedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewDeletedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewInsertEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewInsertedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewMode.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewModeEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewModeEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewPageEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewPageEventHandler.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewUpdatedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewUpdateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\DetailsViewUpdatedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FirstDayOfWeek.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FontSize.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewCommandEventHandler.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewDeletedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewDeleteEventHandler.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewInsertedEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewDeletedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewInsertEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewInsertedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewMode.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewModeEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewModeEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewPageEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewPageEventHandler.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewUpdatedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewUpdateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\FormViewUpdatedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridLines.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCancelEditEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCommandEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewCommandEventHandler.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewDeletedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewDeleteEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewDeletedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewEditEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewEditEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewPageEventArgs.cs" />
@@ -367,8 +385,8 @@
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSelectEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSortEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewSortEventHandler.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewUpdatedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewUpdateEventHandler.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\GridViewUpdatedEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\HorizontalAlign.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\HotSpotMode.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IBorderPaddingControl.cs" />
@@ -381,15 +399,15 @@
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IDataBoundListControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IEditableTextControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IFieldControl.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IPersistedSelector.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IPostBackContainer.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IRenderOuterTableControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IRepeatInfoUser.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\ITextControl.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\IWizardSideBarListControl.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageAlign.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventArgs.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\ImageMapEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\ListItemType.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\ListSelectionMode.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\LiteralMode.cs" />
@@ -424,11 +442,11 @@
     <Compile Include="..\referencesource\System.Web\UI\WebControls\PagerPosition.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\PathDirection.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeatDirection.cs" />
+    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeatLayout.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterCommandEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterCommandEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterItemEventArgs.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeaterItemEventHandler.cs" />
-    <Compile Include="..\referencesource\System.Web\UI\WebControls\RepeatLayout.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\Scrollbars.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\SendMailErrorEventHandler.cs" />
     <Compile Include="..\referencesource\System.Web\UI\WebControls\ServerValidateEventArgs.cs" />
@@ -517,7 +535,6 @@
     <Compile Include="..\referencesource\System.Web\Util\ExceptionUtil.cs" />
     <Compile Include="..\referencesource\System.Web\Util\FastDelegateCreator.cs" />
     <Compile Include="..\referencesource\System.Web\Util\GCUtil.cs" />
-    <Compile Include="..\referencesource\System.Web\Util\hresults.cs" />
     <Compile Include="..\referencesource\System.Web\Util\IObjectFactory.cs" />
     <Compile Include="..\referencesource\System.Web\Util\ISyncContext.cs" />
     <Compile Include="..\referencesource\System.Web\Util\ISyncContextLock.cs" />
@@ -535,29 +552,15 @@
     <Compile Include="..\referencesource\System.Web\Util\SymbolEqualComparer.cs" />
     <Compile Include="..\referencesource\System.Web\Util\SynchronizationContextMode.cs" />
     <Compile Include="..\referencesource\System.Web\Util\VersionUtil.cs" />
+    <Compile Include="..\referencesource\System.Web\Util\hresults.cs" />
     <Compile Include="..\referencesource\System.Web\ValidateStringCallback.cs" />
+    <Compile Include="..\referencesource\System.Web\WebSocketTransitionState.cs" />
     <Compile Include="..\referencesource\System.Web\WebSockets\AspNetWebSocketOptions.cs" />
     <Compile Include="..\referencesource\System.Web\WebSockets\SubprotocolUtil.cs" />
-    <Compile Include="..\referencesource\System.Web\WebSocketTransitionState.cs" />
     <Compile Include="..\referencesource\System.Web\WebSysDefaultValueAttribute.cs" />
     <Compile Include="..\referencesource\System.Web\WebSysDescriptionAttribute.cs" />
     <Compile Include="..\referencesource\System.Web\WebSysDisplayNameAttribute.cs" />
-    <Compile Include="..\System.Design\System.Data.Design\TypedDataSetGenerator.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\FileRefHandler.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\InMemoryHandler.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\NullRefHandler.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXDataNode.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXFileRef.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXNullRef.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceReader.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceSet.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\ResXResourceWriter.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />
-    <Compile Include="..\System.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />
-    <Compile Include="..\System\System\MonoToolsLocator.cs" />
+    <Compile Include="..\referencesource\System.Web\misc\InvariantComparer.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.Web.Util\ISectionSettingsMapper.cs" />
     <Compile Include="Mono.Web.Util\MembershipSectionMapper.cs" />
@@ -571,8 +574,6 @@
     <Compile Include="System.Web.Caching\AggregateCacheDependency.cs" />
     <Compile Include="System.Web.Caching\Cache.cs" />
     <Compile Include="System.Web.Caching\CacheDependency.cs" />
-    <Compile Include="System.Web.Caching\CachedRawResponse.cs" />
-    <Compile Include="System.Web.Caching\CachedVaryBy.cs" />
     <Compile Include="System.Web.Caching\CacheItem.cs" />
     <Compile Include="System.Web.Caching\CacheItemEnumerator.cs" />
     <Compile Include="System.Web.Caching\CacheItemLRU.cs" />
@@ -583,6 +584,8 @@
     <Compile Include="System.Web.Caching\CacheItemRemovedReason.cs" />
     <Compile Include="System.Web.Caching\CacheItemUpdateCallback.cs" />
     <Compile Include="System.Web.Caching\CacheItemUpdateReason.cs" />
+    <Compile Include="System.Web.Caching\CachedRawResponse.cs" />
+    <Compile Include="System.Web.Caching\CachedVaryBy.cs" />
     <Compile Include="System.Web.Caching\DatabaseNotEnabledForNotificationException.cs" />
     <Compile Include="System.Web.Caching\FileResponseElement.cs" />
     <Compile Include="System.Web.Caching\HeaderElement.cs" />
@@ -596,13 +599,13 @@
     <Compile Include="System.Web.Caching\SubstitutionResponseElement.cs" />
     <Compile Include="System.Web.Caching\TableNotEnabledForNotificationException.cs" />
     <Compile Include="System.Web.Compilation\AppCodeCompiler.cs" />
-    <Compile Include="System.Web.Compilation\ApplicationFileBuildProvider.cs" />
     <Compile Include="System.Web.Compilation\AppResourceFileInfo.cs" />
     <Compile Include="System.Web.Compilation\AppResourceFilesCollection.cs" />
     <Compile Include="System.Web.Compilation\AppResourcesAssemblyBuilder.cs" />
     <Compile Include="System.Web.Compilation\AppResourcesCompiler.cs" />
     <Compile Include="System.Web.Compilation\AppSettingsExpressionBuilder.cs" />
     <Compile Include="System.Web.Compilation\AppWebReferencesCompiler.cs" />
+    <Compile Include="System.Web.Compilation\ApplicationFileBuildProvider.cs" />
     <Compile Include="System.Web.Compilation\AspComponent.cs" />
     <Compile Include="System.Web.Compilation\AspComponentFoundry.cs" />
     <Compile Include="System.Web.Compilation\AspGenerator.cs" />
@@ -636,9 +639,9 @@
     <Compile Include="System.Web.Compilation\ForceCopyBuildProvider.cs" />
     <Compile Include="System.Web.Compilation\GenericBuildProvider.cs" />
     <Compile Include="System.Web.Compilation\GlobalAsaxCompiler.cs" />
-    <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />
     <Compile Include="System.Web.Compilation\ILocation.cs" />
     <Compile Include="System.Web.Compilation\IResourceProvider.cs" />
+    <Compile Include="System.Web.Compilation\IgnoreFileBuildProvider.cs" />
     <Compile Include="System.Web.Compilation\LinePragmaCodeInfo.cs" />
     <Compile Include="System.Web.Compilation\Location.cs" />
     <Compile Include="System.Web.Compilation\MasterPageBuildProvider.cs" />
@@ -676,8 +679,8 @@
     <Compile Include="System.Web.Configuration_2.0\AuthorizationRule.cs" />
     <Compile Include="System.Web.Configuration_2.0\AuthorizationRuleCollection.cs" />
     <Compile Include="System.Web.Configuration_2.0\AuthorizationSection.cs" />
-    <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />
     <Compile Include="System.Web.Configuration_2.0\BufferModeSettings.cs" />
+    <Compile Include="System.Web.Configuration_2.0\BufferModesCollection.cs" />
     <Compile Include="System.Web.Configuration_2.0\BuildProvider.cs" />
     <Compile Include="System.Web.Configuration_2.0\BuildProviderCollection.cs" />
     <Compile Include="System.Web.Configuration_2.0\CacheSection.cs" />
@@ -731,13 +734,6 @@
     <Compile Include="System.Web.Configuration_2.0\MonoSettingsSection.cs" />
     <Compile Include="System.Web.Configuration_2.0\NamespaceCollection.cs" />
     <Compile Include="System.Web.Configuration_2.0\NamespaceInfo.cs" />
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Build.cs" />
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Exception.cs" />
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\File.cs" />
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Identification.cs" />
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Node.cs" />
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\NodeTypes.cs" />
-    <Compile Include="System.Web.Configuration_2.0\nBrowser\Result.cs" />
     <Compile Include="System.Web.Configuration_2.0\NullableStringValidator.cs" />
     <Compile Include="System.Web.Configuration_2.0\OutputCacheProfile.cs" />
     <Compile Include="System.Web.Configuration_2.0\OutputCacheProfileCollection.cs" />
@@ -795,13 +791,20 @@
     <Compile Include="System.Web.Configuration_2.0\WebPartsPersonalizationAuthorization.cs" />
     <Compile Include="System.Web.Configuration_2.0\WebPartsSection.cs" />
     <Compile Include="System.Web.Configuration_2.0\XhtmlConformanceSection.cs" />
+    <Compile Include="System.Web.Configuration_2.0\nBrowser\Build.cs" />
+    <Compile Include="System.Web.Configuration_2.0\nBrowser\Exception.cs" />
+    <Compile Include="System.Web.Configuration_2.0\nBrowser\File.cs" />
+    <Compile Include="System.Web.Configuration_2.0\nBrowser\Identification.cs" />
+    <Compile Include="System.Web.Configuration_2.0\nBrowser\Node.cs" />
+    <Compile Include="System.Web.Configuration_2.0\nBrowser\NodeTypes.cs" />
+    <Compile Include="System.Web.Configuration_2.0\nBrowser\Result.cs" />
     <Compile Include="System.Web.Handlers\AssemblyResourceLoader.cs" />
     <Compile Include="System.Web.Handlers\TraceHandler.cs" />
     <Compile Include="System.Web.Hosting\AppDomainFactory.cs" />
+    <Compile Include="System.Web.Hosting\AppManagerAppDomainFactory.cs" />
     <Compile Include="System.Web.Hosting\ApplicationHost.cs" />
     <Compile Include="System.Web.Hosting\ApplicationInfo.cs" />
     <Compile Include="System.Web.Hosting\ApplicationManager.cs" />
-    <Compile Include="System.Web.Hosting\AppManagerAppDomainFactory.cs" />
     <Compile Include="System.Web.Hosting\BareApplicationHost.cs" />
     <Compile Include="System.Web.Hosting\DefaultVirtualDirectory.cs" />
     <Compile Include="System.Web.Hosting\DefaultVirtualFile.cs" />
@@ -859,8 +862,8 @@
     <Compile Include="System.Web.Profile\ProfileProviderAttribute.cs" />
     <Compile Include="System.Web.Profile\ProfileProviderCollection.cs" />
     <Compile Include="System.Web.Profile\SettingsAllowAnonymousAttribute.cs" />
-    <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />
     <Compile Include="System.Web.Profile\SqlProfileProvider.cs" />
+    <Compile Include="System.Web.Profile\SqliteProfileProvider.cs" />
     <Compile Include="System.Web.Properties\TranslationProperties.Designer.cs" />
     <Compile Include="System.Web.Security\ActiveDirectoryConnectionProtection.cs" />
     <Compile Include="System.Web.Security\ActiveDirectoryMembershipProvider.cs" />
@@ -887,10 +890,10 @@
     <Compile Include="System.Web.Security\RolePrincipal.cs" />
     <Compile Include="System.Web.Security\RoleProviderCollection.cs" />
     <Compile Include="System.Web.Security\Roles.cs" />
-    <Compile Include="System.Web.Security\SqliteMembershipProvider.cs" />
-    <Compile Include="System.Web.Security\SqliteRoleProvider.cs" />
     <Compile Include="System.Web.Security\SqlMembershipProvider.cs" />
     <Compile Include="System.Web.Security\SqlRoleProvider.cs" />
+    <Compile Include="System.Web.Security\SqliteMembershipProvider.cs" />
+    <Compile Include="System.Web.Security\SqliteRoleProvider.cs" />
     <Compile Include="System.Web.Security\UrlAuthorizationModule.cs" />
     <Compile Include="System.Web.Security\WindowsAuthenticationModule.cs" />
     <Compile Include="System.Web.SessionState_2.0\HttpSessionState.cs" />
@@ -900,8 +903,8 @@
     <Compile Include="System.Web.SessionState_2.0\ISessionStateItemCollection.cs" />
     <Compile Include="System.Web.SessionState_2.0\IStateRuntime.cs" />
     <Compile Include="System.Web.SessionState_2.0\RemoteStateServer.cs" />
-    <Compile Include="System.Web.SessionState_2.0\SessionId.cs" />
     <Compile Include="System.Web.SessionState_2.0\SessionIDManager.cs" />
+    <Compile Include="System.Web.SessionState_2.0\SessionId.cs" />
     <Compile Include="System.Web.SessionState_2.0\SessionInProcHandler.cs" />
     <Compile Include="System.Web.SessionState_2.0\SessionSQLServerHandler.cs" />
     <Compile Include="System.Web.SessionState_2.0\SessionStateActions.cs" />
@@ -987,9 +990,9 @@
     <Compile Include="System.Web.UI.WebControls\BaseValidator.cs" />
     <Compile Include="System.Web.UI.WebControls\BoundColumn.cs" />
     <Compile Include="System.Web.UI.WebControls\BoundField.cs" />
+    <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />
     <Compile Include="System.Web.UI.WebControls\BulletedList.cs" />
     <Compile Include="System.Web.UI.WebControls\BulletedListDisplayMode.cs" />
-    <Compile Include="System.Web.UI.WebControls\BulletStyle.cs" />
     <Compile Include="System.Web.UI.WebControls\Button.cs" />
     <Compile Include="System.Web.UI.WebControls\ButtonColumn.cs" />
     <Compile Include="System.Web.UI.WebControls\ButtonField.cs" />
@@ -1042,15 +1045,15 @@
     <Compile Include="System.Web.UI.WebControls\DataSourceCacheManager.cs" />
     <Compile Include="System.Web.UI.WebControls\DayRenderEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\DetailsView.cs" />
-    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\DetailsViewDeleteEventArgs.cs" />
-    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\DetailsViewDeletedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\DetailsViewInsertEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\DetailsViewInsertedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\DetailsViewPagerRow.cs" />
     <Compile Include="System.Web.UI.WebControls\DetailsViewRow.cs" />
     <Compile Include="System.Web.UI.WebControls\DetailsViewRowCollection.cs" />
-    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\DetailsViewUpdateEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\DetailsViewUpdatedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\DropDownList.cs" />
     <Compile Include="System.Web.UI.WebControls\EditCommandColumn.cs" />
     <Compile Include="System.Web.UI.WebControls\EmbeddedMailObject.cs" />
@@ -1063,21 +1066,21 @@
     <Compile Include="System.Web.UI.WebControls\FormParameter.cs" />
     <Compile Include="System.Web.UI.WebControls\FormView.cs" />
     <Compile Include="System.Web.UI.WebControls\FormViewCommandEventArgs.cs" />
-    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\FormViewDeleteEventArgs.cs" />
-    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\FormViewDeletedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\FormViewInsertEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\FormViewInsertedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\FormViewPagerRow.cs" />
     <Compile Include="System.Web.UI.WebControls\FormViewRow.cs" />
-    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\FormViewUpdateEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\FormViewUpdatedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\GridView.cs" />
-    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\GridViewDeleteEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\GridViewDeletedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\GridViewRow.cs" />
     <Compile Include="System.Web.UI.WebControls\GridViewRowCollection.cs" />
-    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\GridViewUpdateEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\GridViewUpdatedEventArgs.cs" />
     <Compile Include="System.Web.UI.WebControls\HiddenField.cs" />
     <Compile Include="System.Web.UI.WebControls\HierarchicalDataBoundControl.cs" />
     <Compile Include="System.Web.UI.WebControls\HorizontalAlignConverter.cs" />
@@ -1087,12 +1090,12 @@
     <Compile Include="System.Web.UI.WebControls\HyperLinkColumn.cs" />
     <Compile Include="System.Web.UI.WebControls\HyperLinkControlBuilder.cs" />
     <Compile Include="System.Web.UI.WebControls\HyperLinkField.cs" />
+    <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />
+    <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />
     <Compile Include="System.Web.UI.WebControls\Image.cs" />
     <Compile Include="System.Web.UI.WebControls\ImageButton.cs" />
     <Compile Include="System.Web.UI.WebControls\ImageField.cs" />
     <Compile Include="System.Web.UI.WebControls\ImageMap.cs" />
-    <Compile Include="System.Web.UI.WebControls\IMenuRenderer.cs" />
-    <Compile Include="System.Web.UI.WebControls\IRenderOuterTable.cs" />
     <Compile Include="System.Web.UI.WebControls\Label.cs" />
     <Compile Include="System.Web.UI.WebControls\LabelControlBuilder.cs" />
     <Compile Include="System.Web.UI.WebControls\LinkButton.cs" />
@@ -1142,10 +1145,10 @@
     <Compile Include="System.Web.UI.WebControls\RangeValidator.cs" />
     <Compile Include="System.Web.UI.WebControls\RectangleHotSpot.cs" />
     <Compile Include="System.Web.UI.WebControls\RegularExpressionValidator.cs" />
+    <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />
     <Compile Include="System.Web.UI.WebControls\Repeater.cs" />
     <Compile Include="System.Web.UI.WebControls\RepeaterItem.cs" />
     <Compile Include="System.Web.UI.WebControls\RepeaterItemCollection.cs" />
-    <Compile Include="System.Web.UI.WebControls\RepeatInfo.cs" />
     <Compile Include="System.Web.UI.WebControls\RequiredFieldValidator.cs" />
     <Compile Include="System.Web.UI.WebControls\RoleGroup.cs" />
     <Compile Include="System.Web.UI.WebControls\RoleGroupCollection.cs" />
@@ -1180,8 +1183,8 @@
     <Compile Include="System.Web.UI.WebControls\TableStyle.cs" />
     <Compile Include="System.Web.UI.WebControls\TargetConverter.cs" />
     <Compile Include="System.Web.UI.WebControls\TemplateColumn.cs" />
-    <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />
     <Compile Include="System.Web.UI.WebControls\TemplateField.cs" />
+    <Compile Include="System.Web.UI.WebControls\TemplatedWizardStep.cs" />
     <Compile Include="System.Web.UI.WebControls\TextBox.cs" />
     <Compile Include="System.Web.UI.WebControls\TextBoxControlBuilder.cs" />
     <Compile Include="System.Web.UI.WebControls\TreeNode.cs" />
@@ -1222,9 +1225,9 @@
     <Compile Include="System.Web.UI\BasePartialCachingControl.cs" />
     <Compile Include="System.Web.UI\BaseTemplateParser.cs" />
     <Compile Include="System.Web.UI\BoundPropertyEntry.cs" />
-    <Compile Include="System.Web.UI\BuilderPropertyEntry.cs" />
     <Compile Include="System.Web.UI\BuildMethod.cs" />
     <Compile Include="System.Web.UI\BuildTemplateMethod.cs" />
+    <Compile Include="System.Web.UI\BuilderPropertyEntry.cs" />
     <Compile Include="System.Web.UI\ChtmlTextWriter.cs" />
     <Compile Include="System.Web.UI\ClientScriptManager.cs" />
     <Compile Include="System.Web.UI\CodeBuilder.cs" />
@@ -1253,9 +1256,9 @@
     <Compile Include="System.Web.UI\DataSourceView.cs" />
     <Compile Include="System.Web.UI\DataSourceViewOperationCallback.cs" />
     <Compile Include="System.Web.UI\DataSourceViewSelectCallback.cs" />
-    <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />
     <Compile Include="System.Web.UI\DesignTimeParseData.cs" />
     <Compile Include="System.Web.UI\DesignTimeTemplateParser.cs" />
+    <Compile Include="System.Web.UI\DesignerDataBoundLiteralControl.cs" />
     <Compile Include="System.Web.UI\ExpressionBinding.cs" />
     <Compile Include="System.Web.UI\ExpressionBindingCollection.cs" />
     <Compile Include="System.Web.UI\ExtractTemplateValuesMethod.cs" />
@@ -1268,9 +1271,9 @@
     <Compile Include="System.Web.UI\Html32TextWriter.cs" />
     <Compile Include="System.Web.UI\HtmlControlPersistableAttribute.cs" />
     <Compile Include="System.Web.UI\HtmlTextWriter.cs" />
-    <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />
     <Compile Include="System.Web.UI\IScriptManager.cs" />
     <Compile Include="System.Web.UI\ITagNameToTypeMapper.cs" />
+    <Compile Include="System.Web.UI\IgnoreUnknownContentAttribute.cs" />
     <Compile Include="System.Web.UI\ListSourceHelper.cs" />
     <Compile Include="System.Web.UI\LiteralControl.cs" />
     <Compile Include="System.Web.UI\LosFormatter.cs" />
@@ -1348,9 +1351,9 @@
     <Compile Include="System.Web.UI\WebHandlerParser.cs" />
     <Compile Include="System.Web.UI\WebResourceAttribute.cs" />
     <Compile Include="System.Web.UI\WebServiceParser.cs" />
+    <Compile Include="System.Web.UI\XPathBinder.cs" />
     <Compile Include="System.Web.UI\XhtmlMobileDocType.cs" />
     <Compile Include="System.Web.UI\XhtmlTextWriter.cs" />
-    <Compile Include="System.Web.UI\XPathBinder.cs" />
     <Compile Include="System.Web.Util\AltSerialization.cs" />
     <Compile Include="System.Web.Util\DataSourceHelper.cs" />
     <Compile Include="System.Web.Util\DataSourceResolver.cs" />
@@ -1396,13 +1399,13 @@
     <Compile Include="System.Web\HttpApplicationFactory.cs" />
     <Compile Include="System.Web\HttpApplicationState.cs" />
     <Compile Include="System.Web\HttpBrowserCapabilities.cs" />
-    <Compile Include="System.Web\HttpCacheability.cs" />
     <Compile Include="System.Web\HttpCachePolicy.cs" />
     <Compile Include="System.Web\HttpCacheRevalidation.cs" />
     <Compile Include="System.Web\HttpCacheValidateHandler.cs" />
     <Compile Include="System.Web\HttpCacheVaryByContentEncodings.cs" />
     <Compile Include="System.Web\HttpCacheVaryByHeaders.cs" />
     <Compile Include="System.Web\HttpCacheVaryByParams.cs" />
+    <Compile Include="System.Web\HttpCacheability.cs" />
     <Compile Include="System.Web\HttpClientCertificate.cs" />
     <Compile Include="System.Web\HttpCompileException.cs" />
     <Compile Include="System.Web\HttpContext.cs" />
@@ -1442,10 +1445,10 @@
     <Compile Include="System.Web\HttpWorkerRequest.cs" />
     <Compile Include="System.Web\HttpWriter.cs" />
     <Compile Include="System.Web\IHttpMapPath.cs" />
+    <Compile Include="System.Web\IPartitionResolver.cs" />
     <Compile Include="System.Web\IisTraceListener.cs" />
     <Compile Include="System.Web\InputFilterStream.cs" />
     <Compile Include="System.Web\IntPtrStream.cs" />
-    <Compile Include="System.Web\IPartitionResolver.cs" />
     <Compile Include="System.Web\MimeMapping.cs" />
     <Compile Include="System.Web\MimeTypes.cs" />
     <Compile Include="System.Web\NoParamsInvoker.cs" />
@@ -1481,8 +1484,8 @@
     <Compile Include="System.Web\WebPageTraceListener.cs" />
     <Compile Include="System.Web\WebROCollection.cs" />
     <Compile Include="System.Web\XmlSiteMapProvider.cs" />
-    <Compile Include="System.Web\UplevelHelper.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj
index affc4a49763..f3d9d9353f3 100644
--- a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj
+++ b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -97,10 +97,10 @@
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\CompareMethod.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\Cursor.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\CursorEventArgs.cs" />
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomizeLegendEventArgs.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomLabel.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomLabelCollection.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomProperties.cs" />
+    <Compile Include="System.Windows.Forms.DataVisualization.Charting\CustomizeLegendEventArgs.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataFormula.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataManipulator.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\DataPoint.cs" />
@@ -111,9 +111,9 @@
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\Docking.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\ElementPosition.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\EllipseAnnotation.cs" />
+    <Compile Include="System.Windows.Forms.DataVisualization.Charting\FTestResult.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\FinancialFormula.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\FormatNumberEventArgs.cs" />
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\FTestResult.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\GradientStyle.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\Grid.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\GridTickTypes.cs" />
@@ -171,6 +171,7 @@
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\StatisticFormula.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\StripLine.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\StripLinesCollection.cs" />
+    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TTestResult.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextAnnotation.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextAntiAliasingQuality.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\TextOrientation.cs" />
@@ -180,11 +181,11 @@
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\Title.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\TitleCollection.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\ToolTipEventArgs.cs" />
-    <Compile Include="System.Windows.Forms.DataVisualization.Charting\TTestResult.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\VerticalLineAnnotation.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\ViewEventArgs.cs" />
     <Compile Include="System.Windows.Forms.DataVisualization.Charting\ZTestResult.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj
index 75e6869f6cf..69aef31454a 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="..\System\System\MonoToolsLocator.cs" />
@@ -107,8 +107,8 @@
     <Compile Include="System.Windows.Forms.RTF\Color.cs" />
     <Compile Include="System.Windows.Forms.RTF\DestinationDelegate.cs" />
     <Compile Include="System.Windows.Forms.RTF\Font.cs" />
-    <Compile Include="System.Windows.Forms.RTF\KeysInit.cs" />
     <Compile Include="System.Windows.Forms.RTF\KeyStruct.cs" />
+    <Compile Include="System.Windows.Forms.RTF\KeysInit.cs" />
     <Compile Include="System.Windows.Forms.RTF\Major.cs" />
     <Compile Include="System.Windows.Forms.RTF\Minor.cs" />
     <Compile Include="System.Windows.Forms.RTF\Picture.cs" />
@@ -143,8 +143,8 @@
     <Compile Include="System.Windows.Forms.VisualStyles\ComboBoxState.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\ContentAlignment.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\EdgeEffects.cs" />
-    <Compile Include="System.Windows.Forms.VisualStyles\Edges.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\EdgeStyle.cs" />
+    <Compile Include="System.Windows.Forms.VisualStyles\Edges.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\EnumProperty.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\FilenameProperty.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\FillType.cs" />
@@ -156,11 +156,11 @@
     <Compile Include="System.Windows.Forms.VisualStyles\HitTestCode.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\HitTestOptions.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\HorizontalAlign.cs" />
+    <Compile Include="System.Windows.Forms.VisualStyles\IVisualStyles.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\IconEffect.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\ImageOrientation.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\ImageSelectType.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\IntegerProperty.cs" />
-    <Compile Include="System.Windows.Forms.VisualStyles\IVisualStyles.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\MarginProperty.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\OffsetType.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\PointProperty.cs" />
@@ -186,10 +186,10 @@
     <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleElement.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleInformation.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleRenderer.cs" />
+    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleState.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesEngine.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesGtkPlus.cs" />
     <Compile Include="System.Windows.Forms.VisualStyles\VisualStylesNative.cs" />
-    <Compile Include="System.Windows.Forms.VisualStyles\VisualStyleState.cs" />
     <Compile Include="System.Windows.Forms.WebBrowserDialogs\AlertCheck.cs" />
     <Compile Include="System.Windows.Forms.WebBrowserDialogs\ConfirmCheck.cs" />
     <Compile Include="System.Windows.Forms.WebBrowserDialogs\Generic.cs" />
@@ -230,8 +230,8 @@
     <Compile Include="System.Windows.Forms\BindingManagerDataErrorEventHandler.cs" />
     <Compile Include="System.Windows.Forms\BindingMemberInfo.cs" />
     <Compile Include="System.Windows.Forms\BindingNavigator.cs" />
-    <Compile Include="System.Windows.Forms\BindingsCollection.cs" />
     <Compile Include="System.Windows.Forms\BindingSource.cs" />
+    <Compile Include="System.Windows.Forms\BindingsCollection.cs" />
     <Compile Include="System.Windows.Forms\BootMode.cs" />
     <Compile Include="System.Windows.Forms\Border3DSide.cs" />
     <Compile Include="System.Windows.Forms\Border3DStyle.cs" />
@@ -249,8 +249,8 @@
     <Compile Include="System.Windows.Forms\CharacterCasing.cs" />
     <Compile Include="System.Windows.Forms\CheckBox.cs" />
     <Compile Include="System.Windows.Forms\CheckBoxRenderer.cs" />
-    <Compile Include="System.Windows.Forms\CheckedListBox.cs" />
     <Compile Include="System.Windows.Forms\CheckState.cs" />
+    <Compile Include="System.Windows.Forms\CheckedListBox.cs" />
     <Compile Include="System.Windows.Forms\Clipboard.cs" />
     <Compile Include="System.Windows.Forms\CloseReason.cs" />
     <Compile Include="System.Windows.Forms\ColorDepth.cs" />
@@ -376,9 +376,9 @@
     <Compile Include="System.Windows.Forms\DataGridViewDataErrorContexts.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewDataErrorEventArgs.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewDataErrorEventHandler.cs" />
+    <Compile Include="System.Windows.Forms\DataGridViewEditMode.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewEditingControlShowingEventArgs.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewEditingControlShowingEventHandler.cs" />
-    <Compile Include="System.Windows.Forms\DataGridViewEditMode.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewElement.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewElementStates.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewHeaderBorderStyle.cs" />
@@ -412,12 +412,12 @@
     <Compile Include="System.Windows.Forms\DataGridViewRowPostPaintEventHandler.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewRowPrePaintEventArgs.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewRowPrePaintEventHandler.cs" />
+    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventArgs.cs" />
+    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventHandler.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewRowsAddedEventArgs.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewRowsAddedEventHandler.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewRowsRemovedEventArgs.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewRowsRemovedEventHandler.cs" />
-    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventArgs.cs" />
-    <Compile Include="System.Windows.Forms\DataGridViewRowStateChangedEventHandler.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewSelectedCellCollection.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewSelectedColumnCollection.cs" />
     <Compile Include="System.Windows.Forms\DataGridViewSelectedRowCollection.cs" />
@@ -439,9 +439,9 @@
     <Compile Include="System.Windows.Forms\DateTimePickerFormat.cs" />
     <Compile Include="System.Windows.Forms\Day.cs" />
     <Compile Include="System.Windows.Forms\DialogResult.cs" />
+    <Compile Include="System.Windows.Forms\DockStyle.cs" />
     <Compile Include="System.Windows.Forms\DockingAttribute.cs" />
     <Compile Include="System.Windows.Forms\DockingBehavior.cs" />
-    <Compile Include="System.Windows.Forms\DockStyle.cs" />
     <Compile Include="System.Windows.Forms\DomainUpDown.cs" />
     <Compile Include="System.Windows.Forms\DragAction.cs" />
     <Compile Include="System.Windows.Forms\DragDropEffects.cs" />
@@ -496,10 +496,12 @@
     <Compile Include="System.Windows.Forms\GridItem.cs" />
     <Compile Include="System.Windows.Forms\GridItemCollection.cs" />
     <Compile Include="System.Windows.Forms\GridItemType.cs" />
-    <Compile Include="System.Windows.Forms\GridTablesFactory.cs" />
     <Compile Include="System.Windows.Forms\GridTableStylesCollection.cs" />
+    <Compile Include="System.Windows.Forms\GridTablesFactory.cs" />
     <Compile Include="System.Windows.Forms\GroupBox.cs" />
     <Compile Include="System.Windows.Forms\GroupBoxRenderer.cs" />
+    <Compile Include="System.Windows.Forms\HScrollBar.cs" />
+    <Compile Include="System.Windows.Forms\HScrollProperties.cs" />
     <Compile Include="System.Windows.Forms\HandledMouseEventArgs.cs" />
     <Compile Include="System.Windows.Forms\Help.cs" />
     <Compile Include="System.Windows.Forms\HelpEventArgs.cs" />
@@ -507,8 +509,6 @@
     <Compile Include="System.Windows.Forms\HelpNavigator.cs" />
     <Compile Include="System.Windows.Forms\HelpProvider.cs" />
     <Compile Include="System.Windows.Forms\HorizontalAlignment.cs" />
-    <Compile Include="System.Windows.Forms\HScrollBar.cs" />
-    <Compile Include="System.Windows.Forms\HScrollProperties.cs" />
     <Compile Include="System.Windows.Forms\HtmlDocument.cs" />
     <Compile Include="System.Windows.Forms\HtmlElement.cs" />
     <Compile Include="System.Windows.Forms\HtmlElementCollection.cs" />
@@ -536,6 +536,11 @@
     <Compile Include="System.Windows.Forms\IFeatureSupport.cs" />
     <Compile Include="System.Windows.Forms\IFileReaderService.cs" />
     <Compile Include="System.Windows.Forms\IKeyFilter.cs" />
+    <Compile Include="System.Windows.Forms\IMessageFilter.cs" />
+    <Compile Include="System.Windows.Forms\IRootGridEntry.cs" />
+    <Compile Include="System.Windows.Forms\IToolStripData.cs" />
+    <Compile Include="System.Windows.Forms\IWin32Window.cs" />
+    <Compile Include="System.Windows.Forms\IWindowTarget.cs" />
     <Compile Include="System.Windows.Forms\ImageIndexConverter.cs" />
     <Compile Include="System.Windows.Forms\ImageKeyConverter.cs" />
     <Compile Include="System.Windows.Forms\ImageLayout.cs" />
@@ -543,7 +548,6 @@
     <Compile Include="System.Windows.Forms\ImageListConverter.cs" />
     <Compile Include="System.Windows.Forms\ImageListStreamer.cs" />
     <Compile Include="System.Windows.Forms\ImeMode.cs" />
-    <Compile Include="System.Windows.Forms\IMessageFilter.cs" />
     <Compile Include="System.Windows.Forms\ImplicitHScrollBar.cs" />
     <Compile Include="System.Windows.Forms\ImplicitVScrollBar.cs" />
     <Compile Include="System.Windows.Forms\InputLanguage.cs" />
@@ -556,25 +560,21 @@
     <Compile Include="System.Windows.Forms\InternalWindowManager.cs" />
     <Compile Include="System.Windows.Forms\InvalidateEventArgs.cs" />
     <Compile Include="System.Windows.Forms\InvalidateEventHandler.cs" />
-    <Compile Include="System.Windows.Forms\IRootGridEntry.cs" />
     <Compile Include="System.Windows.Forms\ItemActivation.cs" />
     <Compile Include="System.Windows.Forms\ItemBoundsPortion.cs" />
     <Compile Include="System.Windows.Forms\ItemChangedEventArgs.cs" />
     <Compile Include="System.Windows.Forms\ItemChangedEventHandler.cs" />
-    <Compile Include="System.Windows.Forms\ItemCheckedEventArgs.cs" />
-    <Compile Include="System.Windows.Forms\ItemCheckedEventHandler.cs" />
     <Compile Include="System.Windows.Forms\ItemCheckEventArgs.cs" />
     <Compile Include="System.Windows.Forms\ItemCheckEventHandler.cs" />
+    <Compile Include="System.Windows.Forms\ItemCheckedEventArgs.cs" />
+    <Compile Include="System.Windows.Forms\ItemCheckedEventHandler.cs" />
     <Compile Include="System.Windows.Forms\ItemDragEventArgs.cs" />
     <Compile Include="System.Windows.Forms\ItemDragEventHandler.cs" />
-    <Compile Include="System.Windows.Forms\IToolStripData.cs" />
-    <Compile Include="System.Windows.Forms\IWin32Window.cs" />
-    <Compile Include="System.Windows.Forms\IWindowTarget.cs" />
-    <Compile Include="System.Windows.Forms\KeyboardLayouts.cs" />
     <Compile Include="System.Windows.Forms\KeyEventArgs.cs" />
     <Compile Include="System.Windows.Forms\KeyEventHandler.cs" />
     <Compile Include="System.Windows.Forms\KeyPressEventArgs.cs" />
     <Compile Include="System.Windows.Forms\KeyPressEventHandler.cs" />
+    <Compile Include="System.Windows.Forms\KeyboardLayouts.cs" />
     <Compile Include="System.Windows.Forms\Keys.cs" />
     <Compile Include="System.Windows.Forms\KeysConverter.cs" />
     <Compile Include="System.Windows.Forms\Label.cs" />
@@ -618,11 +618,13 @@
     <Compile Include="System.Windows.Forms\ListViewItemStates.cs" />
     <Compile Include="System.Windows.Forms\ListViewVirtualItemsSelectionRangeChangedEventArgs.cs" />
     <Compile Include="System.Windows.Forms\ListViewVirtualItemsSelectionRangeChangedEventHandler.cs" />
+    <Compile Include="System.Windows.Forms\MWFCategoryAttribute.cs" />
+    <Compile Include="System.Windows.Forms\MWFDescriptionAttribute.cs" />
     <Compile Include="System.Windows.Forms\MainMenu.cs" />
-    <Compile Include="System.Windows.Forms\MaskedTextBox.cs" />
     <Compile Include="System.Windows.Forms\MaskFormat.cs" />
     <Compile Include="System.Windows.Forms\MaskInputRejectedEventArgs.cs" />
     <Compile Include="System.Windows.Forms\MaskInputRejectedEventHandler.cs" />
+    <Compile Include="System.Windows.Forms\MaskedTextBox.cs" />
     <Compile Include="System.Windows.Forms\MdiClient.cs" />
     <Compile Include="System.Windows.Forms\MdiControlStrip.cs" />
     <Compile Include="System.Windows.Forms\MdiLayout.cs" />
@@ -649,8 +651,6 @@
     <Compile Include="System.Windows.Forms\MouseButtons.cs" />
     <Compile Include="System.Windows.Forms\MouseEventArgs.cs" />
     <Compile Include="System.Windows.Forms\MouseEventHandler.cs" />
-    <Compile Include="System.Windows.Forms\MWFCategoryAttribute.cs" />
-    <Compile Include="System.Windows.Forms\MWFDescriptionAttribute.cs" />
     <Compile Include="System.Windows.Forms\NativeWindow.cs" />
     <Compile Include="System.Windows.Forms\NavigateEventArgs.cs" />
     <Compile Include="System.Windows.Forms\NavigateEventHandler.cs" />
@@ -661,11 +661,11 @@
     <Compile Include="System.Windows.Forms\NumericUpDown.cs" />
     <Compile Include="System.Windows.Forms\NumericUpDownAcceleration.cs" />
     <Compile Include="System.Windows.Forms\NumericUpDownAccelerationCollection.cs" />
+    <Compile Include="System.Windows.Forms\OSFeature.cs" />
     <Compile Include="System.Windows.Forms\OpacityConverter.cs" />
     <Compile Include="System.Windows.Forms\OpenFileDialog.cs" />
     <Compile Include="System.Windows.Forms\OpenTreeNodeEnumerator.cs" />
     <Compile Include="System.Windows.Forms\Orientation.cs" />
-    <Compile Include="System.Windows.Forms\OSFeature.cs" />
     <Compile Include="System.Windows.Forms\OwnerDrawPropertyBag.cs" />
     <Compile Include="System.Windows.Forms\Padding.cs" />
     <Compile Include="System.Windows.Forms\PaddingConverter.cs" />
@@ -687,8 +687,8 @@
     <Compile Include="System.Windows.Forms\PrintDialog.cs" />
     <Compile Include="System.Windows.Forms\PrintPreviewControl.cs" />
     <Compile Include="System.Windows.Forms\PrintPreviewDialog.cs" />
-    <Compile Include="System.Windows.Forms\ProfessionalColors.cs" />
     <Compile Include="System.Windows.Forms\ProfessionalColorTable.cs" />
+    <Compile Include="System.Windows.Forms\ProfessionalColors.cs" />
     <Compile Include="System.Windows.Forms\ProgressBar.cs" />
     <Compile Include="System.Windows.Forms\ProgressBarRenderer.cs" />
     <Compile Include="System.Windows.Forms\ProgressBarStyle.cs" />
@@ -729,7 +729,6 @@
     <Compile Include="System.Windows.Forms\SaveFileDialog.cs" />
     <Compile Include="System.Windows.Forms\Screen.cs" />
     <Compile Include="System.Windows.Forms\ScreenOrientation.cs" />
-    <Compile Include="System.Windows.Forms\ScrollableControl.cs" />
     <Compile Include="System.Windows.Forms\ScrollBar.cs" />
     <Compile Include="System.Windows.Forms\ScrollBarRenderer.cs" />
     <Compile Include="System.Windows.Forms\ScrollBars.cs" />
@@ -739,6 +738,7 @@
     <Compile Include="System.Windows.Forms\ScrollEventType.cs" />
     <Compile Include="System.Windows.Forms\ScrollOrientation.cs" />
     <Compile Include="System.Windows.Forms\ScrollProperties.cs" />
+    <Compile Include="System.Windows.Forms\ScrollableControl.cs" />
     <Compile Include="System.Windows.Forms\SearchDirectionHint.cs" />
     <Compile Include="System.Windows.Forms\SearchForVirtualItemEventArgs.cs" />
     <Compile Include="System.Windows.Forms\SearchForVirtualItemEventHandler.cs" />
@@ -783,6 +783,9 @@
     <Compile Include="System.Windows.Forms\TabControlEventArgs.cs" />
     <Compile Include="System.Windows.Forms\TabControlEventHandler.cs" />
     <Compile Include="System.Windows.Forms\TabDrawMode.cs" />
+    <Compile Include="System.Windows.Forms\TabPage.cs" />
+    <Compile Include="System.Windows.Forms\TabRenderer.cs" />
+    <Compile Include="System.Windows.Forms\TabSizeMode.cs" />
     <Compile Include="System.Windows.Forms\TableLayoutCellPaintEventArgs.cs" />
     <Compile Include="System.Windows.Forms\TableLayoutCellPaintEventHandler.cs" />
     <Compile Include="System.Windows.Forms\TableLayoutColumnStyleCollection.cs" />
@@ -795,9 +798,6 @@
     <Compile Include="System.Windows.Forms\TableLayoutSettings.cs" />
     <Compile Include="System.Windows.Forms\TableLayoutStyle.cs" />
     <Compile Include="System.Windows.Forms\TableLayoutStyleCollection.cs" />
-    <Compile Include="System.Windows.Forms\TabPage.cs" />
-    <Compile Include="System.Windows.Forms\TabRenderer.cs" />
-    <Compile Include="System.Windows.Forms\TabSizeMode.cs" />
     <Compile Include="System.Windows.Forms\TextBox.cs" />
     <Compile Include="System.Windows.Forms\TextBoxBase.cs" />
     <Compile Include="System.Windows.Forms\TextBoxRenderer.cs" />
@@ -833,9 +833,9 @@
     <Compile Include="System.Windows.Forms\ToolStripControlHost.cs" />
     <Compile Include="System.Windows.Forms\ToolStripDropDown.cs" />
     <Compile Include="System.Windows.Forms\ToolStripDropDownButton.cs" />
+    <Compile Include="System.Windows.Forms\ToolStripDropDownCloseReason.cs" />
     <Compile Include="System.Windows.Forms\ToolStripDropDownClosedEventArgs.cs" />
     <Compile Include="System.Windows.Forms\ToolStripDropDownClosedEventHandler.cs" />
-    <Compile Include="System.Windows.Forms\ToolStripDropDownCloseReason.cs" />
     <Compile Include="System.Windows.Forms\ToolStripDropDownClosingEventArgs.cs" />
     <Compile Include="System.Windows.Forms\ToolStripDropDownClosingEventHandler.cs" />
     <Compile Include="System.Windows.Forms\ToolStripDropDownDirection.cs" />
@@ -877,10 +877,10 @@
     <Compile Include="System.Windows.Forms\ToolStripPanelRow.cs" />
     <Compile Include="System.Windows.Forms\ToolStripProfessionalRenderer.cs" />
     <Compile Include="System.Windows.Forms\ToolStripProgressBar.cs" />
-    <Compile Include="System.Windows.Forms\ToolStripRenderer.cs" />
     <Compile Include="System.Windows.Forms\ToolStripRenderEventArgs.cs" />
     <Compile Include="System.Windows.Forms\ToolStripRenderEventHandler.cs" />
     <Compile Include="System.Windows.Forms\ToolStripRenderMode.cs" />
+    <Compile Include="System.Windows.Forms\ToolStripRenderer.cs" />
     <Compile Include="System.Windows.Forms\ToolStripSeparator.cs" />
     <Compile Include="System.Windows.Forms\ToolStripSeparatorRenderEventArgs.cs" />
     <Compile Include="System.Windows.Forms\ToolStripSeparatorRenderEventHandler.cs" />
@@ -925,10 +925,10 @@
     <Compile Include="System.Windows.Forms\UpDownEventArgs.cs" />
     <Compile Include="System.Windows.Forms\UpDownEventHandler.cs" />
     <Compile Include="System.Windows.Forms\UserControl.cs" />
-    <Compile Include="System.Windows.Forms\ValidationConstraints.cs" />
-    <Compile Include="System.Windows.Forms\View.cs" />
     <Compile Include="System.Windows.Forms\VScrollBar.cs" />
     <Compile Include="System.Windows.Forms\VScrollProperties.cs" />
+    <Compile Include="System.Windows.Forms\ValidationConstraints.cs" />
+    <Compile Include="System.Windows.Forms\View.cs" />
     <Compile Include="System.Windows.Forms\WebBrowser.cs" />
     <Compile Include="System.Windows.Forms\WebBrowserBase.cs" />
     <Compile Include="System.Windows.Forms\WebBrowserDocumentCompletedEventArgs.cs" />
@@ -959,6 +959,7 @@
     <Compile Include="System.Windows.Forms\XplatUIWin32.cs" />
     <Compile Include="System.Windows.Forms\XplatUIX11.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Windows/System.Windows.csproj b/mcs/class/System.Windows/System.Windows.csproj
index d15db2b035d..e0ef3a3d4c4 100644
--- a/mcs/class/System.Windows/System.Windows.csproj
+++ b/mcs/class/System.Windows/System.Windows.csproj
@@ -103,11 +103,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj b/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj
index a8f15f8b508..f49b0fa467c 100644
--- a/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj
+++ b/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj
@@ -44,11 +44,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj
index 78095e8ada5..128351a9ab8 100644
--- a/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj
+++ b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj
@@ -44,11 +44,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj
index 660343f53a5..803e552c0c1 100644
--- a/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj
+++ b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj
@@ -44,11 +44,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.XML/System.Xml.csproj b/mcs/class/System.XML/System.Xml.csproj
index c3245d37972..acea5f37ba6 100644
--- a/mcs/class/System.XML/System.Xml.csproj
+++ b/mcs/class/System.XML/System.Xml.csproj
@@ -117,6 +117,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
@@ -135,21 +136,19 @@
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorStack.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlRawWriterWrapper.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\SourceLineInfo.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlNodeKindFlags.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQualifiedNameTest.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryCardinality.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryType.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryTypeFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPathConvert.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXpathBuilder.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathAxis.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathCompileException.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathOperator.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathParser.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathScanner.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPathConvert.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlNodeKindFlags.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQualifiedNameTest.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryCardinality.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryType.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlQueryTypeFactory.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XslException.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\IErrorHelper.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Keywords.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\Action.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ActionFrame.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\ApplyImportsAction.cs" />
@@ -221,23 +220,22 @@
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltCompileContext.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltDebugger.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XsltOld\XsltOutput.cs" />
-    <Compile Include="..\referencesource\System.Xml\misc\HResults.cs" />
-    <Compile Include="..\referencesource\System.Xml\misc\InvariantComparer.cs" />
-    <Compile Include="..\referencesource\System.Xml\misc\PrivilegedConfigurationManager.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\IErrorHelper.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Keywords.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Assembly\System.Xml.Assembly.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\AsyncHelper.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Base64Decoder.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Base64Encoder.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Base64EncoderAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexDecoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexEncoder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexEncoderAsync.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\BinXmltoken.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\SqlUtils.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReader.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\BinaryXml\XmlBinaryReaderAsync.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexDecoder.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexEncoder.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\BinHexEncoderAsync.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Bits.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\BitStack.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Bits.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\ByteStack.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\Shape.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Cache\ShapeGenerator.cs" />
@@ -262,9 +260,9 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapter.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParserAdapterAsync.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IDtdParserAsync.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IncrementalReadDecoders.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IRemovableWriter.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IValidationEventHandling.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Core\IncrementalReadDecoders.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Core\NamespaceHandling.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Core\NewLineHandling.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Core\QueryOutputWriter.cs" />
@@ -328,9 +326,10 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Core\XsdValidatingReaderAsync.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\DiagnosticsSwitches.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentSchemaValidator.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentXmlWriter.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentXPathNavigator.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DocumentXmlWriter.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\DomNameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XPathNodeList.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlAttribute.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlAttributeCollection.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlCDataSection.cs" />
@@ -352,8 +351,8 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlLinkedNode.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlLoader.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlName.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodemap.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodeMap.SmallXmlNodeList.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNamedNodemap.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNode.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventArgs.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlNodeChangedEventHandler.cs" />
@@ -365,7 +364,6 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlText.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlUnspecifiedAttribute.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XmlWhitespace.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Dom\XPathNodeList.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\EmptyEnumerator.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\HWStack.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\IApplicationResourceStreamResolver.cs" />
@@ -393,9 +391,9 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DtdParserAsync.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\DtdValidator.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\FacetChecker.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\IXmlSchemaInfo.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Inference\Infer.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Inference\XmlSchemaInferenceException.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\IXmlSchemaInfo.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\NamespaceList.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\Parser.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\ParserAsync.cs" />
@@ -485,7 +483,6 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdDateTime.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdDuration.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Schema\XsdValidator.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\_Events.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeGenerationoptions.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifier.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeIdentifiers.cs" />
@@ -493,29 +490,9 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SchemaObjectWriter.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemas.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerNamespaces.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\_Events.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\ValidateNames.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlCharType.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlComplianceUtil.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlConvert.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlDownloadManager.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlDownloadManagerAsync.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlEncoding.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlException.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNamespacemanager.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNamespaceScope.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNameTable.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNodeOrder.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNodeType.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNullResolver.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlQualifiedName.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlReservedNs.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlResolver.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlResolverAsync.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlSecureResolver.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlSecureResolverAsync.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlUrlResolver.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlUrlResolverAsync.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlXapResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\IXPathNavigable.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\AbsoluteQuery.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\AstNode.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\AttributeQuery.cs" />
@@ -531,8 +508,8 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\CompiledXPathExpr.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ContextQuery.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantBaseQuery.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantoverDescendantQuery.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantQuery.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DescendantoverDescendantQuery.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\DocumentorderQuery.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\EmptyQuery.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\ExtensionQuery.cs" />
@@ -583,7 +560,6 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelectionIterator.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSelfQuery.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\Internal\XPathSingletonIterator.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\IXPathNavigable.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathDocument.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathException.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathExpr.cs" />
@@ -594,288 +570,50 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNavigatorReader.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNodeIterator.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\XPath\XPathNodeType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlCharType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlComplianceUtil.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlConvert.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlDownloadManager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlDownloadManagerAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlEncoding.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlException.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNameTable.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNamespaceScope.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNamespacemanager.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNodeOrder.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNodeType.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlNullResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlQualifiedName.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlReservedNs.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlSecureResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlSecureResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlUrlResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlUrlResolverAsync.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\XmlXapResolver.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XslTransform.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltArgumentList.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltContext.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltException.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XslTransform.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XsltSettings.cs" />
+    <Compile Include="..\referencesource\System.Xml\misc\HResults.cs" />
+    <Compile Include="..\referencesource\System.Xml\misc\InvariantComparer.cs" />
+    <Compile Include="..\referencesource\System.Xml\misc\PrivilegedConfigurationManager.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="ReferenceSources\BinaryCompatibility.cs" />
     <Compile Include="ReferenceSources\LocalAppContextSwitches.cs" />
     <Compile Include="ReferenceSources\Res.cs" />
     <Compile Include="ReferenceSources\ThisAssembly.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\GenerateHelper.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\IteratorDescriptor.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\OptimizerPatterns.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\StaticDataManager.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\TailCallAnalyzer.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILAnnotation.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILConstructAnalyzer.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILModule.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimization.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlILOptimizerVisitor.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTrace.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlTypeHelper.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\XmlIlVisitor.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilBinary.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilChoice.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilCloneVisitor.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilDataSource.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilExpression.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFactory.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilFunction.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvoke.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeEarlyBound.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilInvokeLateBound.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilIterator.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilList.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLiteral.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilLoop.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilName.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNode.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilNodeType.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilParameter.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternFactory.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilPatternVisitor.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReference.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilReplaceVisitor.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilScopedVisitor.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilSortKey.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilStrConcat.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTargetType.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTernary.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilTypeChecker.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilUnary.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilValidationVisitor.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilVisitor.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlReader.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\QilXmlWriter.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SerializationHints.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\SubstitutionList.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\QIL\WhitespaceRule.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\ContentIterators.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\DodSequenceMerge.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SetIterators.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\SiblingIterators.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\TreeIterators.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleLookup.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\WhitespaceRuleReader.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlAggregates.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlCollation.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlExtensionFunction.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILIndex.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlILStorageConverter.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlIterators.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlNavigatorFilter.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryContext.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryOutput.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryRuntime.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQuerySequence.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlQueryStaticData.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSequenceWriter.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKey.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XmlSortKeyAccumulator.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XslNumber.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltConvert.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltFunctions.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltLibrary.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlILCommand.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlIlGenerator.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXPathEnvironment.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathBuilder.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathContext.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathQilFactory.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Compiler.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\CompilerScopeManager.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Focus.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\InvokeGenerator.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\KeyMatchBuilder.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\MatcherBuilder.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\OutputScopeManager.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGenerator.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilGeneratorEnv.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\QilStrConcatenator.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Scripts.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Stylesheet.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternBuilder.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XPathPatternParser.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAst.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAstAnalyzer.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslFlags.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltInput.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltLoader.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltQilFactory.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslVisitor.cs" />
-    <Compile Include="..\referencesource\System.Xml\InternalApis\NDP_Common\inc\Win8Helpers.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Advanced\SchemaImporterExtension.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\AppSettings.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeExporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\CodeGenerator.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Compilation.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Compiler.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\ConfigurationStrings.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\DateTimeSerializationSection.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElement.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionElementCollection.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionsSection.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SerializationSectionGroup.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\XmlSerializerSection.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\indentedWriter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\IXmlSerializable.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\IXmlTextParser.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Mappings.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Models.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\NameTable.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\PrimitiveXmlSerializers.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SchemaImporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapAttributes.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapCodeExporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapElementAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaExporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapSchemaImporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapSchemamember.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\SourceInfo.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\TypeExtensions.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Types.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlAttributes.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlCodeExporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlCountingReader.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Xmlcustomformatter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttributes.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlMapping.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlMemberMapping.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlMembersMapping.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlReflectionMember.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlRootAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationILGen.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReader.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationReaderILGen.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializationWriterILGen.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializer.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTextAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTypeMapping.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XslCompiledTransform.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="ReferenceSources\CodeDom.cs" />
     <Compile Include="ReferenceSources\TypeScope.cs" />
     <Compile Include="ReferenceSources\Wsdl.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
     <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
     <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="ReferenceSources\CodeDom.cs" />
-    <Compile Include="ReferenceSources\TypeScope.cs" />
-    <Compile Include="ReferenceSources\Wsdl.cs" />
     <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
     <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
     <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
     <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
@@ -947,172 +685,14 @@
     <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
     <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="ReferenceSources\CodeDom.cs" />
-    <Compile Include="ReferenceSources\TypeScope.cs" />
-    <Compile Include="ReferenceSources\Wsdl.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="ReferenceSources\CodeDom.cs" />
     <Compile Include="ReferenceSources\TypeScope.cs" />
     <Compile Include="ReferenceSources\Wsdl.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
     <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
     <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch_runtime' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="ReferenceSources\CodeDom.cs" />
-    <Compile Include="ReferenceSources\TypeScope.cs" />
-    <Compile Include="ReferenceSources\Wsdl.cs" />
     <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
     <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
     <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
     <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
@@ -1189,88 +769,9 @@
     <Compile Include="ReferenceSources\CodeDom.cs" />
     <Compile Include="ReferenceSources\TypeScope.cs" />
     <Compile Include="ReferenceSources\Wsdl.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
     <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
     <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="ReferenceSources\CodeDom.cs" />
-    <Compile Include="ReferenceSources\TypeScope.cs" />
-    <Compile Include="ReferenceSources\Wsdl.cs" />
     <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
     <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
     <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
     <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
@@ -1342,251 +843,14 @@
     <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
     <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="ReferenceSources\CodeDom.cs" />
-    <Compile Include="ReferenceSources\TypeScope.cs" />
-    <Compile Include="ReferenceSources\Wsdl.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="ReferenceSources\CodeDom.cs" />
-    <Compile Include="ReferenceSources\TypeScope.cs" />
-    <Compile Include="ReferenceSources\Wsdl.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="ReferenceSources\CodeDom.cs" />
     <Compile Include="ReferenceSources\TypeScope.cs" />
     <Compile Include="ReferenceSources\Wsdl.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
     <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
     <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
-    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
-    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
-    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
-    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
-    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\TypeData.cs" />
-    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
-    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
-    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
-    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
-    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
-    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
-    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
-    <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
-    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include="ReferenceSources\CodeDom.cs" />
-    <Compile Include="ReferenceSources\TypeScope.cs" />
-    <Compile Include="ReferenceSources\Wsdl.cs" />
     <Compile Include="System.Xml.Serialization\ImportContext.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
-    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
     <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
     <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
     <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
@@ -1658,7 +922,7 @@
     <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
     <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
+  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\GenerateHelper.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\IteratorDescriptor.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\IlGen\OptimizerPatterns.cs" />
@@ -1734,12 +998,12 @@
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltConvert.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltFunctions.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Runtime\XsltLibrary.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlILCommand.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlIlGenerator.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\IXPathEnvironment.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathBuilder.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathContext.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XPath\XPathQilFactory.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlILCommand.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\XmlIlGenerator.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Compiler.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\CompilerScopeManager.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\Focus.cs" />
@@ -1757,10 +1021,10 @@
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAst.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslAstAnalyzer.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslFlags.cs" />
+    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslVisitor.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltInput.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltLoader.cs" />
     <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XsltQilFactory.cs" />
-    <Compile Include="..\referencesource\System.Data.SqlXml\System\Xml\Xsl\Xslt\XslVisitor.cs" />
     <Compile Include="..\referencesource\System.Xml\InternalApis\NDP_Common\inc\Win8Helpers.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Advanced\SchemaImporterExtension.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\AppSettings.cs" />
@@ -1775,7 +1039,6 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SchemaImporterExtensionsSection.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\SerializationSectionGroup.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Configuration\XmlSerializerSection.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\indentedWriter.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\IXmlSerializable.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\IXmlTextParser.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Mappings.cs" />
@@ -1811,7 +1074,6 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlChoiceIdentifierAttribute.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlCodeExporter.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlCountingReader.cs" />
-    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Xmlcustomformatter.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttribute.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlElementAttributes.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlEnumAttribute.cs" />
@@ -1840,6 +1102,8 @@
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTextAttribute.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTypeAttribute.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\XmlTypeMapping.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\Xmlcustomformatter.cs" />
+    <Compile Include="..\referencesource\System.Xml\System\Xml\Serialization\indentedWriter.cs" />
     <Compile Include="..\referencesource\System.Xml\System\Xml\Xslt\XslCompiledTransform.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
@@ -1847,9 +1111,9 @@
     <Compile Include="ReferenceSources\CodeDom.cs" />
     <Compile Include="ReferenceSources\TypeScope.cs" />
     <Compile Include="ReferenceSources\Wsdl.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
     <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
     <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
+    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
     <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
     <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
     <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
@@ -1926,9 +1190,9 @@
     <Compile Include="ReferenceSources\CodeDom.cs" />
     <Compile Include="ReferenceSources\TypeScope.cs" />
     <Compile Include="ReferenceSources\Wsdl.cs" />
-    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
     <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
     <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
+    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
     <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
     <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
     <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
@@ -2005,9 +1269,167 @@
     <Compile Include="ReferenceSources\CodeDom.cs" />
     <Compile Include="ReferenceSources\TypeScope.cs" />
     <Compile Include="ReferenceSources\Wsdl.cs" />
+    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
+    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
     <Compile Include="System.Xml.Serialization\ImportContext.cs" />
+    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
+    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
+    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
+    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
+    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
+    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
+    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
+    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
+    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
+    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\TypeData.cs" />
+    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
+    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
+    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
+    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
+    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
+    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
+    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
+    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
+    <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="ReferenceSources\CodeDom.cs" />
+    <Compile Include="ReferenceSources\TypeScope.cs" />
+    <Compile Include="ReferenceSources\Wsdl.cs" />
     <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
     <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
+    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
+    <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
+    <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
+    <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
+    <Compile Include="System.Xml.Serialization\SerializationCodeGenerator.cs" />
+    <Compile Include="System.Xml.Serialization\SerializationCodeGeneratorConfiguration.cs" />
+    <Compile Include="System.Xml.Serialization\SerializationSource.cs" />
+    <Compile Include="System.Xml.Serialization\SoapAttributeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapAttributeOverrides.cs" />
+    <Compile Include="System.Xml.Serialization\SoapAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\SoapElementAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapEnumAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapIgnoreAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapIncludeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\SoapReflectionImporter.cs" />
+    <Compile Include="System.Xml.Serialization\SoapSchemaMember.cs" />
+    <Compile Include="System.Xml.Serialization\SoapTypeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\TypeData.cs" />
+    <Compile Include="System.Xml.Serialization\TypeMember.cs" />
+    <Compile Include="System.Xml.Serialization\TypeTranslator.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAnyAttributeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAnyElementAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAnyElementAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\XmlArrayAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlArrayItemAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlArrayItemAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAttributeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAttributeOverrides.cs" />
+    <Compile Include="System.Xml.Serialization\XmlAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\XmlChoiceIdentifierAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlCustomFormatter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlDeserializationEvents.cs" />
+    <Compile Include="System.Xml.Serialization\XmlElementAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlElementAttributes.cs" />
+    <Compile Include="System.Xml.Serialization\XmlEnumAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlIgnoreAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlIncludeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlMapping.cs" />
+    <Compile Include="System.Xml.Serialization\XmlMappingAccess.cs" />
+    <Compile Include="System.Xml.Serialization\XmlMemberMapping.cs" />
+    <Compile Include="System.Xml.Serialization\XmlMembersMapping.cs" />
+    <Compile Include="System.Xml.Serialization\XmlNamespaceDeclarationsAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlReflectionImporter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlReflectionMember.cs" />
+    <Compile Include="System.Xml.Serialization\XmlRootAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSchemaExporter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSchemaImporter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSchemaProviderAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationCollectionFixupCallback.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationFixupCallback.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationGeneratedCode.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationReadCallback.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationReader.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationReaderInterpreter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationWriteCallback.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationWriter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializationWriterInterpreter.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializer.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializerAssemblyAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializerFactory.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializerImplementation.cs" />
+    <Compile Include="System.Xml.Serialization\XmlSerializerVersionAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTextAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapElementInfo.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapMember.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberAttribute.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberElement.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapMemberNamespaces.cs" />
+    <Compile Include="System.Xml.Serialization\XmlTypeMapping.cs" />
+    <Compile Include="System.Xml.Xsl\XslCompiledTransform_Mobile.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="ReferenceSources\CodeDom.cs" />
+    <Compile Include="ReferenceSources\TypeScope.cs" />
+    <Compile Include="ReferenceSources\Wsdl.cs" />
+    <Compile Include="System.Xml.Serialization\IXmlSerializable.cs" />
+    <Compile Include="System.Xml.Serialization\IXmlTextParser.cs" />
+    <Compile Include="System.Xml.Serialization\ImportContext.cs" />
     <Compile Include="System.Xml.Serialization\KeyHelper.cs" />
     <Compile Include="System.Xml.Serialization\ReflectionHelper.cs" />
     <Compile Include="System.Xml.Serialization\SchemaTypes.cs" />
diff --git a/mcs/class/System.Xaml/System.Xaml.csproj b/mcs/class/System.Xaml/System.Xaml.csproj
index e00a86c9ce2..bef534d07c2 100644
--- a/mcs/class/System.Xaml/System.Xaml.csproj
+++ b/mcs/class/System.Xaml/System.Xaml.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -82,13 +82,13 @@
     <Compile Include="System.Windows.Markup\UsableDuringInitializationAttribute.cs" />
     <Compile Include="System.Windows.Markup\ValueSerializer.cs" />
     <Compile Include="System.Windows.Markup\WhitespaceSignificantCollectionAttribute.cs" />
+    <Compile Include="System.Windows.Markup\XData.cs" />
     <Compile Include="System.Windows.Markup\XamlDeferLoadAttribute.cs" />
     <Compile Include="System.Windows.Markup\XamlSetMarkupExtensionAttribute.cs" />
     <Compile Include="System.Windows.Markup\XamlSetMarkupExtensionEventArgs.cs" />
     <Compile Include="System.Windows.Markup\XamlSetTypeConverterAttribute.cs" />
     <Compile Include="System.Windows.Markup\XamlSetTypeConverterEventArgs.cs" />
     <Compile Include="System.Windows.Markup\XamlSetValueEventArgs.cs" />
-    <Compile Include="System.Windows.Markup\XData.cs" />
     <Compile Include="System.Windows.Markup\XmlLangPropertyAttribute.cs" />
     <Compile Include="System.Windows.Markup\XmlnsCompatibleWithAttribute.cs" />
     <Compile Include="System.Windows.Markup\XmlnsDefinitionAttribute.cs" />
@@ -167,6 +167,7 @@
     <Compile Include="System.Xaml\XamlXmlWriterException.cs" />
     <Compile Include="System.Xaml\XamlXmlWriterSettings.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq.csproj
index 721fbb60093..115ff187ab4 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq.csproj
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq.csproj
@@ -102,6 +102,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\StringBuilderCache.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Collections\Generic\ArrayBuilder.cs" />
@@ -144,6 +145,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="corefx\SR.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System/System.csproj" />
diff --git a/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj b/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj
index 215d85d68b5..b404396434e 100644
--- a/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj
+++ b/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj
@@ -103,11 +103,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="TypeForwarders.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../System.XML/System.Xml.csproj" />
diff --git a/mcs/class/System/System.csproj b/mcs/class/System/System.csproj
index 8ada4de4363..51dc7b60fd2 100644
--- a/mcs/class/System/System.csproj
+++ b/mcs/class/System/System.csproj
@@ -117,6 +117,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Collections\Generic\ValueListBuilder.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\ComponentModel\DefaultValueAttribute.cs" />
@@ -162,8 +163,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\QueueDebugView.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\SortedDictionary.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\SortedList.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\SortedSet.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\SortedSet.TreeSubSet.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\SortedSet.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\SortedSetEqualityComparer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\Stack.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Collections\src\System\Collections\Generic\StackDebugView.cs" />
@@ -173,19 +174,19 @@
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\BrowsableAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\ComponentCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\DescriptionAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\DesignOnlyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\DesignerCategoryAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\DesignerSerializationVisibility.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\DesignerSerializationVisibilityAttribute.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\DesignOnlyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\DisplayNameAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\EventHandlerList.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\IContainer.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\ImmutableObjectAttribute.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\InitializationEventAttribute.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\InvalidEnumArgumentException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\ISite.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\ISupportInitialize.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\ISynchronizeInvoke.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\ImmutableObjectAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\InitializationEventAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\InvalidEnumArgumentException.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\LocalizableAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\MergablePropertyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.Primitives\src\System\ComponentModel\ReadOnlyAttribute.cs" />
@@ -223,6 +224,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\DefaultEventAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\DefaultPropertyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\DelegatingTypeDescriptionProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\DesignTimeVisibleAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\ActiveDocumentEvent.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\ActiveDocumentEventHandler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\CheckoutException.cs" />
@@ -264,8 +266,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\IHelpService.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\IInheritanceService.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\IMenuCommandService.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\InheritanceAttribute.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\InheritanceLevel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\IReferenceService.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\IResourceService.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\IRootDesigner.cs" />
@@ -275,6 +275,8 @@
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\ITypeDescriptorFilterService.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\ITypeDiscoveryService.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\ITypeResolutionService.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\InheritanceAttribute.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\InheritanceLevel.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\MenuCommand.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\PropertyTabAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\PropertyTabScope.cs" />
@@ -302,7 +304,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\StandardToolWindows.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\ToolboxItemAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Design\ViewTechnology.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\DesignTimeVisibleAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\DoubleConverter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\EditorAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\EventDescriptor.cs" />
@@ -324,23 +325,23 @@
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\IListSource.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\INestedContainer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\INestedSite.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\IRaiseItemChangedEvents.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\ISupportInitializeNotification.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\ITypeDescriptorContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\ITypedList.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\InstallerTypeAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\InstanceCreationEditor.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Int16Converter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Int32Converter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\Int64Converter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\InvalidAsynchronousStateException.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\IRaiseItemChangedEvents.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\ISupportInitializeNotification.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\ITypeDescriptorContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\ITypedList.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\LicFileLicenseProvider.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\License.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\LicenseContext.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\LicenseManager.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\LicenseProvider.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\LicenseProviderAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\LicenseUsageMode.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\LicFileLicenseProvider.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\ListBindableAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\ListChangedEventArgs.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.ComponentModel.TypeConverter\src\System\ComponentModel\ListChangedEventHandler.cs" />
@@ -488,11 +489,11 @@
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\MatchCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\Reference.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\Regex.Cache.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\Regex.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\Regex.Match.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\Regex.Replace.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\Regex.Split.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\Regex.Timeout.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\Regex.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexBoyerMoore.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexCharClass.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexCode.cs" />
@@ -529,11 +530,6 @@
     <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugReflectEventDescriptor.cs" />
     <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugReflectPropertyDescriptor.cs" />
     <Compile Include="..\referencesource\System\compmod\system\componentmodel\DebugTypeDescriptor.cs" />
-    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />
-    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />
-    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />
-    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />
-    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />
     <Compile Include="..\referencesource\System\compmod\system\componentmodel\DesignerAttribute.cs" />
     <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoWorkEventArgs.cs" />
     <Compile Include="..\referencesource\System\compmod\system\componentmodel\DoWorkEventHandler.cs" />
@@ -552,6 +548,11 @@
     <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeConverter.cs" />
     <Compile Include="..\referencesource\System\compmod\system\componentmodel\TypeDescriptor.cs" />
     <Compile Include="..\referencesource\System\compmod\system\componentmodel\Win32Exception.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\DesignerOptionService.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\NotifyParentPropertyAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\ParenthesizePropertyNameAttribute.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshProperties.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\componentmodel\design\RefreshPropertiesAttribute.cs" />
     <Compile Include="..\referencesource\System\compmod\system\diagnostics\AssertSection.cs" />
     <Compile Include="..\referencesource\System\compmod\system\diagnostics\BooleanSwitch.cs" />
     <Compile Include="..\referencesource\System\compmod\system\diagnostics\CorrelationManager.cs" />
@@ -579,34 +580,12 @@
     <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSource.cs" />
     <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSwitch.cs" />
     <Compile Include="..\referencesource\System\compmod\system\diagnostics\traceutils.cs" />
-    <Compile Include="..\referencesource\System\misc\hresults.cs" />
-    <Compile Include="..\referencesource\System\misc\invariantcomparer.cs" />
     <Compile Include="..\referencesource\System\misc\SecurityUtils.cs" />
     <Compile Include="..\referencesource\System\misc\WeakHashtable.cs" />
-    <Compile Include="..\referencesource\System\net\System\_DomainName.cs" />
-    <Compile Include="..\referencesource\System\net\System\_IPv4Address.cs" />
-    <Compile Include="..\referencesource\System\net\System\_IPv6Address.cs" />
-    <Compile Include="..\referencesource\System\net\System\_UncName.cs" />
-    <Compile Include="..\referencesource\System\net\System\_UriSyntax.cs" />
+    <Compile Include="..\referencesource\System\misc\hresults.cs" />
+    <Compile Include="..\referencesource\System\misc\invariantcomparer.cs" />
     <Compile Include="..\referencesource\System\net\System\GenericUriParser.cs" />
     <Compile Include="..\referencesource\System\net\System\IriHelper.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_Connection.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_emptywebproxy.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfo.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfoTable.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_HTTPDateParse.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_IStreams.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_LoggingObject.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_NetRes.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_PooledStream.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_ProxyChain.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_Semaphore.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_ServiceNameStore.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_TimerThread.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\_WebProxyDataBuilder.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\AuthenticationScheme.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\AuthenticationSchemeSelector.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Authorization.cs" />
@@ -615,16 +594,9 @@
     <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCacheManager.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Cache\RequestCachePolicy.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Configuration\DefaultProxySection.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\connectionpool.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\cookie.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\cookiecollection.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\cookiecontainer.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\cookieexception.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\CredentialCache.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\DnsEndPoint.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\EndPoint.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\filewebrequest.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\filewebresponse.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\FtpStatusCode.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\GlobalProxySelection.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\HttpListenerException.cs" />
@@ -637,21 +609,17 @@
     <Compile Include="..\referencesource\System\net\System\Net\ICertificatePolicy.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\ICredentials.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\ICredentialsByHost.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Internal.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\IPAddress.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\IPEndPoint.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\IPHostEntry.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\iwebproxy.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\IWebProxyFinder.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\IWebRequestCreate.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Internal.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkAccess.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkCredential.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\DuplicateAddressDetectionState.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\GatewayIPAddressInformation.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\GatewayIPAddressInformationCollection.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV4Statistics.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV6Statistics.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\interfacetype.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressCollection.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressInformation.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPAddressInformationCollection.cs" />
@@ -662,6 +630,8 @@
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPStatus.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPv4InterfaceProperties.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IPv6InterfaceProperties.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV4Statistics.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\IcmpV6Statistics.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\MulticastIPAddressInformation.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\MulticastIPAddressInformationCollection.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkAddressChange.cs" />
@@ -669,10 +639,8 @@
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInformationPermission.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInterface.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\NetworkInterfaceComponent.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\nodetype.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\OperationalStatus.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PhysicalAddress.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\pingexception.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PingOptions.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PingReply.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\PrefixOrigin.cs" />
@@ -688,13 +656,15 @@
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UdpStatistics.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformation.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\UnicastIPAddressInformationCollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\interfacetype.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\nodetype.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\NetworkInformation\pingexception.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\ProtocolViolationException.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\AuthenticatedStream.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\SecureProtocols\NegotiateEnumTypes.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\ServicePointManager.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\SocketAddress.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\SocketException.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\_MultipleConnectAsync.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\AddressFamily.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\IOControlCode.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\IPPacketInformation.cs" />
@@ -716,6 +686,7 @@
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\SocketType.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\TransmitFileFlags.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\UdpReceiveResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\_MultipleConnectAsync.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\TransportContext.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\TransportType.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\UnicodeDecodingConformance.cs" />
@@ -724,20 +695,50 @@
     <Compile Include="..\referencesource\System\net\System\Net\WebExceptionStatus.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\WebHeaderCollection.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\WebPermission.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\webproxy.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\WebRequest.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\WebRequestMethods.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\WebResponse.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\WebUtility.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_BufferOffsetSize.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_Connection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HTTPDateParse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfo.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_HeaderInfoTable.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_IStreams.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LazyAsyncResult.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_LoggingObject.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_NetRes.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_PooledStream.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_ProxyChain.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_ScatterGatherBuffers.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_Semaphore.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_ServiceNameStore.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_TimerThread.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_WebProxyDataBuilder.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\_emptywebproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\connectionpool.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookie.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookiecollection.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookiecontainer.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\cookieexception.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\filewebrequest.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\filewebresponse.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\iwebproxy.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\webproxy.cs" />
     <Compile Include="..\referencesource\System\net\System\URI.cs" />
+    <Compile Include="..\referencesource\System\net\System\URIFormatException.cs" />
+    <Compile Include="..\referencesource\System\net\System\URIPartial.cs" />
     <Compile Include="..\referencesource\System\net\System\UriEnumTypes.cs" />
     <Compile Include="..\referencesource\System\net\System\UriExt.cs" />
-    <Compile Include="..\referencesource\System\net\System\URIFormatException.cs" />
     <Compile Include="..\referencesource\System\net\System\UriHelper.cs" />
     <Compile Include="..\referencesource\System\net\System\UriHostNameType.cs" />
     <Compile Include="..\referencesource\System\net\System\UriParserTemplates.cs" />
-    <Compile Include="..\referencesource\System\net\System\URIPartial.cs" />
     <Compile Include="..\referencesource\System\net\System\UriScheme.cs" />
+    <Compile Include="..\referencesource\System\net\System\_DomainName.cs" />
+    <Compile Include="..\referencesource\System\net\System\_IPv4Address.cs" />
+    <Compile Include="..\referencesource\System\net\System\_IPv6Address.cs" />
+    <Compile Include="..\referencesource\System\net\System\_UncName.cs" />
+    <Compile Include="..\referencesource\System\net\System\_UriSyntax.cs" />
     <Compile Include="..\referencesource\System\security\system\security\Authentication\ExtendedProtection\ServiceNameCollection.cs" />
     <Compile Include="..\referencesource\System\security\system\security\Authentication\ExtendedProtection\TokenBinding.cs" />
     <Compile Include="..\referencesource\System\security\system\security\permissions\typedescriptorpermission.cs" />
@@ -772,8 +773,8 @@
     <Compile Include="Mono.AppleTls\AppleTlsStream.cs" />
     <Compile Include="Mono.AppleTls\Certificate.cs" />
     <Compile Include="Mono.AppleTls\Enums.cs" />
-    <Compile Include="Mono.AppleTls\ImportExport.cs" />
     <Compile Include="Mono.AppleTls\INativeObject.cs" />
+    <Compile Include="Mono.AppleTls\ImportExport.cs" />
     <Compile Include="Mono.AppleTls\Items.cs" />
     <Compile Include="Mono.AppleTls\Policy.cs" />
     <Compile Include="Mono.AppleTls\SecureTransport.cs" />
@@ -828,13 +829,13 @@
     <Compile Include="ReferenceSources\Logging.cs" />
     <Compile Include="ReferenceSources\NativeMethods.cs" />
     <Compile Include="ReferenceSources\RequestCacheProtocol.cs" />
+    <Compile Include="ReferenceSources\SR.cs" />
+    <Compile Include="ReferenceSources\SR2.cs" />
+    <Compile Include="ReferenceSources\SRCategoryAttribute.cs" />
     <Compile Include="ReferenceSources\SecureStringHelper.cs" />
     <Compile Include="ReferenceSources\ServerCertValidationCallback.cs" />
     <Compile Include="ReferenceSources\SettingsSectionInternal.cs" />
     <Compile Include="ReferenceSources\Socket.cs" />
-    <Compile Include="ReferenceSources\SR.cs" />
-    <Compile Include="ReferenceSources\SR2.cs" />
-    <Compile Include="ReferenceSources\SRCategoryAttribute.cs" />
     <Compile Include="ReferenceSources\Win32Exception.cs" />
     <Compile Include="System.Diagnostics\DataReceivedEventArgs.cs" />
     <Compile Include="System.Diagnostics\DataReceivedEventHandler.cs" />
@@ -857,9 +858,9 @@
     <Compile Include="System.IO\ErrorEventHandler.cs" />
     <Compile Include="System.IO\FileSystemEventArgs.cs" />
     <Compile Include="System.IO\FileSystemEventHandler.cs" />
+    <Compile Include="System.IO\IODescriptionAttribute.cs" />
     <Compile Include="System.IO\InternalBufferOverflowException.cs" />
     <Compile Include="System.IO\InvalidDataException.cs" />
-    <Compile Include="System.IO\IODescriptionAttribute.cs" />
     <Compile Include="System.IO\NotifyFilters.cs" />
     <Compile Include="System.IO\RenamedEventArgs.cs" />
     <Compile Include="System.IO\RenamedEventHandler.cs" />
@@ -882,8 +883,6 @@
     <Compile Include="System.Net.Mail\SmtpFailedRecipientException.cs" />
     <Compile Include="System.Net.Mail\SmtpFailedRecipientsException.cs" />
     <Compile Include="System.Net.Mail\SmtpStatusCode.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />
-    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPAddressCollection.cs" />
     <Compile Include="System.Net.NetworkInformation\IPGlobalProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\IPGlobalStatistics.cs" />
@@ -891,6 +890,8 @@
     <Compile Include="System.Net.NetworkInformation\IPv4InterfaceProperties.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv4InterfaceStatistics.cs" />
     <Compile Include="System.Net.NetworkInformation\IPv6InterfaceProperties.cs" />
+    <Compile Include="System.Net.NetworkInformation\IcmpV4Statistics.cs" />
+    <Compile Include="System.Net.NetworkInformation\IcmpV6Statistics.cs" />
     <Compile Include="System.Net.NetworkInformation\LinuxNetworkInterfaceMarshal.cs" />
     <Compile Include="System.Net.NetworkInformation\MacOsNetworkInterfaceMarshal.cs" />
     <Compile Include="System.Net.NetworkInformation\NetworkChange.cs" />
@@ -1000,8 +1001,271 @@
     <Compile Include="System\Platform.cs" />
     <Compile Include="System\SRDescriptionAttribute.cs" />
     <Compile Include="System\UriTypeConverter.cs" />
+    <Compile Include="corefx\NameValueCollection.cs" />
+    <Compile Include="corefx\SR.cs" />
+    <Compile Include="corefx\SR.missing.cs" />
+    <Compile Include="corefx\StringDictionary.cs" />
+    <Compile Include="corefx\ZLibNative.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\CompiledRegexRunner.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\CompiledRegexRunnerFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexCompiler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexLWCGCompiler.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
+    <Compile Include="Mono.Btls\MonoBtlsX509LookupAndroid.cs" />
+    <Compile Include="Mono.Http\NtlmClient.cs" />
+    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
+    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
+    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
+    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
+    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
+    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
+    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
+    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
+    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
+    <Compile Include="System.Net.Mail\SmtpClient.cs" />
+    <Compile Include="System.Net.Security\SslStream.cs" />
+    <Compile Include="System.Net\AuthenticationManager.cs" />
+    <Compile Include="System.Net\BufferedReadStream.cs" />
+    <Compile Include="System.Net\ChunkedInputStream.cs" />
+    <Compile Include="System.Net\ContentDecodeStream.cs" />
+    <Compile Include="System.Net\EndPointListener.cs" />
+    <Compile Include="System.Net\EndPointManager.cs" />
+    <Compile Include="System.Net\FixedSizeReadStream.cs" />
+    <Compile Include="System.Net\HttpConnection.cs" />
+    <Compile Include="System.Net\HttpListener.Mono.cs" />
+    <Compile Include="System.Net\HttpListener.cs" />
+    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
+    <Compile Include="System.Net\HttpListenerContext.cs" />
+    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
+    <Compile Include="System.Net\HttpListenerRequest.cs" />
+    <Compile Include="System.Net\HttpListenerResponse.cs" />
+    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
+    <Compile Include="System.Net\HttpWebRequest.cs" />
+    <Compile Include="System.Net\HttpWebResponse.cs" />
+    <Compile Include="System.Net\ListenerAsyncResult.cs" />
+    <Compile Include="System.Net\MacProxy.cs" />
+    <Compile Include="System.Net\MonoChunkStream.cs" />
+    <Compile Include="System.Net\NtlmClient.cs" />
+    <Compile Include="System.Net\ResponseStream.cs" />
+    <Compile Include="System.Net\ServicePoint.cs" />
+    <Compile Include="System.Net\ServicePointManager.cs" />
+    <Compile Include="System.Net\ServicePointManager.extra.cs" />
+    <Compile Include="System.Net\ServicePointScheduler.cs" />
+    <Compile Include="System.Net\WebCompletionSource.cs" />
+    <Compile Include="System.Net\WebConnection.cs" />
+    <Compile Include="System.Net\WebConnectionStream.cs" />
+    <Compile Include="System.Net\WebConnectionTunnel.cs" />
+    <Compile Include="System.Net\WebOperation.cs" />
+    <Compile Include="System.Net\WebReadStream.cs" />
+    <Compile Include="System.Net\WebRequestStream.cs" />
+    <Compile Include="System.Net\WebResponseStream.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
+    <Compile Include="System\AndroidPlatform.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
+    <Compile Include="Mono.Http\NtlmClient.cs" />
+    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
+    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
+    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
+    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
+    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
+    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
+    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
+    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
+    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
+    <Compile Include="System.Net.Mail\SmtpClient.cs" />
+    <Compile Include="System.Net.Security\SslStream.cs" />
+    <Compile Include="System.Net\AuthenticationManager.cs" />
+    <Compile Include="System.Net\BufferedReadStream.cs" />
+    <Compile Include="System.Net\ChunkedInputStream.cs" />
+    <Compile Include="System.Net\ContentDecodeStream.cs" />
+    <Compile Include="System.Net\EndPointListener.cs" />
+    <Compile Include="System.Net\EndPointManager.cs" />
+    <Compile Include="System.Net\FixedSizeReadStream.cs" />
+    <Compile Include="System.Net\HttpConnection.cs" />
+    <Compile Include="System.Net\HttpListener.Mono.cs" />
+    <Compile Include="System.Net\HttpListener.cs" />
+    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
+    <Compile Include="System.Net\HttpListenerContext.cs" />
+    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
+    <Compile Include="System.Net\HttpListenerRequest.cs" />
+    <Compile Include="System.Net\HttpListenerResponse.cs" />
+    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
+    <Compile Include="System.Net\HttpWebRequest.cs" />
+    <Compile Include="System.Net\HttpWebResponse.cs" />
+    <Compile Include="System.Net\ListenerAsyncResult.cs" />
+    <Compile Include="System.Net\MacProxy.cs" />
+    <Compile Include="System.Net\MonoChunkStream.cs" />
+    <Compile Include="System.Net\NtlmClient.cs" />
+    <Compile Include="System.Net\ResponseStream.cs" />
+    <Compile Include="System.Net\ServicePoint.cs" />
+    <Compile Include="System.Net\ServicePointManager.cs" />
+    <Compile Include="System.Net\ServicePointManager.extra.cs" />
+    <Compile Include="System.Net\ServicePointScheduler.cs" />
+    <Compile Include="System.Net\WebCompletionSource.cs" />
+    <Compile Include="System.Net\WebConnection.cs" />
+    <Compile Include="System.Net\WebConnectionStream.cs" />
+    <Compile Include="System.Net\WebConnectionTunnel.cs" />
+    <Compile Include="System.Net\WebOperation.cs" />
+    <Compile Include="System.Net\WebReadStream.cs" />
+    <Compile Include="System.Net\WebRequestStream.cs" />
+    <Compile Include="System.Net\WebResponseStream.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
+    <Compile Include="Mono.Http\NtlmClient.cs" />
+    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
+    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
+    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
+    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
+    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
+    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
+    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
+    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
+    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
+    <Compile Include="System.Net.Mail\SmtpClient.cs" />
+    <Compile Include="System.Net.Security\SslStream.cs" />
+    <Compile Include="System.Net\AuthenticationManager.cs" />
+    <Compile Include="System.Net\BufferedReadStream.cs" />
+    <Compile Include="System.Net\ChunkedInputStream.cs" />
+    <Compile Include="System.Net\ContentDecodeStream.cs" />
+    <Compile Include="System.Net\EndPointListener.cs" />
+    <Compile Include="System.Net\EndPointManager.cs" />
+    <Compile Include="System.Net\FixedSizeReadStream.cs" />
+    <Compile Include="System.Net\HttpConnection.cs" />
+    <Compile Include="System.Net\HttpListener.Mono.cs" />
+    <Compile Include="System.Net\HttpListener.cs" />
+    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
+    <Compile Include="System.Net\HttpListenerContext.cs" />
+    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
+    <Compile Include="System.Net\HttpListenerRequest.cs" />
+    <Compile Include="System.Net\HttpListenerResponse.cs" />
+    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
+    <Compile Include="System.Net\HttpWebRequest.cs" />
+    <Compile Include="System.Net\HttpWebResponse.cs" />
+    <Compile Include="System.Net\ListenerAsyncResult.cs" />
+    <Compile Include="System.Net\MacProxy.cs" />
+    <Compile Include="System.Net\MonoChunkStream.cs" />
+    <Compile Include="System.Net\NtlmClient.cs" />
+    <Compile Include="System.Net\ResponseStream.cs" />
+    <Compile Include="System.Net\ServicePoint.cs" />
+    <Compile Include="System.Net\ServicePointManager.cs" />
+    <Compile Include="System.Net\ServicePointManager.extra.cs" />
+    <Compile Include="System.Net\ServicePointScheduler.cs" />
+    <Compile Include="System.Net\WebCompletionSource.cs" />
+    <Compile Include="System.Net\WebConnection.cs" />
+    <Compile Include="System.Net\WebConnectionStream.cs" />
+    <Compile Include="System.Net\WebConnectionTunnel.cs" />
+    <Compile Include="System.Net\WebOperation.cs" />
+    <Compile Include="System.Net\WebReadStream.cs" />
+    <Compile Include="System.Net\WebRequestStream.cs" />
+    <Compile Include="System.Net\WebResponseStream.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
+    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />
+    <Compile Include="System.Net.Mail\SmtpClient.platformnotsupported.cs" />
+    <Compile Include="System.Net.Security\SslStream.platformnotsupported.cs" />
+    <Compile Include="System.Net.Sockets\TcpClient.platformnotsupported.cs" />
+    <Compile Include="System.Net.Sockets\TcpListener.platformnotsupported.cs" />
+    <Compile Include="System.Net.Sockets\UdpClient.platformnotsupported.cs" />
+    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.platformnotsupported.cs" />
+    <Compile Include="System.Net\AuthenticationManager.platformnotsupported.cs" />
+    <Compile Include="System.Net\FtpRequestCreator.platformnotsupported.cs" />
+    <Compile Include="System.Net\FtpWebRequest.platformnotsupported.cs" />
+    <Compile Include="System.Net\FtpWebResponse.platformnotsupported.cs" />
+    <Compile Include="System.Net\HttpListener.platformnotsupported.cs" />
+    <Compile Include="System.Net\HttpListenerBasicIdentity.platformnotsupported.cs" />
+    <Compile Include="System.Net\HttpListenerContext.platformnotsupported.cs" />
+    <Compile Include="System.Net\HttpListenerPrefixCollection.platformnotsupported.cs" />
+    <Compile Include="System.Net\HttpListenerRequest.platformnotsupported.cs" />
+    <Compile Include="System.Net\HttpListenerResponse.platformnotsupported.cs" />
+    <Compile Include="System.Net\HttpListenerTimeoutManager.platformnotsupported.cs" />
+    <Compile Include="System.Net\HttpWebRequest.platformnotsupported.cs" />
+    <Compile Include="System.Net\HttpWebResponse.platformnotsupported.cs" />
+    <Compile Include="System.Net\ServicePoint.platformnotsupported.cs" />
+    <Compile Include="System.Net\ServicePointManager.platformnotsupported.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|linux' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Linux\Interop.Libraries.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Linux\System.Native\Interop.INotify.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Errors.cs" />
@@ -1017,13 +1281,13 @@
     <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Stat.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\SafeDirectoryHandle.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\SafeFileHandle.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CSharpHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeObject.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeTypeReference.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeTypeReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CSharpHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\IO\TempFileCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
@@ -1081,7 +1345,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberMethod.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberProperty.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMethodInvokeExpression.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\codemethodreferenceexpression.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMethodReturnStatement.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespace.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespaceCollection.cs" />
@@ -1126,10 +1389,10 @@
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerError.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerErrorCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.Evidence.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.Evidence.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ExposedTabStringIndentedTextWriter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\GeneratorSupport.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ICodeCompiler.cs" />
@@ -1138,6 +1401,7 @@
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\LanguageOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\FieldDirection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\MemberAttributes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\codemethodreferenceexpression.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\Collections\Specialized\FixedStringLookup.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.Linux.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
@@ -1174,11 +1438,11 @@
     <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />
     <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />
     <Compile Include="Microsoft.Win32\PowerModes.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
     <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />
     <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />
     <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />
     <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
     <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />
     <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />
     <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />
@@ -1235,27 +1499,27 @@
     <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />
     <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />
     <Compile Include="System.CodeDom.Compiler\Executor.cs" />
+    <Compile Include="System.Configuration\AppSettingsReader.cs" />
     <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />
     <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />
     <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />
     <Compile Include="System.Configuration\ClientSettingsSection.cs" />
     <Compile Include="System.Configuration\ConfigHelper.cs" />
+    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
     <Compile Include="System.Configuration\ConfigurationException.cs" />
     <Compile Include="System.Configuration\ConfigurationSettings.cs" />
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
     <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />
     <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />
     <Compile Include="System.Configuration\DictionarySectionHandler.cs" />
     <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />
+    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
     <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />
     <Compile Include="System.Configuration\IConfigurationSystem.cs" />
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
+    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
+    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
     <Compile Include="System.Configuration\IdnElement.cs" />
     <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
     <Compile Include="System.Configuration\IriParsingElement.cs" />
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
     <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />
     <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />
     <Compile Include="System.Configuration\NameValueSectionHandler.cs" />
@@ -1265,6 +1529,7 @@
     <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />
     <Compile Include="System.Configuration\SettingElement.cs" />
     <Compile Include="System.Configuration\SettingElementCollection.cs" />
+    <Compile Include="System.Configuration\SettingValueElement.cs" />
     <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />
     <Compile Include="System.Configuration\SettingsBase.cs" />
     <Compile Include="System.Configuration\SettingsContext.cs" />
@@ -1288,7 +1553,6 @@
     <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />
     <Compile Include="System.Configuration\SettingsSerializeAs.cs" />
     <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />
-    <Compile Include="System.Configuration\SettingValueElement.cs" />
     <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />
     <Compile Include="System.Configuration\SpecialSetting.cs" />
     <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />
@@ -1417,8 +1681,8 @@
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\FixedSizeReadStream.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListener.Mono.cs" />
+    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
@@ -1457,13 +1721,141 @@
     <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
     <Compile Include="System\MonoToolsLocator.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|macos' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.CoreFoundation.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.EventStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.RunLoop.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Errors.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.IOErrors.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.RealPath.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Sync.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\SafeEventStreamHandle.OSX.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CSharpHelpers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeObject.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeTypeReference.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeTypeReferenceCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\IO\TempFileCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.OSX.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpCodeGenerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpCodeProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpMemberAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpModifierAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpTypeAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBCodeGenerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBCodeProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBMemberAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBModiferAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBTypeAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeArgumentReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeArrayCreateExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeArrayIndexerExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAssignStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttachEventStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttributeArgument.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttributeArgumentCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttributeDeclaration.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttributeDeclarationCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeBaseReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeBinaryOperatorExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeBinaryOperatorType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCastExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCatchClause.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCatchClauseCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeChecksumPragma.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeComment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCommentStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCommentStatementCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCompileUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeConditionStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeConstructor.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDefaultValueExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDelegateCreateExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDelegateInvokeExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDirectionExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDirective.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDirectiveCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeEntryPointMethod.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeEventReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeExpressionCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeExpressionStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeFieldReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeGotoStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeIndexerExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeIterationStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeLabeledStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeLinePragma.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberEvent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberField.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberMethod.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberProperty.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMethodInvokeExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMethodReturnStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespaceCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespaceImport.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespaceImportCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeObjectCreateExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeParameterDeclarationExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeParameterDeclarationExpressionCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodePrimitiveExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodePropertyReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodePropertySetValueReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeRegionDirective.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeRegionMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeRemoveEventStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeSnippetCompileUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeSnippetExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeSnippetStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeSnippetTypeMember.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeStatementCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeThisReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeThrowExceptionStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTryCatchFinallyStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeConstructor.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeDeclaration.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeDeclarationCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeDelegate.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeMember.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeMemberCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeOfExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeParameterCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeVariableDeclarationStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeVariableReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeCompiler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeDomProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeGenerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeGeneratorOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeParser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeValidator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerError.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerErrorCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.Evidence.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.Evidence.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ExposedTabStringIndentedTextWriter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\GeneratorSupport.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ICodeCompiler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ICodeGenerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ICodeParser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\LanguageOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\FieldDirection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\MemberAttributes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\codemethodreferenceexpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\Collections\Specialized\FixedStringLookup.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.OSX.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
@@ -1479,87 +1871,64 @@
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\CompiledRegexRunnerFactory.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexLWCGCompiler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />
+    <Compile Include="..\referencesource\System\misc\PrivilegedConfigurationManager.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
-    <Compile Include="Mono.Btls\MonoBtlsX509LookupAndroid.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
-    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
-    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
-    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
-    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
-    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
-    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
-    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
-    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\BufferedReadStream.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ContentDecodeStream.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\FixedSizeReadStream.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListener.Mono.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoChunkStream.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\ServicePointScheduler.cs" />
-    <Compile Include="System.Net\WebCompletionSource.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebConnectionTunnel.cs" />
-    <Compile Include="System.Net\WebOperation.cs" />
-    <Compile Include="System.Net\WebReadStream.cs" />
-    <Compile Include="System.Net\WebRequestStream.cs" />
-    <Compile Include="System.Net\WebResponseStream.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-    <Compile Include="System\AndroidPlatform.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
+    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
+    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />
+    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />
+    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\PowerModes.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />
+    <Compile Include="Microsoft.Win32\SystemEvents.cs" />
+    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />
     <Compile Include="Mono.Http\NtlmClient.cs" />
+    <Compile Include="Mono.Net.Dns\DnsClass.cs" />
+    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />
+    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />
+    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />
+    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />
+    <Compile Include="Mono.Net.Dns\DnsQType.cs" />
+    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />
+    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />
+    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />
+    <Compile Include="Mono.Net.Dns\DnsType.cs" />
+    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />
+    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />
+    <Compile Include="Mono.Net.Dns\ResolverError.cs" />
+    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />
+    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />
     <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
     <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
     <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
@@ -1574,222 +1943,198 @@
     <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
     <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
     <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
+    <Compile Include="ReferenceSources\BinaryCompatibility.cs" />
+    <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />
+    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />
+    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />
+    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />
+    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />
+    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />
+    <Compile Include="System.CodeDom.Compiler\Executor.cs" />
+    <Compile Include="System.Configuration\AppSettingsReader.cs" />
+    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />
+    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />
+    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />
+    <Compile Include="System.Configuration\ClientSettingsSection.cs" />
+    <Compile Include="System.Configuration\ConfigHelper.cs" />
+    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
+    <Compile Include="System.Configuration\ConfigurationException.cs" />
+    <Compile Include="System.Configuration\ConfigurationSettings.cs" />
+    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />
+    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />
+    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />
+    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />
+    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
+    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />
+    <Compile Include="System.Configuration\IConfigurationSystem.cs" />
+    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
+    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
+    <Compile Include="System.Configuration\IdnElement.cs" />
+    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />
+    <Compile Include="System.Configuration\IriParsingElement.cs" />
+    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />
+    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />
+    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />
+    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />
+    <Compile Include="System.Configuration\SettingAttribute.cs" />
+    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />
+    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />
+    <Compile Include="System.Configuration\SettingElement.cs" />
+    <Compile Include="System.Configuration\SettingElementCollection.cs" />
+    <Compile Include="System.Configuration\SettingValueElement.cs" />
+    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />
+    <Compile Include="System.Configuration\SettingsBase.cs" />
+    <Compile Include="System.Configuration\SettingsContext.cs" />
+    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />
+    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />
+    <Compile Include="System.Configuration\SettingsManageability.cs" />
+    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsProperty.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />
+    <Compile Include="System.Configuration\SettingsProvider.cs" />
+    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />
+    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />
+    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />
+    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />
+    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />
+    <Compile Include="System.Configuration\SpecialSetting.cs" />
+    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />
+    <Compile Include="System.Configuration\UriSection.cs" />
+    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />
+    <Compile Include="System.Configuration\UserSettingsGroup.cs" />
+    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />
+    <Compile Include="System.Diagnostics\CounterCreationData.cs" />
+    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />
+    <Compile Include="System.Diagnostics\CounterSample.cs" />
+    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />
+    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />
+    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />
+    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />
+    <Compile Include="System.Diagnostics\EventInstance.cs" />
+    <Compile Include="System.Diagnostics\EventLog.cs" />
+    <Compile Include="System.Diagnostics\EventLogEntry.cs" />
+    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />
+    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />
+    <Compile Include="System.Diagnostics\EventLogImpl.cs" />
+    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermission.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />
+    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />
+    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />
+    <Compile Include="System.Diagnostics\ICollectData.cs" />
+    <Compile Include="System.Diagnostics\InstanceData.cs" />
+    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />
+    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />
+    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />
+    <Compile Include="System.Diagnostics\NullEventLog.cs" />
+    <Compile Include="System.Diagnostics\OverflowAction.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />
+    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />
+    <Compile Include="System.Diagnostics\Win32EventLog.cs" />
+    <Compile Include="System.IO.Ports\Handshake.cs" />
+    <Compile Include="System.IO.Ports\ISerialStream.cs" />
+    <Compile Include="System.IO.Ports\Parity.cs" />
+    <Compile Include="System.IO.Ports\SerialData.cs" />
+    <Compile Include="System.IO.Ports\SerialError.cs" />
+    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />
+    <Compile Include="System.IO.Ports\SerialPinChange.cs" />
+    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />
+    <Compile Include="System.IO.Ports\SerialPort.cs" />
+    <Compile Include="System.IO.Ports\SerialPortStream.cs" />
+    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />
+    <Compile Include="System.IO.Ports\SerialSignal.cs" />
+    <Compile Include="System.IO.Ports\StopBits.cs" />
+    <Compile Include="System.IO.Ports\WinSerialStream.cs" />
+    <Compile Include="System.IO\CoreFXFileSystemWatcherProxy.cs" />
+    <Compile Include="System.IO\DefaultWatcher.cs" />
+    <Compile Include="System.IO\FAMWatcher.cs" />
+    <Compile Include="System.IO\FileAction.cs" />
+    <Compile Include="System.IO\FileSystemWatcher.cs" />
+    <Compile Include="System.IO\IFileWatcher.cs" />
+    <Compile Include="System.IO\InotifyWatcher.cs" />
+    <Compile Include="System.IO\KeventWatcher.cs" />
+    <Compile Include="System.IO\NullFileWatcher.cs" />
+    <Compile Include="System.IO\SearchPattern.cs" />
+    <Compile Include="System.Media\AudioData.cs" />
+    <Compile Include="System.Media\AudioDevice.cs" />
+    <Compile Include="System.Media\SoundPlayer.cs" />
+    <Compile Include="System.Media\SystemSound.cs" />
+    <Compile Include="System.Media\SystemSounds.cs" />
+    <Compile Include="System.Media\Win32SoundPlayer.cs" />
+    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />
+    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />
+    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />
+    <Compile Include="System.Net.Configuration\BypassElement.cs" />
+    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />
+    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />
+    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />
+    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />
+    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />
+    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />
+    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />
+    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />
+    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />
+    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />
+    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />
+    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />
+    <Compile Include="System.Net.Configuration\ModuleElement.cs" />
+    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />
+    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />
+    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />
+    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />
+    <Compile Include="System.Net.Configuration\ProxyElement.cs" />
+    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />
+    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />
+    <Compile Include="System.Net.Configuration\SettingsSection.cs" />
+    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />
+    <Compile Include="System.Net.Configuration\SmtpSection.cs" />
+    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />
+    <Compile Include="System.Net.Configuration\SocketElement.cs" />
+    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />
+    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />
+    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />
+    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />
+    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />
     <Compile Include="System.Net.Mail\SmtpClient.cs" />
+    <Compile Include="System.Net.Mail\SmtpPermission.cs" />
+    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />
     <Compile Include="System.Net.Security\SslStream.cs" />
     <Compile Include="System.Net\AuthenticationManager.cs" />
     <Compile Include="System.Net\BufferedReadStream.cs" />
     <Compile Include="System.Net\ChunkedInputStream.cs" />
     <Compile Include="System.Net\ContentDecodeStream.cs" />
+    <Compile Include="System.Net\DnsAsyncResult.cs" />
+    <Compile Include="System.Net\DnsPermission.cs" />
+    <Compile Include="System.Net\DnsPermissionAttribute.cs" />
     <Compile Include="System.Net\EndPointListener.cs" />
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\FixedSizeReadStream.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListener.Mono.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoChunkStream.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\ServicePointScheduler.cs" />
-    <Compile Include="System.Net\WebCompletionSource.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebConnectionTunnel.cs" />
-    <Compile Include="System.Net\WebOperation.cs" />
-    <Compile Include="System.Net\WebReadStream.cs" />
-    <Compile Include="System.Net\WebRequestStream.cs" />
-    <Compile Include="System.Net\WebResponseStream.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
-    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
-    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
-    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
-    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
-    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
-    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
-    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
-    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\BufferedReadStream.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ContentDecodeStream.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\FixedSizeReadStream.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
     <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListener.Mono.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoChunkStream.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\ServicePointScheduler.cs" />
-    <Compile Include="System.Net\WebCompletionSource.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebConnectionTunnel.cs" />
-    <Compile Include="System.Net\WebOperation.cs" />
-    <Compile Include="System.Net\WebReadStream.cs" />
-    <Compile Include="System.Net\WebRequestStream.cs" />
-    <Compile Include="System.Net\WebResponseStream.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.platformnotsupported.cs" />
-    <Compile Include="System.Net.Security\SslStream.platformnotsupported.cs" />
-    <Compile Include="System.Net.Sockets\TcpClient.platformnotsupported.cs" />
-    <Compile Include="System.Net.Sockets\TcpListener.platformnotsupported.cs" />
-    <Compile Include="System.Net.Sockets\UdpClient.platformnotsupported.cs" />
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.platformnotsupported.cs" />
-    <Compile Include="System.Net\AuthenticationManager.platformnotsupported.cs" />
-    <Compile Include="System.Net\FtpRequestCreator.platformnotsupported.cs" />
-    <Compile Include="System.Net\FtpWebRequest.platformnotsupported.cs" />
-    <Compile Include="System.Net\FtpWebResponse.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListener.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerContext.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerTimeoutManager.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpWebRequest.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpWebResponse.platformnotsupported.cs" />
-    <Compile Include="System.Net\ServicePoint.platformnotsupported.cs" />
-    <Compile Include="System.Net\ServicePointManager.platformnotsupported.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch_runtime' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtension.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.platformnotsupported.cs" />
-    <Compile Include="System.Net.Security\SslStream.platformnotsupported.cs" />
-    <Compile Include="System.Net.Sockets\TcpClient.platformnotsupported.cs" />
-    <Compile Include="System.Net.Sockets\TcpListener.platformnotsupported.cs" />
-    <Compile Include="System.Net.Sockets\UdpClient.platformnotsupported.cs" />
-    <Compile Include="System.Net.WebSockets\HttpListenerWebSocketContext.platformnotsupported.cs" />
-    <Compile Include="System.Net\AuthenticationManager.platformnotsupported.cs" />
-    <Compile Include="System.Net\FtpRequestCreator.platformnotsupported.cs" />
-    <Compile Include="System.Net\FtpWebRequest.platformnotsupported.cs" />
-    <Compile Include="System.Net\FtpWebResponse.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListener.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerContext.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpListenerTimeoutManager.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpWebRequest.platformnotsupported.cs" />
-    <Compile Include="System.Net\HttpWebResponse.platformnotsupported.cs" />
-    <Compile Include="System.Net\ServicePoint.platformnotsupported.cs" />
-    <Compile Include="System.Net\ServicePointManager.platformnotsupported.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
-    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
-    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
-    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
-    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
-    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
-    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
-    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
-    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\BufferedReadStream.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ContentDecodeStream.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\FixedSizeReadStream.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListener.Mono.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
@@ -1815,90 +2160,158 @@
     <Compile Include="System.Net\WebReadStream.cs" />
     <Compile Include="System.Net\WebRequestStream.cs" />
     <Compile Include="System.Net\WebResponseStream.cs" />
+    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
+    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
+    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />
+    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />
+    <Compile Include="System.Security.Permissions\StorePermission.cs" />
+    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />
+    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />
+    <Compile Include="System.Web\AspNetHostingPermission.cs" />
+    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />
+    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
+    <Compile Include="System\MonoToolsLocator.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|unix' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Linux\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Linux\System.Native\Interop.INotify.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Errors.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.IOErrors.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Close.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.FLock.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Open.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.OpenFlags.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Poll.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Read.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.ReadDir.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Stat.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\SafeDirectoryHandle.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\SafeFileHandle.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CSharpHelpers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeObject.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeTypeReference.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeTypeReferenceCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\IO\TempFileCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
-    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
-    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
-    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
-    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
-    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
-    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
-    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
-    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\BufferedReadStream.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ContentDecodeStream.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\FixedSizeReadStream.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListener.Mono.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoChunkStream.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\ServicePointScheduler.cs" />
-    <Compile Include="System.Net\WebCompletionSource.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebConnectionTunnel.cs" />
-    <Compile Include="System.Net\WebOperation.cs" />
-    <Compile Include="System.Net\WebReadStream.cs" />
-    <Compile Include="System.Net\WebRequestStream.cs" />
-    <Compile Include="System.Net\WebResponseStream.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpCodeGenerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpCodeProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpMemberAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpModifierAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\CSharp\CSharpTypeAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBCodeGenerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBCodeProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBMemberAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBModiferAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\Microsoft\VisualBasic\VBTypeAttributeConverter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeArgumentReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeArrayCreateExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeArrayIndexerExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAssignStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttachEventStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttributeArgument.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttributeArgumentCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttributeDeclaration.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeAttributeDeclarationCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeBaseReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeBinaryOperatorExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeBinaryOperatorType.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCastExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCatchClause.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCatchClauseCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeChecksumPragma.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeComment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCommentStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCommentStatementCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeCompileUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeConditionStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeConstructor.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDefaultValueExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDelegateCreateExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDelegateInvokeExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDirectionExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDirective.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeDirectiveCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeEntryPointMethod.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeEventReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeExpressionCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeExpressionStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeFieldReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeGotoStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeIndexerExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeIterationStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeLabeledStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeLinePragma.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberEvent.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberField.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberMethod.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberProperty.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMethodInvokeExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMethodReturnStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespace.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespaceCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespaceImport.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespaceImportCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeObjectCreateExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeParameterDeclarationExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeParameterDeclarationExpressionCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodePrimitiveExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodePropertyReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodePropertySetValueReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeRegionDirective.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeRegionMode.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeRemoveEventStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeSnippetCompileUnit.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeSnippetExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeSnippetStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeSnippetTypeMember.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeStatementCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeThisReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeThrowExceptionStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTryCatchFinallyStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeConstructor.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeDeclaration.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeDeclarationCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeDelegate.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeMember.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeMemberCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeOfExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeParameter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeParameterCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeTypeReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeVariableDeclarationStatement.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeVariableReferenceExpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeCompiler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeDomProvider.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeGenerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeGeneratorOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeParser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CodeValidator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerError.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerErrorCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerInfo.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.Evidence.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.Evidence.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ExposedTabStringIndentedTextWriter.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\GeneratorSupport.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ICodeCompiler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ICodeGenerator.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ICodeParser.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\LanguageOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\FieldDirection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\MemberAttributes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\codemethodreferenceexpression.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\Collections\Specialized\FixedStringLookup.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.Linux.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
@@ -1914,10 +2327,64 @@
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\CompiledRegexRunnerFactory.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexCompiler.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexLWCGCompiler.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\ConsoleTraceListener.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\FilterElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\PerfCounterSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SourceElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SwitchElementsCollection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\SystemDiagnosticsSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TraceSection.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\TypedElement.cs" />
+    <Compile Include="..\referencesource\System\compmod\system\diagnostics\XmlWriterTraceListener.cs" />
+    <Compile Include="..\referencesource\System\misc\PrivilegedConfigurationManager.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
     <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
+    <Compile Include="Microsoft.CSharp\CSharpCodeGenerator.cs" />
+    <Compile Include="Microsoft.VisualBasic\VBCodeGenerator.cs" />
+    <Compile Include="Microsoft.Win32\IntranetZoneCredentialPolicy.cs" />
+    <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\PowerModes.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />
+    <Compile Include="Microsoft.Win32\SystemEvents.cs" />
+    <Compile Include="Microsoft.Win32\TimerElapsedEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\TimerElapsedEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceCategory.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceChangedEventHandler.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventArgs.cs" />
+    <Compile Include="Microsoft.Win32\UserPreferenceChangingEventHandler.cs" />
     <Compile Include="Mono.Http\NtlmClient.cs" />
+    <Compile Include="Mono.Net.Dns\DnsClass.cs" />
+    <Compile Include="Mono.Net.Dns\DnsHeader.cs" />
+    <Compile Include="Mono.Net.Dns\DnsOpCode.cs" />
+    <Compile Include="Mono.Net.Dns\DnsPacket.cs" />
+    <Compile Include="Mono.Net.Dns\DnsQClass.cs" />
+    <Compile Include="Mono.Net.Dns\DnsQType.cs" />
+    <Compile Include="Mono.Net.Dns\DnsQuery.cs" />
+    <Compile Include="Mono.Net.Dns\DnsQuestion.cs" />
+    <Compile Include="Mono.Net.Dns\DnsRCode.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecord.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordA.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordAAAA.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordCName.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordIPAddress.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResourceRecordPTR.cs" />
+    <Compile Include="Mono.Net.Dns\DnsResponse.cs" />
+    <Compile Include="Mono.Net.Dns\DnsType.cs" />
+    <Compile Include="Mono.Net.Dns\DnsUtil.cs" />
+    <Compile Include="Mono.Net.Dns\ResolverAsyncOperation.cs" />
+    <Compile Include="Mono.Net.Dns\ResolverError.cs" />
+    <Compile Include="Mono.Net.Dns\SimpleResolver.cs" />
+    <Compile Include="Mono.Net.Dns\SimpleResolverEventArgs.cs" />
     <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
     <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
     <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
@@ -1932,247 +2399,198 @@
     <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
     <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
     <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
+    <Compile Include="ReferenceSources\BinaryCompatibility.cs" />
+    <Compile Include="ReferenceSources\ConfigurationManagerInternalFactory.cs" />
+    <Compile Include="System.CodeDom.Compiler\CodeDomConfigurationHandler.cs" />
+    <Compile Include="System.CodeDom.Compiler\Compiler.cs" />
+    <Compile Include="System.CodeDom.Compiler\CompilerCollection.cs" />
+    <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />
+    <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />
+    <Compile Include="System.CodeDom.Compiler\Executor.cs" />
+    <Compile Include="System.Configuration\AppSettingsReader.cs" />
+    <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />
+    <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />
+    <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />
+    <Compile Include="System.Configuration\ClientSettingsSection.cs" />
+    <Compile Include="System.Configuration\ConfigHelper.cs" />
+    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
+    <Compile Include="System.Configuration\ConfigurationException.cs" />
+    <Compile Include="System.Configuration\ConfigurationSettings.cs" />
+    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />
+    <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />
+    <Compile Include="System.Configuration\DictionarySectionHandler.cs" />
+    <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />
+    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
+    <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />
+    <Compile Include="System.Configuration\IConfigurationSystem.cs" />
+    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
+    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
+    <Compile Include="System.Configuration\IdnElement.cs" />
+    <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />
+    <Compile Include="System.Configuration\IriParsingElement.cs" />
+    <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />
+    <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />
+    <Compile Include="System.Configuration\NameValueSectionHandler.cs" />
+    <Compile Include="System.Configuration\NoSettingsVersionUpgradeAttribute.cs" />
+    <Compile Include="System.Configuration\SettingAttribute.cs" />
+    <Compile Include="System.Configuration\SettingChangingEventArgs.cs" />
+    <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />
+    <Compile Include="System.Configuration\SettingElement.cs" />
+    <Compile Include="System.Configuration\SettingElementCollection.cs" />
+    <Compile Include="System.Configuration\SettingValueElement.cs" />
+    <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />
+    <Compile Include="System.Configuration\SettingsBase.cs" />
+    <Compile Include="System.Configuration\SettingsContext.cs" />
+    <Compile Include="System.Configuration\SettingsDescriptionAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsGroupDescriptionAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsGroupNameAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsLoadedEventArgs.cs" />
+    <Compile Include="System.Configuration\SettingsLoadedEventHandler.cs" />
+    <Compile Include="System.Configuration\SettingsManageability.cs" />
+    <Compile Include="System.Configuration\SettingsManageabilityAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsProperty.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyCollection.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyIsReadOnlyException.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyNotFoundException.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyValue.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyValueCollection.cs" />
+    <Compile Include="System.Configuration\SettingsPropertyWrongTypeException.cs" />
+    <Compile Include="System.Configuration\SettingsProvider.cs" />
+    <Compile Include="System.Configuration\SettingsProviderAttribute.cs" />
+    <Compile Include="System.Configuration\SettingsProviderCollection.cs" />
+    <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />
+    <Compile Include="System.Configuration\SettingsSerializeAs.cs" />
+    <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />
+    <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />
+    <Compile Include="System.Configuration\SpecialSetting.cs" />
+    <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />
+    <Compile Include="System.Configuration\UriSection.cs" />
+    <Compile Include="System.Configuration\UserScopedSettingAttribute.cs" />
+    <Compile Include="System.Configuration\UserSettingsGroup.cs" />
+    <Compile Include="System.Diagnostics\AlphabeticalEnumConverter.cs" />
+    <Compile Include="System.Diagnostics\CounterCreationData.cs" />
+    <Compile Include="System.Diagnostics\CounterCreationDataCollection.cs" />
+    <Compile Include="System.Diagnostics\CounterSample.cs" />
+    <Compile Include="System.Diagnostics\CounterSampleCalculator.cs" />
+    <Compile Include="System.Diagnostics\DiagnosticsConfigurationHandler.cs" />
+    <Compile Include="System.Diagnostics\EntryWrittenEventArgs.cs" />
+    <Compile Include="System.Diagnostics\EntryWrittenEventHandler.cs" />
+    <Compile Include="System.Diagnostics\EventInstance.cs" />
+    <Compile Include="System.Diagnostics\EventLog.cs" />
+    <Compile Include="System.Diagnostics\EventLogEntry.cs" />
+    <Compile Include="System.Diagnostics\EventLogEntryCollection.cs" />
+    <Compile Include="System.Diagnostics\EventLogEntryType.cs" />
+    <Compile Include="System.Diagnostics\EventLogImpl.cs" />
+    <Compile Include="System.Diagnostics\EventLogInstaller.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermission.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermissionAccess.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermissionAttribute.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermissionEntry.cs" />
+    <Compile Include="System.Diagnostics\EventLogPermissionEntryCollection.cs" />
+    <Compile Include="System.Diagnostics\EventLogTraceListener.cs" />
+    <Compile Include="System.Diagnostics\EventSourceCreationData.cs" />
+    <Compile Include="System.Diagnostics\ICollectData.cs" />
+    <Compile Include="System.Diagnostics\InstanceData.cs" />
+    <Compile Include="System.Diagnostics\InstanceDataCollection.cs" />
+    <Compile Include="System.Diagnostics\InstanceDataCollectionCollection.cs" />
+    <Compile Include="System.Diagnostics\LocalFileEventLog.cs" />
+    <Compile Include="System.Diagnostics\NullEventLog.cs" />
+    <Compile Include="System.Diagnostics\OverflowAction.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounter.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterCategory.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterCategoryType.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterInstaller.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterInstanceLifetime.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterManager.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermission.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAccess.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermissionAttribute.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntry.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterPermissionEntryCollection.cs" />
+    <Compile Include="System.Diagnostics\PerformanceCounterType.cs" />
+    <Compile Include="System.Diagnostics\TraceSourceInfo.cs" />
+    <Compile Include="System.Diagnostics\Win32EventLog.cs" />
+    <Compile Include="System.IO.Ports\Handshake.cs" />
+    <Compile Include="System.IO.Ports\ISerialStream.cs" />
+    <Compile Include="System.IO.Ports\Parity.cs" />
+    <Compile Include="System.IO.Ports\SerialData.cs" />
+    <Compile Include="System.IO.Ports\SerialError.cs" />
+    <Compile Include="System.IO.Ports\SerialErrorEventArgs.cs" />
+    <Compile Include="System.IO.Ports\SerialPinChange.cs" />
+    <Compile Include="System.IO.Ports\SerialPinChangedEventArgs.cs" />
+    <Compile Include="System.IO.Ports\SerialPort.cs" />
+    <Compile Include="System.IO.Ports\SerialPortStream.cs" />
+    <Compile Include="System.IO.Ports\SerialReceivedEventArgs.cs" />
+    <Compile Include="System.IO.Ports\SerialSignal.cs" />
+    <Compile Include="System.IO.Ports\StopBits.cs" />
+    <Compile Include="System.IO.Ports\WinSerialStream.cs" />
+    <Compile Include="System.IO\CoreFXFileSystemWatcherProxy.cs" />
+    <Compile Include="System.IO\DefaultWatcher.cs" />
+    <Compile Include="System.IO\FAMWatcher.cs" />
+    <Compile Include="System.IO\FileAction.cs" />
+    <Compile Include="System.IO\FileSystemWatcher.cs" />
+    <Compile Include="System.IO\IFileWatcher.cs" />
+    <Compile Include="System.IO\InotifyWatcher.cs" />
+    <Compile Include="System.IO\KeventWatcher.cs" />
+    <Compile Include="System.IO\NullFileWatcher.cs" />
+    <Compile Include="System.IO\SearchPattern.cs" />
+    <Compile Include="System.Media\AudioData.cs" />
+    <Compile Include="System.Media\AudioDevice.cs" />
+    <Compile Include="System.Media\SoundPlayer.cs" />
+    <Compile Include="System.Media\SystemSound.cs" />
+    <Compile Include="System.Media\SystemSounds.cs" />
+    <Compile Include="System.Media\Win32SoundPlayer.cs" />
+    <Compile Include="System.Net.Configuration\AuthenticationModuleElement.cs" />
+    <Compile Include="System.Net.Configuration\AuthenticationModuleElementCollection.cs" />
+    <Compile Include="System.Net.Configuration\AuthenticationModulesSection.cs" />
+    <Compile Include="System.Net.Configuration\BypassElement.cs" />
+    <Compile Include="System.Net.Configuration\BypassElementCollection.cs" />
+    <Compile Include="System.Net.Configuration\ConnectionManagementElement.cs" />
+    <Compile Include="System.Net.Configuration\ConnectionManagementElementCollection.cs" />
+    <Compile Include="System.Net.Configuration\ConnectionManagementHandler.cs" />
+    <Compile Include="System.Net.Configuration\ConnectionManagementSection.cs" />
+    <Compile Include="System.Net.Configuration\DefaultProxyHandler.cs" />
+    <Compile Include="System.Net.Configuration\DefaultProxySection.cs" />
+    <Compile Include="System.Net.Configuration\FtpCachePolicyElement.cs" />
+    <Compile Include="System.Net.Configuration\HttpCachePolicyElement.cs" />
+    <Compile Include="System.Net.Configuration\HttpWebRequestElement.cs" />
+    <Compile Include="System.Net.Configuration\Ipv6Element.cs" />
+    <Compile Include="System.Net.Configuration\MailSettingsSectionGroup.cs" />
+    <Compile Include="System.Net.Configuration\ModuleElement.cs" />
+    <Compile Include="System.Net.Configuration\NetAuthenticationModuleHandler.cs" />
+    <Compile Include="System.Net.Configuration\NetConfigurationHandler.cs" />
+    <Compile Include="System.Net.Configuration\NetSectionGroup.cs" />
+    <Compile Include="System.Net.Configuration\PerformanceCountersElement.cs" />
+    <Compile Include="System.Net.Configuration\ProxyElement.cs" />
+    <Compile Include="System.Net.Configuration\RequestCachingSection.cs" />
+    <Compile Include="System.Net.Configuration\ServicePointManagerElement.cs" />
+    <Compile Include="System.Net.Configuration\SettingsSection.cs" />
+    <Compile Include="System.Net.Configuration\SmtpNetworkElement.cs" />
+    <Compile Include="System.Net.Configuration\SmtpSection.cs" />
+    <Compile Include="System.Net.Configuration\SmtpSpecifiedPickupDirectoryElement.cs" />
+    <Compile Include="System.Net.Configuration\SocketElement.cs" />
+    <Compile Include="System.Net.Configuration\WebProxyScriptElement.cs" />
+    <Compile Include="System.Net.Configuration\WebRequestModuleElement.cs" />
+    <Compile Include="System.Net.Configuration\WebRequestModuleElementCollection.cs" />
+    <Compile Include="System.Net.Configuration\WebRequestModuleHandler.cs" />
+    <Compile Include="System.Net.Configuration\WebRequestModulesSection.cs" />
     <Compile Include="System.Net.Mail\SmtpClient.cs" />
+    <Compile Include="System.Net.Mail\SmtpPermission.cs" />
+    <Compile Include="System.Net.Mail\SmtpPermissionAttribute.cs" />
     <Compile Include="System.Net.Security\SslStream.cs" />
     <Compile Include="System.Net\AuthenticationManager.cs" />
     <Compile Include="System.Net\BufferedReadStream.cs" />
     <Compile Include="System.Net\ChunkedInputStream.cs" />
     <Compile Include="System.Net\ContentDecodeStream.cs" />
+    <Compile Include="System.Net\DnsAsyncResult.cs" />
+    <Compile Include="System.Net\DnsPermission.cs" />
+    <Compile Include="System.Net\DnsPermissionAttribute.cs" />
     <Compile Include="System.Net\EndPointListener.cs" />
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\FixedSizeReadStream.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListener.Mono.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoChunkStream.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\ServicePointScheduler.cs" />
-    <Compile Include="System.Net\WebCompletionSource.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebConnectionTunnel.cs" />
-    <Compile Include="System.Net\WebOperation.cs" />
-    <Compile Include="System.Net\WebReadStream.cs" />
-    <Compile Include="System.Net\WebRequestStream.cs" />
-    <Compile Include="System.Net\WebResponseStream.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
-    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
-    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
-    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
-    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
-    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
-    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
-    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
-    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\BufferedReadStream.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ContentDecodeStream.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\FixedSizeReadStream.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListener.Mono.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoChunkStream.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\ServicePointScheduler.cs" />
-    <Compile Include="System.Net\WebCompletionSource.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebConnectionTunnel.cs" />
-    <Compile Include="System.Net\WebOperation.cs" />
-    <Compile Include="System.Net\WebReadStream.cs" />
-    <Compile Include="System.Net\WebRequestStream.cs" />
-    <Compile Include="System.Net\WebResponseStream.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
-    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
-    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
-    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
-    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
-    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
-    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
-    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
-    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\BufferedReadStream.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ContentDecodeStream.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\FixedSizeReadStream.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListener.Mono.cs" />
-    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
-    <Compile Include="System.Net\HttpListenerContext.cs" />
-    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
-    <Compile Include="System.Net\HttpListenerRequest.cs" />
-    <Compile Include="System.Net\HttpListenerResponse.cs" />
-    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
-    <Compile Include="System.Net\HttpWebRequest.cs" />
-    <Compile Include="System.Net\HttpWebResponse.cs" />
-    <Compile Include="System.Net\ListenerAsyncResult.cs" />
-    <Compile Include="System.Net\MacProxy.cs" />
-    <Compile Include="System.Net\MonoChunkStream.cs" />
-    <Compile Include="System.Net\NtlmClient.cs" />
-    <Compile Include="System.Net\ResponseStream.cs" />
-    <Compile Include="System.Net\ServicePoint.cs" />
-    <Compile Include="System.Net\ServicePointManager.cs" />
-    <Compile Include="System.Net\ServicePointManager.extra.cs" />
-    <Compile Include="System.Net\ServicePointScheduler.cs" />
-    <Compile Include="System.Net\WebCompletionSource.cs" />
-    <Compile Include="System.Net\WebConnection.cs" />
-    <Compile Include="System.Net\WebConnectionStream.cs" />
-    <Compile Include="System.Net\WebConnectionTunnel.cs" />
-    <Compile Include="System.Net\WebOperation.cs" />
-    <Compile Include="System.Net\WebReadStream.cs" />
-    <Compile Include="System.Net\WebRequestStream.cs" />
-    <Compile Include="System.Net\WebResponseStream.cs" />
-    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\CompiledRegexRunner.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\CompiledRegexRunnerFactory.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexCompiler.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexLWCGCompiler.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
-    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
-    <Compile Include="Mono.Http\NtlmClient.cs" />
-    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
-    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
-    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
-    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
-    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
-    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
-    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
-    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
-    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
-    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
-    <Compile Include="System.Net.Mail\SmtpClient.cs" />
-    <Compile Include="System.Net.Security\SslStream.cs" />
-    <Compile Include="System.Net\AuthenticationManager.cs" />
-    <Compile Include="System.Net\BufferedReadStream.cs" />
-    <Compile Include="System.Net\ChunkedInputStream.cs" />
-    <Compile Include="System.Net\ContentDecodeStream.cs" />
-    <Compile Include="System.Net\EndPointListener.cs" />
-    <Compile Include="System.Net\EndPointManager.cs" />
-    <Compile Include="System.Net\FixedSizeReadStream.cs" />
-    <Compile Include="System.Net\HttpConnection.cs" />
     <Compile Include="System.Net\HttpListener.cs" />
-    <Compile Include="System.Net\HttpListener.Mono.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
@@ -2198,27 +2616,35 @@
     <Compile Include="System.Net\WebReadStream.cs" />
     <Compile Include="System.Net\WebRequestStream.cs" />
     <Compile Include="System.Net\WebResponseStream.cs" />
+    <Compile Include="System.Runtime.InteropServices\StandardOleMarshalObject.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
+    <Compile Include="System.Security.Permissions\PermissionHelper.cs" />
+    <Compile Include="System.Security.Permissions\ResourcePermissionBase.cs" />
+    <Compile Include="System.Security.Permissions\ResourcePermissionBaseEntry.cs" />
+    <Compile Include="System.Security.Permissions\StorePermission.cs" />
+    <Compile Include="System.Security.Permissions\StorePermissionAttribute.cs" />
+    <Compile Include="System.Security.Permissions\StorePermissionFlags.cs" />
+    <Compile Include="System.Web\AspNetHostingPermission.cs" />
+    <Compile Include="System.Web\AspNetHostingPermissionAttribute.cs" />
+    <Compile Include="System.Web\AspNetHostingPermissionLevel.cs" />
+    <Compile Include="System\MonoToolsLocator.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.CoreFoundation.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.EventStream.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.Libraries.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\OSX\Interop.RunLoop.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Errors.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.IOErrors.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.RealPath.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Sync.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\Microsoft\Win32\SafeHandles\SafeEventStreamHandle.OSX.cs" />
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|win32' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\Interop.BOOL.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\kernel32\Interop.CloseHandle.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\kernel32\Interop.CreateFile.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\kernel32\Interop.FileOperations.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\kernel32\Interop.ReadDirectoryChangesW.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Windows\kernel32\Interop.SECURITY_ATTRIBUTES.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CSharpHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeObject.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeTypeReference.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\CodeDom\CodeTypeReferenceCollection.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\CSharpHelpers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\IO\PathInternal.Windows.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\IO\TempFileCollection.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Windows.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.OSX.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
@@ -2276,7 +2702,6 @@
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberMethod.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMemberProperty.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMethodInvokeExpression.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\codemethodreferenceexpression.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeMethodReturnStatement.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespace.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\CodeNamespaceCollection.cs" />
@@ -2321,10 +2746,10 @@
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerError.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerErrorCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerInfo.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.Evidence.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerParameters.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.Evidence.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\CompilerResults.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ExposedTabStringIndentedTextWriter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\GeneratorSupport.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\ICodeCompiler.cs" />
@@ -2333,8 +2758,9 @@
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\Compiler\LanguageOptions.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\FieldDirection.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\MemberAttributes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\CodeDom\codemethodreferenceexpression.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.CodeDom\src\System\Collections\Specialized\FixedStringLookup.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.OSX.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.Win32.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
@@ -2369,11 +2795,11 @@
     <Compile Include="Microsoft.Win32\PowerModeChangedEventArgs.cs" />
     <Compile Include="Microsoft.Win32\PowerModeChangedEventHandler.cs" />
     <Compile Include="Microsoft.Win32\PowerModes.cs" />
+    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
     <Compile Include="Microsoft.Win32\SessionEndedEventArgs.cs" />
     <Compile Include="Microsoft.Win32\SessionEndedEventHandler.cs" />
     <Compile Include="Microsoft.Win32\SessionEndingEventArgs.cs" />
     <Compile Include="Microsoft.Win32\SessionEndingEventHandler.cs" />
-    <Compile Include="Microsoft.Win32\SessionEndReasons.cs" />
     <Compile Include="Microsoft.Win32\SessionSwitchEventArgs.cs" />
     <Compile Include="Microsoft.Win32\SessionSwitchEventHandler.cs" />
     <Compile Include="Microsoft.Win32\SessionSwitchReason.cs" />
@@ -2430,27 +2856,27 @@
     <Compile Include="System.CodeDom.Compiler\CompilerProviderOption.cs" />
     <Compile Include="System.CodeDom.Compiler\CompilerProviderOptionsCollection.cs" />
     <Compile Include="System.CodeDom.Compiler\Executor.cs" />
+    <Compile Include="System.Configuration\AppSettingsReader.cs" />
     <Compile Include="System.Configuration\ApplicationScopedSettingAttribute.cs" />
     <Compile Include="System.Configuration\ApplicationSettingsBase.cs" />
     <Compile Include="System.Configuration\ApplicationSettingsGroup.cs" />
-    <Compile Include="System.Configuration\AppSettingsReader.cs" />
     <Compile Include="System.Configuration\ClientSettingsSection.cs" />
     <Compile Include="System.Configuration\ConfigHelper.cs" />
+    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
     <Compile Include="System.Configuration\ConfigurationException.cs" />
     <Compile Include="System.Configuration\ConfigurationSettings.cs" />
-    <Compile Include="System.Configuration\ConfigXmlDocument.cs" />
     <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />
     <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />
     <Compile Include="System.Configuration\DictionarySectionHandler.cs" />
     <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />
+    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
     <Compile Include="System.Configuration\IConfigurationSectionHandler.cs" />
     <Compile Include="System.Configuration\IConfigurationSystem.cs" />
-    <Compile Include="System.Configuration\IConfigXmlNode.cs" />
+    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
+    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
     <Compile Include="System.Configuration\IdnElement.cs" />
     <Compile Include="System.Configuration\IgnoreSectionHandler.cs" />
-    <Compile Include="System.Configuration\IPersistComponentSettings.cs" />
     <Compile Include="System.Configuration\IriParsingElement.cs" />
-    <Compile Include="System.Configuration\ISettingsProviderService.cs" />
     <Compile Include="System.Configuration\LocalFileSettingsProvider.cs" />
     <Compile Include="System.Configuration\NameValueFileSectionHandler.cs" />
     <Compile Include="System.Configuration\NameValueSectionHandler.cs" />
@@ -2460,6 +2886,7 @@
     <Compile Include="System.Configuration\SettingChangingEventHandler.cs" />
     <Compile Include="System.Configuration\SettingElement.cs" />
     <Compile Include="System.Configuration\SettingElementCollection.cs" />
+    <Compile Include="System.Configuration\SettingValueElement.cs" />
     <Compile Include="System.Configuration\SettingsAttributeDictionary.cs" />
     <Compile Include="System.Configuration\SettingsBase.cs" />
     <Compile Include="System.Configuration\SettingsContext.cs" />
@@ -2483,7 +2910,6 @@
     <Compile Include="System.Configuration\SettingsSavingEventHandler.cs" />
     <Compile Include="System.Configuration\SettingsSerializeAs.cs" />
     <Compile Include="System.Configuration\SettingsSerializeAsAttribute.cs" />
-    <Compile Include="System.Configuration\SettingValueElement.cs" />
     <Compile Include="System.Configuration\SingleTagSectionHandler.cs" />
     <Compile Include="System.Configuration\SpecialSetting.cs" />
     <Compile Include="System.Configuration\SpecialSettingAttribute.cs" />
@@ -2612,8 +3038,8 @@
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\FixedSizeReadStream.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListener.Mono.cs" />
+    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
@@ -2653,8 +3079,8 @@
     <Compile Include="System\MonoToolsLocator.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
@@ -2698,8 +3124,8 @@
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\FixedSizeReadStream.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListener.Mono.cs" />
+    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
@@ -2726,8 +3152,8 @@
     <Compile Include="System.Net\WebResponseStream.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
@@ -2775,8 +3201,8 @@
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\FixedSizeReadStream.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
-    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListener.Mono.cs" />
+    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
@@ -2805,8 +3231,83 @@
     <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
+    <Compile Include="Mono.Http\NtlmClient.cs" />
+    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
+    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
+    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
+    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
+    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
+    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
+    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
+    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
+    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
+    <Compile Include="System.Net.Mail\SmtpClient.cs" />
+    <Compile Include="System.Net.Security\SslStream.cs" />
+    <Compile Include="System.Net\AuthenticationManager.cs" />
+    <Compile Include="System.Net\BufferedReadStream.cs" />
+    <Compile Include="System.Net\ChunkedInputStream.cs" />
+    <Compile Include="System.Net\ContentDecodeStream.cs" />
+    <Compile Include="System.Net\EndPointListener.cs" />
+    <Compile Include="System.Net\EndPointManager.cs" />
+    <Compile Include="System.Net\FixedSizeReadStream.cs" />
+    <Compile Include="System.Net\HttpConnection.cs" />
+    <Compile Include="System.Net\HttpListener.Mono.cs" />
+    <Compile Include="System.Net\HttpListener.cs" />
+    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
+    <Compile Include="System.Net\HttpListenerContext.cs" />
+    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
+    <Compile Include="System.Net\HttpListenerRequest.cs" />
+    <Compile Include="System.Net\HttpListenerResponse.cs" />
+    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
+    <Compile Include="System.Net\HttpWebRequest.cs" />
+    <Compile Include="System.Net\HttpWebResponse.cs" />
+    <Compile Include="System.Net\ListenerAsyncResult.cs" />
+    <Compile Include="System.Net\MacProxy.cs" />
+    <Compile Include="System.Net\MonoChunkStream.cs" />
+    <Compile Include="System.Net\NtlmClient.cs" />
+    <Compile Include="System.Net\ResponseStream.cs" />
+    <Compile Include="System.Net\ServicePoint.cs" />
+    <Compile Include="System.Net\ServicePointManager.cs" />
+    <Compile Include="System.Net\ServicePointManager.extra.cs" />
+    <Compile Include="System.Net\ServicePointScheduler.cs" />
+    <Compile Include="System.Net\WebCompletionSource.cs" />
+    <Compile Include="System.Net\WebConnection.cs" />
+    <Compile Include="System.Net\WebConnectionStream.cs" />
+    <Compile Include="System.Net\WebConnectionTunnel.cs" />
+    <Compile Include="System.Net\WebOperation.cs" />
+    <Compile Include="System.Net\WebReadStream.cs" />
+    <Compile Include="System.Net\WebRequestStream.cs" />
+    <Compile Include="System.Net\WebResponseStream.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
@@ -2850,8 +3351,87 @@
     <Compile Include="System.Net\EndPointManager.cs" />
     <Compile Include="System.Net\FixedSizeReadStream.cs" />
     <Compile Include="System.Net\HttpConnection.cs" />
+    <Compile Include="System.Net\HttpListener.Mono.cs" />
     <Compile Include="System.Net\HttpListener.cs" />
+    <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
+    <Compile Include="System.Net\HttpListenerContext.cs" />
+    <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
+    <Compile Include="System.Net\HttpListenerRequest.cs" />
+    <Compile Include="System.Net\HttpListenerResponse.cs" />
+    <Compile Include="System.Net\HttpListenerTimeoutManager.cs" />
+    <Compile Include="System.Net\HttpWebRequest.cs" />
+    <Compile Include="System.Net\HttpWebResponse.cs" />
+    <Compile Include="System.Net\ListenerAsyncResult.cs" />
+    <Compile Include="System.Net\MacProxy.cs" />
+    <Compile Include="System.Net\MonoChunkStream.cs" />
+    <Compile Include="System.Net\NtlmClient.cs" />
+    <Compile Include="System.Net\ResponseStream.cs" />
+    <Compile Include="System.Net\ServicePoint.cs" />
+    <Compile Include="System.Net\ServicePointManager.cs" />
+    <Compile Include="System.Net\ServicePointManager.extra.cs" />
+    <Compile Include="System.Net\ServicePointScheduler.cs" />
+    <Compile Include="System.Net\WebCompletionSource.cs" />
+    <Compile Include="System.Net\WebConnection.cs" />
+    <Compile Include="System.Net\WebConnectionStream.cs" />
+    <Compile Include="System.Net\WebConnectionTunnel.cs" />
+    <Compile Include="System.Net\WebOperation.cs" />
+    <Compile Include="System.Net\WebReadStream.cs" />
+    <Compile Include="System.Net\WebRequestStream.cs" />
+    <Compile Include="System.Net\WebResponseStream.cs" />
+    <Compile Include="System.Security.Cryptography.X509Certificates\OSX509Certificates.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.Unix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\ContextAwareResult.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\HttpValidationHelpers.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\System\Net\TlsStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.IO.FileSystem.Watcher\src\System\IO\FileSystemWatcher.UnknownUnix.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.HttpListener\src\System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\CommandStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpControlStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpDataStream.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebRequest.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\FtpWebResponse.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Requests\src\System\Net\NetworkStreamWrapper.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslApplicationProtocol.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslClientAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Net.Security\src\System\Net\Security\SslServerAuthenticationOptions.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\CompiledRegexRunner.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\CompiledRegexRunnerFactory.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexCompiler.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Text.RegularExpressions\src\System\Text\RegularExpressions\RegexLWCGCompiler.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPClient.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\TCPListener.cs" />
+    <Compile Include="..\referencesource\System\net\System\Net\Sockets\UDPClient.cs" />
+    <Compile Include="Mono.Http\NtlmClient.cs" />
+    <Compile Include="Mono.Net.Security\AsyncProtocolRequest.cs" />
+    <Compile Include="Mono.Net.Security\CallbackHelpers.cs" />
+    <Compile Include="Mono.Net.Security\ChainValidationHelper.cs" />
+    <Compile Include="Mono.Net.Security\LegacySslStream.cs" />
+    <Compile Include="Mono.Net.Security\LegacyTlsProvider.cs" />
+    <Compile Include="Mono.Net.Security\MobileAuthenticatedStream.cs" />
+    <Compile Include="Mono.Net.Security\MobileTlsContext.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslClientAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoSslServerAuthenticationOptions.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsProviderFactory.cs" />
+    <Compile Include="Mono.Net.Security\MonoTlsStream.cs" />
+    <Compile Include="Mono.Net.Security\NoReflectionHelper.cs" />
+    <Compile Include="Mono.Net.Security\SystemCertificateValidator.cs" />
+    <Compile Include="System.Net.Mail\SmtpClient.cs" />
+    <Compile Include="System.Net.Security\SslStream.cs" />
+    <Compile Include="System.Net\AuthenticationManager.cs" />
+    <Compile Include="System.Net\BufferedReadStream.cs" />
+    <Compile Include="System.Net\ChunkedInputStream.cs" />
+    <Compile Include="System.Net\ContentDecodeStream.cs" />
+    <Compile Include="System.Net\EndPointListener.cs" />
+    <Compile Include="System.Net\EndPointManager.cs" />
+    <Compile Include="System.Net\FixedSizeReadStream.cs" />
+    <Compile Include="System.Net\HttpConnection.cs" />
     <Compile Include="System.Net\HttpListener.Mono.cs" />
+    <Compile Include="System.Net\HttpListener.cs" />
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />
     <Compile Include="System.Net\HttpListenerContext.cs" />
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj b/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
index c7e5e48bbcd..d03cd0e5f4b 100644
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
+++ b/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="SystemWebTestShim\Adapters.cs" />
@@ -53,6 +53,7 @@
     <Compile Include="SystemWebTestShim\Page.cs" />
     <Compile Include="SystemWebTestShim\UrlUtils.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj b/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj
index 171c4d062f8..497f1d8da9f 100644
--- a/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj
+++ b/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -52,6 +52,7 @@
     <Compile Include="WebMatrix.Data\Database.cs" />
     <Compile Include="WebMatrix.Data\DynamicRecord.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/WindowsBase/WindowsBase.csproj b/mcs/class/WindowsBase/WindowsBase.csproj
index 04b031f4e64..c6a9c650929 100644
--- a/mcs/class/WindowsBase/WindowsBase.csproj
+++ b/mcs/class/WindowsBase/WindowsBase.csproj
@@ -44,8 +44,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
@@ -82,6 +82,8 @@
     <Compile Include="System.IO.Packaging\EncryptedPackageEnvelope.cs" />
     <Compile Include="System.IO.Packaging\EncryptionOption.cs" />
     <Compile Include="System.IO.Packaging\InvalidSignatureEventHandler.cs" />
+    <Compile Include="System.IO.Packaging\PackUriHelper.cs" />
+    <Compile Include="System.IO.Packaging\PackUriParser.cs" />
     <Compile Include="System.IO.Packaging\Package.cs" />
     <Compile Include="System.IO.Packaging\PackageDigitalSignature.cs" />
     <Compile Include="System.IO.Packaging\PackageDigitalSignatureManager.cs" />
@@ -93,8 +95,6 @@
     <Compile Include="System.IO.Packaging\PackageRelationshipCollection.cs" />
     <Compile Include="System.IO.Packaging\PackageRelationshipSelector.cs" />
     <Compile Include="System.IO.Packaging\PackageRelationshipSelectorType.cs" />
-    <Compile Include="System.IO.Packaging\PackUriHelper.cs" />
-    <Compile Include="System.IO.Packaging\PackUriParser.cs" />
     <Compile Include="System.IO.Packaging\RightsManagementInformation.cs" />
     <Compile Include="System.IO.Packaging\SignatureVerificationEventArgs.cs" />
     <Compile Include="System.IO.Packaging\StorageInfo.cs" />
@@ -159,10 +159,10 @@
     <Compile Include="System.Windows.Markup\DictionaryKeyPropertyAttribute.cs" />
     <Compile Include="System.Windows.Markup\IComponentConnector.cs" />
     <Compile Include="System.Windows.Markup\INameScope.cs" />
-    <Compile Include="System.Windows.Markup\InternalTypeHelper.cs" />
     <Compile Include="System.Windows.Markup\IReceiveMarkupExtension.cs" />
     <Compile Include="System.Windows.Markup\IValueSerializerContext.cs" />
     <Compile Include="System.Windows.Markup\IXamlTypeResolver.cs" />
+    <Compile Include="System.Windows.Markup\InternalTypeHelper.cs" />
     <Compile Include="System.Windows.Markup\MarkupExtension.cs" />
     <Compile Include="System.Windows.Markup\MarkupExtensionReturnTypeAttribute.cs" />
     <Compile Include="System.Windows.Markup\NameScopePropertyAttribute.cs" />
@@ -214,9 +214,9 @@
     <Compile Include="System.Windows\Expression.cs" />
     <Compile Include="System.Windows\ExpressionConverter.cs" />
     <Compile Include="System.Windows\Freezable.cs" />
+    <Compile Include="System.Windows\IWeakEventListener.cs" />
     <Compile Include="System.Windows\Int32Rect.cs" />
     <Compile Include="System.Windows\Int32RectConverter.cs" />
-    <Compile Include="System.Windows\IWeakEventListener.cs" />
     <Compile Include="System.Windows\LocalValueEntry.cs" />
     <Compile Include="System.Windows\LocalValueEnumerator.cs" />
     <Compile Include="System.Windows\NumericListTokenizer.cs" />
@@ -248,6 +248,7 @@
     <Compile Include="ZipSharp\ZipTime.cs" />
     <Compile Include="ZipSharp\ZipWriteStream.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj
index 4857a07517a..263161ead6e 100644
--- a/mcs/class/corlib/corlib.csproj
+++ b/mcs/class/corlib/corlib.csproj
@@ -118,6 +118,98 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
+    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
+    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
+    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
+    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
+    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
+    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
+    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
+    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
+    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
+    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
+    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
+    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
+    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
+    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch_runtime' ">
+    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
+    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
+    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
+    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
+    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
+    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
+    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
+    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
+    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
+    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
+    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
+    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
+    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
+    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
+    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
+    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
+    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
+    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
+    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
+    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Buffers\ArrayPool.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Buffers\ArrayPoolEventSource.cs" />
@@ -164,8 +256,8 @@
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Collections\ObjectModel\ReadOnlyCollection.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Diagnostics\StackTraceHiddenAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Gen2GcCallback.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\CompareInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\CompareInfo.Invariant.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\CompareInfo.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\GlobalizationExtensions.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\HResults.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\ISpanFormattable.cs" />
@@ -202,15 +294,15 @@
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\FixedBufferAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\FormattableStringFactory.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IAsyncStateMachine.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IndexerNameAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\INotifyCompletion.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\ITuple.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IndexerNameAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IntrinsicAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IsByRefLikeAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IsConst.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IsReadOnlyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IsVolatile.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\IteratorStateMachineAttribute.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\ITuple.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\ReferenceAssemblyAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\RuntimeCompatibilityAttribute.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Runtime\CompilerServices\RuntimeFeature.cs" />
@@ -251,10 +343,10 @@
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\NormalizationForm.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\StringBuilder.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\StringBuilderCache.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\UnicodeEncoding.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\UTF32Encoding.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\UTF7Encoding.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\UTF8Encoding.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\UnicodeEncoding.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Text\ValueStringBuilder.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Threading\Tasks\Sources\IValueTaskSource.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Threading\Tasks\TaskCanceledException.cs" />
@@ -304,66 +396,66 @@
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\MemoryPool.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\OperationStatus.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\ReadOnlySequence.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\ReadOnlySequence_helpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\ReadOnlySequenceDebugView.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\ReadOnlySequenceSegment.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\ReadOnlySequence_helpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\StandardFormat.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Base64Decoder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Base64Encoder.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Constants.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\FormattingHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Boolean.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.G.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.L.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.O.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.R.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Date.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.E.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.F.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.G.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Decimal.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Float.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Guid.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.D.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.Default.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.N.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Signed.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.D.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.Default.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.N.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.X.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.Unsigned.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.Integer.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Formatter\Utf8Formatter.TimeSpan.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\ParserHelpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Boolean.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.Default.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.G.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.Helpers.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.O.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.R.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Date.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Decimal.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Float.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Guid.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.D.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.N.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Signed.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.D.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.N.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.X.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Integer.Unsigned.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.Number.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.BigG.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.C.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.LittleG.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpan.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Buffers\Text\Utf8Parser\Utf8Parser.TimeSpanSplitter.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\MemoryExtensions.Portable.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Number\Decimal.DecCalc.cs" />
-    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Number\Number.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Number\Number.FormatAndParse.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Number\Number.NumberBuffer.cs" />
+    <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Number\Number.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Pinnable.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\ReadOnlySpan.Portable.cs" />
     <Compile Include="..\..\..\external\corefx\src\System.Memory\src\System\Runtime\InteropServices\MemoryMarshal.Portable.cs" />
@@ -406,8 +498,8 @@
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\CancellationTokenRegistration.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\LockHolder.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Tasks\ConcurrentExclusiveSchedulerPair.cs" />
-    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Tasks\DebuggerSupport.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Tasks\DebuggerSupport.Dummy.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Tasks\DebuggerSupport.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Tasks\Future.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Tasks\FutureFactory.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Tasks\ProducerConsumerQueues.cs" />
@@ -447,11 +539,11 @@
     <Compile Include="..\Mono.Security\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.X509\PKCS12.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.X509\X501Name.cs" />
+    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CRL.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.X509\X509Certificate.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.X509\X509CertificateCollection.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.X509\X509Chain.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.X509\X509ChainStatusFlags.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.X509\X509CRL.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extension.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.X509\X509Extensions.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.X509\X509Store.cs" />
@@ -468,6 +560,11 @@
     <Compile Include="..\referencesource\mscorlib\microsoft\win32\safehandles\saferegistryhandle.cs" />
     <Compile Include="..\referencesource\mscorlib\microsoft\win32\safehandles\safewaithandle.cs" />
     <Compile Include="..\referencesource\mscorlib\microsoft\win32\safehandles\win32safehandles.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\AggregateException.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\AppContext\AppContext.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\AppContext\AppContextSwitches.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\FormattableString.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\Lazy.cs" />
     <Compile Include="..\referencesource\mscorlib\system\__filters.cs" />
     <Compile Include="..\referencesource\mscorlib\system\__hresults.cs" />
     <Compile Include="..\referencesource\mscorlib\system\_localdatastore.cs" />
@@ -475,9 +572,6 @@
     <Compile Include="..\referencesource\mscorlib\system\accessviolationexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\action.cs" />
     <Compile Include="..\referencesource\mscorlib\system\activator.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\AggregateException.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\AppContext\AppContext.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\AppContext\AppContextSwitches.cs" />
     <Compile Include="..\referencesource\mscorlib\system\appdomainattributes.cs" />
     <Compile Include="..\referencesource\mscorlib\system\appdomainunloadedexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\applicationexception.cs" />
@@ -530,10 +624,10 @@
     <Compile Include="..\referencesource\mscorlib\system\diagnostics\contracts\contracts.cs" />
     <Compile Include="..\referencesource\mscorlib\system\diagnostics\contracts\contractsbcl.cs" />
     <Compile Include="..\referencesource\mscorlib\system\diagnostics\debuggerattributes.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\eventactivityoptions.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\eventsourceexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\TraceLogging\EventSourceOptions.cs" />
     <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\TraceLogging\TraceLoggingEventTraits.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\eventactivityoptions.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\eventsourceexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\diagnostics\eventing\winmeta.cs" />
     <Compile Include="..\referencesource\mscorlib\system\dividebyzeroexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\dllnotfoundexception.cs" />
@@ -549,14 +643,14 @@
     <Compile Include="..\referencesource\mscorlib\system\fieldaccessexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\flagsattribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\formatexception.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\FormattableString.cs" />
     <Compile Include="..\referencesource\mscorlib\system\gc.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\CalendricalCalculationsHelper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\globalization\Persiancalendar.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\bidicategory.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\calendar.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\calendaralgorithmtype.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\calendardata.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\calendarweekrule.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\globalization\CalendricalCalculationsHelper.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\charunicodeinfo.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\chineselunisolarcalendar.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\culturenotfoundexception.cs" />
@@ -583,7 +677,6 @@
     <Compile Include="..\referencesource\mscorlib\system\globalization\koreanlunisolarcalendar.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\numberformatinfo.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\numberstyles.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\globalization\Persiancalendar.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\sortversion.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\stringinfo.cs" />
     <Compile Include="..\referencesource\mscorlib\system\globalization\taiwancalendar.cs" />
@@ -649,7 +742,6 @@
     <Compile Include="..\referencesource\mscorlib\system\iobserver.cs" />
     <Compile Include="..\referencesource\mscorlib\system\iprogress.cs" />
     <Compile Include="..\referencesource\mscorlib\system\iserviceobjectprovider.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\Lazy.cs" />
     <Compile Include="..\referencesource\mscorlib\system\math.cs" />
     <Compile Include="..\referencesource\mscorlib\system\memberaccessexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\methodaccessexception.cs" />
@@ -675,13 +767,14 @@
     <Compile Include="..\referencesource\mscorlib\system\progress.cs" />
     <Compile Include="..\referencesource\mscorlib\system\random.cs" />
     <Compile Include="..\referencesource\mscorlib\system\rankexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\CustomAttributeExtensions.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\reflection\RuntimeReflectionExtensions.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\ambiguousmatchexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\assemblyattributes.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\assemblynameflags.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\assemblynameproxy.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\binder.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\callingconventions.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\reflection\CustomAttributeExtensions.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\defaultmemberattribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\emit\methodbuilder.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\emit\symboltype.cs" />
@@ -715,7 +808,6 @@
     <Compile Include="..\referencesource\mscorlib\system\reflection\reflectioncontext.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\reflectiontypeloadexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\resourceattributes.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\reflection\RuntimeReflectionExtensions.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\targetexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\targetinvocationexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\reflection\targetparametercountexception.cs" />
@@ -745,9 +837,12 @@
     <Compile Include="..\referencesource\mscorlib\system\resources\satellitecontractversionattribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\resources\ultimateresourcefallbacklocation.cs" />
     <Compile Include="..\referencesource\mscorlib\system\rttype.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\NgenServicingAttributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\ProfileOptimization.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\AsyncMethodBuilder.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\YieldAwaitable.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\assemblyattributesgohere.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\assemblysettingattributes.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\AsyncMethodBuilder.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\callingconvention.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\compilationrelaxations.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\compilermarshaloverride.cs" />
@@ -772,17 +867,9 @@
     <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\scopelessenumattribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\suppressmergecheckattribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\typedependencyattribute.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\compilerservices\YieldAwaitable.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\exceptionservices\corruptingexceptioncommon.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\exceptionservices\exceptionnotification.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\exceptionservices\exceptionservicescommon.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\arraywithoffset.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\attributes.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\bstrwrapper.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\callingconvention.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\charset.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\comexception.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\commembertype.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\ibindctx.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iconnectionpoint.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\iconnectionpointcontainer.cs" />
@@ -804,6 +891,13 @@
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypeinfo2.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypelib.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\ComTypes\itypelib2.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\arraywithoffset.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\attributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\bstrwrapper.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\callingconvention.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\charset.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\comexception.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\commembertype.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\criticalhandle.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\currencywrapper.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\dispatchwrapper.cs" />
@@ -836,8 +930,6 @@
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\windowsruntime\iactivationfactory.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\windowsruntime\irestrictederrorinfo.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\interopservices\windowsruntime\windowsruntimemarshal.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\NgenServicingAttributes.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\ProfileOptimization.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\reliability\criticalfinalizerobject.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\reliability\prepreparemethodattribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\reliability\reliabilitycontractattribute.cs" />
@@ -886,20 +978,25 @@
     <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\streamingcontext.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\surrogateselector.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\serialization\valuetypefixupinfo.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\NonVersionableAttribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\componentguaranteesattribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\multitargetinghelpers.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\NonVersionableAttribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\resourceattributes.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\targetframeworkattribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\runtime\versioning\targetframeworkid.cs" />
     <Compile Include="..\referencesource\mscorlib\system\sbyte.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\attributes.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\claims\Claim.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimsIdentity.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimsPrincipal.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimTypes.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimValueTypes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimsIdentity.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\claims\ClaimsPrincipal.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\claims\RoleClaimProvider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\HashAlgorithmName.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPadding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPaddingMode.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSASignaturePadding.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSASignaturePaddingMode.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\aes.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\asymmetricalgorithm.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\asymmetrickeyexchangedeformatter.cs" />
@@ -916,7 +1013,6 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\dsasignaturedeformatter.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\dsasignatureformatter.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hashalgorithm.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\HashAlgorithmName.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmac.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmacmd5.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\hmacripemd160.cs" />
@@ -940,14 +1036,10 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\ripemd160managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsa.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsacryptoserviceprovider.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPadding.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSAEncryptionPaddingMode.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangedeformatter.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsaoaepkeyexchangeformatter.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangedeformatter.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rsapkcs1keyexchangeformatter.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSASignaturePadding.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\RSASignaturePaddingMode.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha1.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha256.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384.cs" />
@@ -976,34 +1068,34 @@
     <Compile Include="..\referencesource\mscorlib\system\text\mlangcodepageencoding.cs" />
     <Compile Include="..\referencesource\mscorlib\system\text\surrogateencoder.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threadattributes.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\CancellationToken.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\CancellationTokenSource.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\CountdownEvent.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\LazyInitializer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\ManualResetEventSlim.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\SemaphoreSlim.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\SpinLock.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\SpinWait.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\AsyncCausalityTracer.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\ThreadLocal.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\abandonedmutexexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\apartmentstate.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\asynclocal.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\autoresetevent.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\CancellationToken.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\CancellationTokenSource.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\CountdownEvent.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\eventresetmode.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\eventwaithandle.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\executioncontext.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\LazyInitializer.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\lockrecursionexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\manualresetevent.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\ManualResetEventSlim.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\monitor.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\parameterizedthreadstart.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\semaphorefullexception.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\SemaphoreSlim.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\sendorpostcallback.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\SpinLock.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\SpinWait.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\synchronizationcontext.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\synchronizationlockexception.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\Tasks\AsyncCausalityTracer.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\thread.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\threadabortexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\threadinterruptedexception.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\ThreadLocal.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\threadpool.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\threadpriority.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\threadstart.cs" />
@@ -1012,8 +1104,8 @@
     <Compile Include="..\referencesource\mscorlib\system\threading\threadstateexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\timeout.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\waithandle.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\threading\waithandlecannotbeopenedexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threading\waithandleExtensions.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\threading\waithandlecannotbeopenedexception.cs" />
     <Compile Include="..\referencesource\mscorlib\system\threadstaticattribute.cs" />
     <Compile Include="..\referencesource\mscorlib\system\throwhelper.cs" />
     <Compile Include="..\referencesource\mscorlib\system\timeoutexception.cs" />
@@ -1036,25 +1128,7 @@
     <Compile Include="..\referencesource\mscorlib\system\unsafecharbuffer.cs" />
     <Compile Include="..\referencesource\mscorlib\system\version.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
-    <Compile Include="coreclr\SorterArray.cs" />
     <Compile Include="CoreFoundation\CFHelpers.cs" />
-    <Compile Include="corefx\AwaitTaskContinuation.cs" />
-    <Compile Include="corefx\CompareInfo.cs" />
-    <Compile Include="corefx\GlobalizationMode.cs" />
-    <Compile Include="corefx\MemoryExtensions.cs" />
-    <Compile Include="corefx\MemoryMarshal.cs" />
-    <Compile Include="corefx\SR.cs" />
-    <Compile Include="corefx\SynchronizationContext.cs" />
-    <Compile Include="corert\AddrofIntrinsics.cs" />
-    <Compile Include="corert\Debug.cs" />
-    <Compile Include="corert\DependencyReductionRootAttribute.cs" />
-    <Compile Include="corert\EnvironmentAugments.cs" />
-    <Compile Include="corert\RelocatedTypeAttribute.cs" />
-    <Compile Include="corert\RuntimeAugments.cs" />
-    <Compile Include="corert\RuntimeThread.cs" />
-    <Compile Include="corert\Stream.cs" />
-    <Compile Include="corert\Task.cs" />
-    <Compile Include="corert\ThreadPool.cs" />
     <Compile Include="Microsoft.Win32\IRegistryApi.cs" />
     <Compile Include="Microsoft.Win32\Registry.cs" />
     <Compile Include="Microsoft.Win32\RegistryHive.cs" />
@@ -1092,15 +1166,14 @@
     <Compile Include="Mono\RuntimeStructs.cs" />
     <Compile Include="Mono\SafeGPtrArrayHandle.cs" />
     <Compile Include="Mono\SafeStringMarshal.cs" />
-    <Compile Include="ReferenceSources\__ConsoleStream.cs" />
     <Compile Include="ReferenceSources\AppContextDefaultValues.cs" />
     <Compile Include="ReferenceSources\AppDomain.cs" />
     <Compile Include="ReferenceSources\Array.cs" />
     <Compile Include="ReferenceSources\BCLDebug.cs" />
     <Compile Include="ReferenceSources\BinaryCompatibility.cs" />
     <Compile Include="ReferenceSources\Buffer.cs" />
-    <Compile Include="ReferenceSources\CalendarData.cs" />
     <Compile Include="ReferenceSources\CLRConfig.cs" />
+    <Compile Include="ReferenceSources\CalendarData.cs" />
     <Compile Include="ReferenceSources\CompareInfo.cs" />
     <Compile Include="ReferenceSources\CompatibilitySwitches.cs" />
     <Compile Include="ReferenceSources\CultureData.cs" />
@@ -1121,6 +1194,7 @@
     <Compile Include="ReferenceSources\TextInfo.cs" />
     <Compile Include="ReferenceSources\Type.cs" />
     <Compile Include="ReferenceSources\TypeNameParser.cs" />
+    <Compile Include="ReferenceSources\__ConsoleStream.cs" />
     <Compile Include="ReferenceSources\win32native.cs" />
     <Compile Include="System.Configuration.Assemblies\AssemblyHash.cs" />
     <Compile Include="System.Configuration.Assemblies\AssemblyHashAlgorithm.cs" />
@@ -1139,10 +1213,10 @@
     <Compile Include="System.Diagnostics.SymbolStore\ISymbolVariable.cs" />
     <Compile Include="System.Diagnostics.SymbolStore\ISymbolWriter.cs" />
     <Compile Include="System.Diagnostics.SymbolStore\SymAddressKind.cs" />
-    <Compile Include="System.Diagnostics.SymbolStore\SymbolToken.cs" />
     <Compile Include="System.Diagnostics.SymbolStore\SymDocumentType.cs" />
     <Compile Include="System.Diagnostics.SymbolStore\SymLanguageType.cs" />
     <Compile Include="System.Diagnostics.SymbolStore\SymLanguageVendor.cs" />
+    <Compile Include="System.Diagnostics.SymbolStore\SymbolToken.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventAttribute.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventCommand.cs" />
     <Compile Include="System.Diagnostics.Tracing\EventCommandEventArgs.cs" />
@@ -1164,8 +1238,8 @@
     <Compile Include="System.Diagnostics\StackTrace.cs" />
     <Compile Include="System.Globalization\CultureInfo.cs" />
     <Compile Include="System.Globalization\IdnMapping.cs" />
-    <Compile Include="System.Globalization\RegionInfo.cs" />
     <Compile Include="System.Globalization\RegionInfo.MonoTouch.cs" />
+    <Compile Include="System.Globalization\RegionInfo.cs" />
     <Compile Include="System.IO.IsolatedStorage\INormalizeForIsolatedStorage.cs" />
     <Compile Include="System.IO.IsolatedStorage\IsolatedStorage.cs" />
     <Compile Include="System.IO.IsolatedStorage\IsolatedStorageException.cs" />
@@ -1238,14 +1312,14 @@
     <Compile Include="System.Reflection.Emit\MonoArrayMethod.cs" />
     <Compile Include="System.Reflection.Emit\OpCode.cs" />
     <Compile Include="System.Reflection.Emit\OpCodeNames.cs" />
-    <Compile Include="System.Reflection.Emit\OpCodes.cs" />
     <Compile Include="System.Reflection.Emit\OpCodeType.cs" />
+    <Compile Include="System.Reflection.Emit\OpCodes.cs" />
     <Compile Include="System.Reflection.Emit\OperandType.cs" />
+    <Compile Include="System.Reflection.Emit\PEFileKinds.cs" />
     <Compile Include="System.Reflection.Emit\PackingSize.cs" />
     <Compile Include="System.Reflection.Emit\ParameterBuilder.cs" />
     <Compile Include="System.Reflection.Emit\ParameterBuilder.pns.cs" />
     <Compile Include="System.Reflection.Emit\ParameterToken.cs" />
-    <Compile Include="System.Reflection.Emit\PEFileKinds.cs" />
     <Compile Include="System.Reflection.Emit\PropertyBuilder.cs" />
     <Compile Include="System.Reflection.Emit\PropertyBuilder.pns.cs" />
     <Compile Include="System.Reflection.Emit\PropertyOnTypeBuilderInst.cs" />
@@ -1299,39 +1373,8 @@
     <Compile Include="System.Runtime.InteropServices.WindowsRuntime\NamespaceResolveEventArgs.cs" />
     <Compile Include="System.Runtime.InteropServices.WindowsRuntime\UnsafeNativeMethods.cs" />
     <Compile Include="System.Runtime.InteropServices.WindowsRuntime\WindowsRuntimeMetadata.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Activator.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Assembly.cs" />
-    <Compile Include="System.Runtime.InteropServices\_AssemblyBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_AssemblyName.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Attribute.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ConstructorBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ConstructorInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_CustomAttributeBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_EnumBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_EventBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_EventInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Exception.cs" />
-    <Compile Include="System.Runtime.InteropServices\_FieldBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_FieldInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ILGenerator.cs" />
-    <Compile Include="System.Runtime.InteropServices\_LocalBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MemberInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodBase.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_MethodRental.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Module.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ModuleBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ParameterBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_ParameterInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_PropertyBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\_PropertyInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\_SignatureHelper.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Thread.cs" />
-    <Compile Include="System.Runtime.InteropServices\_Type.cs" />
-    <Compile Include="System.Runtime.InteropServices\_TypeBuilder.cs" />
-    <Compile Include="System.Runtime.InteropServices\BIND_OPTS.cs" />
     <Compile Include="System.Runtime.InteropServices\BINDPTR.cs" />
+    <Compile Include="System.Runtime.InteropServices\BIND_OPTS.cs" />
     <Compile Include="System.Runtime.InteropServices\ComEventsHelper.cs" />
     <Compile Include="System.Runtime.InteropServices\CustomQueryInterfaceMode.cs" />
     <Compile Include="System.Runtime.InteropServices\DESCKIND.cs" />
@@ -1341,11 +1384,11 @@
     <Compile Include="System.Runtime.InteropServices\GCHandle.cs" />
     <Compile Include="System.Runtime.InteropServices\GCHandleType.cs" />
     <Compile Include="System.Runtime.InteropServices\IErrorInfo.cs" />
-    <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibConverter.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNameProvider.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibExporterNotifySink.cs" />
     <Compile Include="System.Runtime.InteropServices\ITypeLibImporterNotifySink.cs" />
+    <Compile Include="System.Runtime.InteropServices\ImporterEventKind.cs" />
     <Compile Include="System.Runtime.InteropServices\LIBFLAGS.cs" />
     <Compile Include="System.Runtime.InteropServices\ManagedErrorInfo.cs" />
     <Compile Include="System.Runtime.InteropServices\Marshal.cs" />
@@ -1353,10 +1396,10 @@
     <Compile Include="System.Runtime.InteropServices\RegistrationClassContext.cs" />
     <Compile Include="System.Runtime.InteropServices\RegistrationConnectionType.cs" />
     <Compile Include="System.Runtime.InteropServices\RegistrationServices.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeBuffer.cs" />
-    <Compile Include="System.Runtime.InteropServices\SafeHandle.cs" />
     <Compile Include="System.Runtime.InteropServices\STATSTG.cs" />
     <Compile Include="System.Runtime.InteropServices\SYSKIND.cs" />
+    <Compile Include="System.Runtime.InteropServices\SafeBuffer.cs" />
+    <Compile Include="System.Runtime.InteropServices\SafeHandle.cs" />
     <Compile Include="System.Runtime.InteropServices\TYPELIBATTR.cs" />
     <Compile Include="System.Runtime.InteropServices\TypeLibConverter.cs" />
     <Compile Include="System.Runtime.InteropServices\TypeLibExporterFlags.cs" />
@@ -1374,6 +1417,37 @@
     <Compile Include="System.Runtime.InteropServices\UCOMIStream.cs" />
     <Compile Include="System.Runtime.InteropServices\UCOMITypeComp.cs" />
     <Compile Include="System.Runtime.InteropServices\UCOMITypeLib.cs" />
+    <Compile Include="System.Runtime.InteropServices\_Activator.cs" />
+    <Compile Include="System.Runtime.InteropServices\_Assembly.cs" />
+    <Compile Include="System.Runtime.InteropServices\_AssemblyBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_AssemblyName.cs" />
+    <Compile Include="System.Runtime.InteropServices\_Attribute.cs" />
+    <Compile Include="System.Runtime.InteropServices\_ConstructorBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_ConstructorInfo.cs" />
+    <Compile Include="System.Runtime.InteropServices\_CustomAttributeBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_EnumBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_EventBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_EventInfo.cs" />
+    <Compile Include="System.Runtime.InteropServices\_Exception.cs" />
+    <Compile Include="System.Runtime.InteropServices\_FieldBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_FieldInfo.cs" />
+    <Compile Include="System.Runtime.InteropServices\_ILGenerator.cs" />
+    <Compile Include="System.Runtime.InteropServices\_LocalBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_MemberInfo.cs" />
+    <Compile Include="System.Runtime.InteropServices\_MethodBase.cs" />
+    <Compile Include="System.Runtime.InteropServices\_MethodBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_MethodInfo.cs" />
+    <Compile Include="System.Runtime.InteropServices\_MethodRental.cs" />
+    <Compile Include="System.Runtime.InteropServices\_Module.cs" />
+    <Compile Include="System.Runtime.InteropServices\_ModuleBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_ParameterBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_ParameterInfo.cs" />
+    <Compile Include="System.Runtime.InteropServices\_PropertyBuilder.cs" />
+    <Compile Include="System.Runtime.InteropServices\_PropertyInfo.cs" />
+    <Compile Include="System.Runtime.InteropServices\_SignatureHelper.cs" />
+    <Compile Include="System.Runtime.InteropServices\_Thread.cs" />
+    <Compile Include="System.Runtime.InteropServices\_Type.cs" />
+    <Compile Include="System.Runtime.InteropServices\_TypeBuilder.cs" />
     <Compile Include="System.Runtime.Remoting.Activation\ActivationServices.cs" />
     <Compile Include="System.Runtime.Remoting.Activation\ActivatorLevel.cs" />
     <Compile Include="System.Runtime.Remoting.Activation\AppDomainLevelActivator.cs" />
@@ -1461,9 +1535,9 @@
     <Compile Include="System.Runtime.Remoting.Messaging\IMethodCallMessage.cs" />
     <Compile Include="System.Runtime.Remoting.Messaging\IMethodMessage.cs" />
     <Compile Include="System.Runtime.Remoting.Messaging\IMethodReturnMessage.cs" />
-    <Compile Include="System.Runtime.Remoting.Messaging\InternalMessageWrapper.cs" />
     <Compile Include="System.Runtime.Remoting.Messaging\IRemotingFormatter.cs" />
     <Compile Include="System.Runtime.Remoting.Messaging\ISerializationRootObject.cs" />
+    <Compile Include="System.Runtime.Remoting.Messaging\InternalMessageWrapper.cs" />
     <Compile Include="System.Runtime.Remoting.Messaging\MessageSurrogateFilter.cs" />
     <Compile Include="System.Runtime.Remoting.Messaging\MethodCall.cs" />
     <Compile Include="System.Runtime.Remoting.Messaging\MethodCallDictionary.cs" />
@@ -1531,13 +1605,13 @@
     <Compile Include="System.Runtime.Remoting\CustomErrorsModes.cs" />
     <Compile Include="System.Runtime.Remoting\EnvoyInfo.cs" />
     <Compile Include="System.Runtime.Remoting\IChannelInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\Identity.cs" />
     <Compile Include="System.Runtime.Remoting\IEnvoyInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\InternalRemotingServices.cs" />
     <Compile Include="System.Runtime.Remoting\IObjectHandle.cs" />
     <Compile Include="System.Runtime.Remoting\IRemotingTypeInfo.cs" />
-    <Compile Include="System.Runtime.Remoting\ObjectHandle.cs" />
+    <Compile Include="System.Runtime.Remoting\Identity.cs" />
+    <Compile Include="System.Runtime.Remoting\InternalRemotingServices.cs" />
     <Compile Include="System.Runtime.Remoting\ObjRef.cs" />
+    <Compile Include="System.Runtime.Remoting\ObjectHandle.cs" />
     <Compile Include="System.Runtime.Remoting\RemotingConfiguration.cs" />
     <Compile Include="System.Runtime.Remoting\RemotingException.cs" />
     <Compile Include="System.Runtime.Remoting\RemotingServices.cs" />
@@ -1632,9 +1706,9 @@
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Helper.Apple.cs" />
     <Compile Include="System.Security.Cryptography.X509Certificates\X509Helper.cs" />
     <Compile Include="System.Security.Cryptography\CryptoAPITransform.cs" />
+    <Compile Include="System.Security.Cryptography\CryptoConfig.Mobile.cs" />
     <Compile Include="System.Security.Cryptography\CryptoConfig.common.cs" />
     <Compile Include="System.Security.Cryptography\CryptoConfig.cs" />
-    <Compile Include="System.Security.Cryptography\CryptoConfig.Mobile.cs" />
     <Compile Include="System.Security.Cryptography\CspKeyContainerInfo.cs" />
     <Compile Include="System.Security.Cryptography\DESCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\DSACryptoServiceProvider.cs" />
@@ -1661,12 +1735,12 @@
     <Compile Include="System.Security.Permissions\HostProtectionPermission.cs" />
     <Compile Include="System.Security.Permissions\HostProtectionResource.cs" />
     <Compile Include="System.Security.Permissions\IBuiltInPermission.cs" />
+    <Compile Include="System.Security.Permissions\IUnrestrictedPermission.cs" />
     <Compile Include="System.Security.Permissions\IsolatedStorageContainment.cs" />
     <Compile Include="System.Security.Permissions\IsolatedStorageFilePermission.cs" />
     <Compile Include="System.Security.Permissions\IsolatedStorageFilePermissionAttribute.cs" />
     <Compile Include="System.Security.Permissions\IsolatedStoragePermission.cs" />
     <Compile Include="System.Security.Permissions\IsolatedStoragePermissionAttribute.cs" />
-    <Compile Include="System.Security.Permissions\IUnrestrictedPermission.cs" />
     <Compile Include="System.Security.Permissions\KeyContainerPermission.cs" />
     <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntry.cs" />
     <Compile Include="System.Security.Permissions\KeyContainerPermissionAccessEntryCollection.cs" />
@@ -1750,11 +1824,11 @@
     <Compile Include="System.Security.Policy\Zone.cs" />
     <Compile Include="System.Security.Policy\ZoneMembershipCondition.cs" />
     <Compile Include="System.Security.Principal\GenericPrincipal.cs" />
+    <Compile Include="System.Security.Principal\IIdentity.cs" />
+    <Compile Include="System.Security.Principal\IPrincipal.cs" />
     <Compile Include="System.Security.Principal\IdentityNotMappedException.cs" />
     <Compile Include="System.Security.Principal\IdentityReference.cs" />
     <Compile Include="System.Security.Principal\IdentityReferenceCollection.cs" />
-    <Compile Include="System.Security.Principal\IIdentity.cs" />
-    <Compile Include="System.Security.Principal\IPrincipal.cs" />
     <Compile Include="System.Security.Principal\NTAccount.cs" />
     <Compile Include="System.Security.Principal\PrincipalPolicy.cs" />
     <Compile Include="System.Security.Principal\SecurityIdentifier.cs" />
@@ -1810,7 +1884,6 @@
     <Compile Include="System.Threading\TimerCallback.cs" />
     <Compile Include="System.Threading\Volatile.cs" />
     <Compile Include="System.Threading\WaitHandle.cs" />
-    <Compile Include="System\__ComObject.cs" />
     <Compile Include="System\ActivationContext.cs" />
     <Compile Include="System\AndroidPlatform.cs" />
     <Compile Include="System\AppDomain.cs" />
@@ -1822,13 +1895,13 @@
     <Compile Include="System\Array.cs" />
     <Compile Include="System\AssemblyLoadEventArgs.cs" />
     <Compile Include="System\AssemblyLoadEventHandler.cs" />
+    <Compile Include="System\CStreamReader.cs" />
+    <Compile Include="System\CStreamWriter.cs" />
     <Compile Include="System\Console.cs" />
     <Compile Include="System\Console.iOS.cs" />
     <Compile Include="System\ConsoleDriver.cs" />
     <Compile Include="System\ControlCharacters.cs" />
     <Compile Include="System\CrossAppDomainDelegate.cs" />
-    <Compile Include="System\CStreamReader.cs" />
-    <Compile Include="System\CStreamWriter.cs" />
     <Compile Include="System\Delegate.cs" />
     <Compile Include="System\DelegateSerializationHolder.cs" />
     <Compile Include="System\DomainManagerInitializationFlags.cs" />
@@ -1849,8 +1922,8 @@
     <Compile Include="System\MonoTouchAOTHelper.cs" />
     <Compile Include="System\MonoType.cs" />
     <Compile Include="System\MulticastDelegate.cs" />
-    <Compile Include="System\Nullable.cs" />
     <Compile Include="System\NullConsoleDriver.cs" />
+    <Compile Include="System\Nullable.cs" />
     <Compile Include="System\NumberFormatter.cs" />
     <Compile Include="System\Object.cs" />
     <Compile Include="System\OperatingSystem.cs" />
@@ -1869,10 +1942,10 @@
     <Compile Include="System\TermInfoStrings.cs" />
     <Compile Include="System\TimeZone.cs" />
     <Compile Include="System\TimeZoneInfo.Android.cs" />
-    <Compile Include="System\TimeZoneInfo.cs" />
     <Compile Include="System\TimeZoneInfo.MonoTouch.cs" />
     <Compile Include="System\TimeZoneInfo.Serialization.cs" />
     <Compile Include="System\TimeZoneInfo.WinRT.cs" />
+    <Compile Include="System\TimeZoneInfo.cs" />
     <Compile Include="System\TypeCode.cs" />
     <Compile Include="System\TypeIdentifier.cs" />
     <Compile Include="System\TypeSpec.cs" />
@@ -1884,11 +1957,27 @@
     <Compile Include="System\WeakReference.cs" />
     <Compile Include="System\WeakReference_T.cs" />
     <Compile Include="System\WindowsConsoleDriver.cs" />
+    <Compile Include="System\__ComObject.cs" />
+    <Compile Include="coreclr\SorterArray.cs" />
+    <Compile Include="corefx\AwaitTaskContinuation.cs" />
+    <Compile Include="corefx\CompareInfo.cs" />
+    <Compile Include="corefx\GlobalizationMode.cs" />
+    <Compile Include="corefx\MemoryExtensions.cs" />
+    <Compile Include="corefx\MemoryMarshal.cs" />
+    <Compile Include="corefx\SR.cs" />
+    <Compile Include="corefx\SynchronizationContext.cs" />
+    <Compile Include="corert\AddrofIntrinsics.cs" />
+    <Compile Include="corert\Debug.cs" />
+    <Compile Include="corert\DependencyReductionRootAttribute.cs" />
+    <Compile Include="corert\EnvironmentAugments.cs" />
+    <Compile Include="corert\RelocatedTypeAttribute.cs" />
+    <Compile Include="corert\RuntimeAugments.cs" />
+    <Compile Include="corert\RuntimeThread.cs" />
+    <Compile Include="corert\Stream.cs" />
+    <Compile Include="corert\Task.cs" />
+    <Compile Include="corert\ThreadPool.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\Interop.Libraries.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\System.Native\Interop.GetRandomBytes.cs" />
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\HashCode.cs" />
+  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
@@ -1900,29 +1989,11 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
-    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\descryptoserviceprovider.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rc2cryptoserviceprovider.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rijndaelmanaged.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha1managed.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha256managed.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
-    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
     <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
     <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
-    <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
-    <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
@@ -1930,157 +2001,49 @@
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
     <Compile Include="CommonCrypto\FastCryptorTransform.cs" />
     <Compile Include="CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
     <Compile Include="CommonCrypto\RNGCryptoServiceProvider.cryptor.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
+    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
     <Compile Include="System.Text\EncodingHelper.MonoTouch.cs" />
     <Compile Include="System\Environment.iOS.cs" />
     <Compile Include="System\Guid.MonoTouch.cs" />
     <Compile Include="System\NotSupportedException.iOS.cs" />
-    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
-    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
-    <Compile Include="CommonCrypto\CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\CorlibExtras.cs" />
-    <Compile Include="CommonCrypto\CryptorTransform.cs" />
-    <Compile Include="CommonCrypto\FastCryptorTransform.cs" />
-    <Compile Include="CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
-    <Compile Include="CommonCrypto\RNGCryptoServiceProvider.cryptor.cs" />
     <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
     <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
-    <Compile Include="System.Text\EncodingHelper.MonoTouch.cs" />
-    <Compile Include="System\Environment.iOS.cs" />
-    <Compile Include="System\Guid.MonoTouch.cs" />
-    <Compile Include="System\NotSupportedException.iOS.cs" />
-    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
-    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
     <Compile Include="CommonCrypto\CorlibExtras.cs" />
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
     <Compile Include="CommonCrypto\FastCryptorTransform.cs" />
     <Compile Include="CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
     <Compile Include="CommonCrypto\RNGCryptoServiceProvider.cryptor.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
+    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
     <Compile Include="System.Text\EncodingHelper.MonoTouch.cs" />
     <Compile Include="System\Environment.iOS.cs" />
     <Compile Include="System\Guid.MonoTouch.cs" />
     <Compile Include="System\NotSupportedException.iOS.cs" />
-    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
-    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch_runtime' ">
-    <Compile Include="CommonCrypto\CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\CorlibExtras.cs" />
-    <Compile Include="CommonCrypto\CryptorTransform.cs" />
-    <Compile Include="CommonCrypto\FastCryptorTransform.cs" />
-    <Compile Include="CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
-    <Compile Include="CommonCrypto\RNGCryptoServiceProvider.cryptor.cs" />
     <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
     <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
-    <Compile Include="System.Text\EncodingHelper.MonoTouch.cs" />
-    <Compile Include="System\Environment.iOS.cs" />
-    <Compile Include="System\Guid.MonoTouch.cs" />
-    <Compile Include="System\NotSupportedException.iOS.cs" />
-    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
-    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
+  <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
     <Compile Include="CommonCrypto\CorlibExtras.cs" />
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
     <Compile Include="CommonCrypto\FastCryptorTransform.cs" />
     <Compile Include="CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
     <Compile Include="CommonCrypto\RNGCryptoServiceProvider.cryptor.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
+    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
     <Compile Include="System.Text\EncodingHelper.MonoTouch.cs" />
     <Compile Include="System\Environment.iOS.cs" />
     <Compile Include="System\Guid.MonoTouch.cs" />
     <Compile Include="System\NotSupportedException.iOS.cs" />
-    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
-    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
-    <Compile Include="CommonCrypto\CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\CorlibExtras.cs" />
-    <Compile Include="CommonCrypto\CryptorTransform.cs" />
-    <Compile Include="CommonCrypto\FastCryptorTransform.cs" />
-    <Compile Include="CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
-    <Compile Include="CommonCrypto\RNGCryptoServiceProvider.cryptor.cs" />
     <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
     <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
-    <Compile Include="System.Text\EncodingHelper.MonoTouch.cs" />
-    <Compile Include="System\Environment.iOS.cs" />
-    <Compile Include="System\Guid.MonoTouch.cs" />
-    <Compile Include="System\NotSupportedException.iOS.cs" />
-    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
-    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|linux' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\System.Native\Interop.GetRandomBytes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\HashCode.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
@@ -2092,13 +2055,16 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
+    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
+    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|macos' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\System.Native\Interop.GetRandomBytes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\HashCode.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
@@ -2110,13 +2076,34 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
+    <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
+    <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
+    <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
     <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
     <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|unix' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\System.Native\Interop.GetRandomBytes.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\HashCode.cs" />
+    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
+    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
+    <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\descryptoserviceprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rc2cryptoserviceprovider.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\rijndaelmanaged.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha1managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha256managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
+    <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
+    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
+    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+  <ItemGroup Condition=" '$(Platform)|$(HostPlatform)' == 'net_4_x|win32' ">
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Windows\Interop.Libraries.cs" />
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\HashCode.cs" />
@@ -2131,9 +2118,9 @@
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\Microsoft\Win32\SafeHandles\SafeThreadPoolIOHandle.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\ThreadPoolCallbackWrapper.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolBoundHandle.cs" />
-    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolNativeOverlapped.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolNativeOverlapped.ExecutionContextCallbackArgs.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolNativeOverlapped.OverlappedData.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolNativeOverlapped.cs" />
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolPreAllocatedOverlapped.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
@@ -2150,29 +2137,7 @@
     <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
-    <Compile Include="CommonCrypto\CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\CorlibExtras.cs" />
-    <Compile Include="CommonCrypto\CryptorTransform.cs" />
-    <Compile Include="CommonCrypto\FastCryptorTransform.cs" />
-    <Compile Include="CommonCrypto\RC4CommonCrypto.cs" />
-    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
-    <Compile Include="CommonCrypto\RNGCryptoServiceProvider.cryptor.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
-    <Compile Include="CommonCrypto\DESCryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\MD2Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD4Managed.g.cs" />
-    <Compile Include="CommonCrypto\MD5CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\RC2CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1CryptoServiceProvider.g.cs" />
-    <Compile Include="CommonCrypto\SHA1Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA256Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA384Managed.g.cs" />
-    <Compile Include="CommonCrypto\SHA512Managed.g.cs" />
-    <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
+  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
@@ -2184,13 +2149,13 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
+    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
+    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'orbis' ">
+  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
@@ -2202,13 +2167,13 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
+    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
+    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'unreal' ">
+  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
@@ -2220,13 +2185,31 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
+    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
+    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(Platform)' == 'wasm' ">
+  <ItemGroup Condition=" '$(Platform)' == 'winaot' ">
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Windows\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\HashCode.cs" />
+    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Windows\Interop.Libraries.cs" />
+    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Windows\mincore\Interop.MemAllocFree.cs" />
+    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Windows\mincore\Interop.ThreadPoolIO.cs" />
+    <Compile Include="..\..\..\external\corert\src\Runtime.Base\src\System\Runtime\InteropServices\NativeCallableAttribute.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\Interop\Windows\Interop.Errors.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\Interop\Windows\Kernel32\Interop.FormatMessage.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\IO\Win32Marshal.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\Threading\DeferredDisposableLifetime.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\Microsoft\Win32\SafeHandles\SafeThreadPoolIOHandle.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\ThreadPoolCallbackWrapper.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolBoundHandle.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolNativeOverlapped.ExecutionContextCallbackArgs.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolNativeOverlapped.OverlappedData.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolNativeOverlapped.cs" />
+    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\Win32ThreadPoolPreAllocatedOverlapped.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />
     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />
@@ -2238,12 +2221,21 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
-    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
-    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
+    <Compile Include="CommonCrypto\CommonCrypto.cs" />
+    <Compile Include="CommonCrypto\CorlibExtras.cs" />
+    <Compile Include="CommonCrypto\CryptorTransform.cs" />
+    <Compile Include="CommonCrypto\FastCryptorTransform.cs" />
+    <Compile Include="CommonCrypto\RC4CommonCrypto.cs" />
+    <Compile Include="CommonCrypto\RNGCryptoServiceProvider.cryptor.cs" />
+    <Compile Include="CommonCrypto\RijndaelManaged.cs" />
+    <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />
+    <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />
+  </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' "></ItemGroup>
diff --git a/mcs/class/legacy/Mono.Cecil/legacy_Mono.Cecil.csproj b/mcs/class/legacy/Mono.Cecil/legacy_Mono.Cecil.csproj
index f5011750142..4db568388a7 100644
--- a/mcs/class/legacy/Mono.Cecil/legacy_Mono.Cecil.csproj
+++ b/mcs/class/legacy/Mono.Cecil/legacy_Mono.Cecil.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil.Cil\Code.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil.Cil\CodeReader.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil.Cil\CodeWriter.cs" />
@@ -140,13 +140,13 @@
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\ModuleKind.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\ModuleReference.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\NativeType.cs" />
+    <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\PInvokeAttributes.cs" />
+    <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\PInvokeInfo.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\ParameterAttributes.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\ParameterDefinition.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\ParameterDefinitionCollection.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\ParameterReference.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\PinnedType.cs" />
-    <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\PInvokeAttributes.cs" />
-    <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\PInvokeInfo.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\PointerType.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\PropertyAttributes.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono.Cecil\PropertyDefinition.cs" />
@@ -173,6 +173,7 @@
     <Compile Include="..\..\..\..\external\cecil-legacy\Mono\Funcs.cs" />
     <Compile Include="..\..\..\..\external\cecil-legacy\System.Runtime.CompilerServices\ExtensionAttribute.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/class/monodoc/monodoc.csproj b/mcs/class/monodoc/monodoc.csproj
index dc251bcc52d..dc7bfbd6d9b 100644
--- a/mcs/class/monodoc/monodoc.csproj
+++ b/mcs/class/monodoc/monodoc.csproj
@@ -49,9 +49,10 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Analyzer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\ASCIIFoldingFilter.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Analyzer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\BaseCharFilter.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\CachingTokenFilter.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\CharArraySet.cs" />
@@ -81,6 +82,8 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\StopFilter.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\TeeSinkTokenFilter.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Token.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\TokenFilter.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\TokenStream.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\FlagsAttribute.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\IFlagsAttribute.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\IOffsetAttribute.cs" />
@@ -93,9 +96,7 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\PositionIncrementAttribute.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\TermAttribute.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\TypeAttribute.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\TokenFilter.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\Tokenizer.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\TokenStream.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\WhitespaceAnalyzer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\WhitespaceTokenizer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Analysis\WordlistLoader.cs" />
@@ -105,9 +106,9 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\DateTools.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\Document.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\Field.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\Fieldable.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\FieldSelector.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\FieldSelectorResult.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\Fieldable.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\LoadFirstFieldSelector.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\MapFieldSelector.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Document\NumberTools.cs" />
@@ -187,8 +188,8 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\MergeScheduler.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\MultiLevelSkipListReader.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\MultiLevelSkipListWriter.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\MultipleTermPositions.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\MultiReader.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\MultipleTermPositions.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\NormsWriter.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\NormsWriterPerField.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\NormsWriterPerThread.cs" />
@@ -207,8 +208,8 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\SegmentReader.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\SegmentTermDocs.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\SegmentTermEnum.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\SegmentTermPositions.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\SegmentTermPositionVector.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\SegmentTermPositions.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\SegmentTermVector.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\SegmentWriteState.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\SerialMergeScheduler.cs" />
@@ -225,14 +226,8 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermInfo.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermInfosReader.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermInfosWriter.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermPositions.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermPositionVector.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHash.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashConsumer.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashConsumerPerField.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashConsumerPerThread.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashPerField.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashPerThread.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermPositions.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermVectorEntry.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermVectorEntryFreqSortedComparator.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermVectorMapper.cs" />
@@ -242,8 +237,14 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermVectorsTermsWriterPerField.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermVectorsTermsWriterPerThread.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermVectorsWriter.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\LucenePackage.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHash.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashConsumer.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashConsumerPerField.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashConsumerPerThread.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashPerField.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Index\TermsHashPerThread.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\LZOCompressor.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\LucenePackage.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Messages\INLSException.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Messages\Message.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Messages\MessageImpl.cs" />
@@ -285,11 +286,11 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\FieldDocSortedHitQueue.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\FieldValueHitQueue.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Filter.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\FilterManager.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\FilteredDocIdSet.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\FilteredDocIdSetIterator.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\FilteredQuery.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\FilteredTermEnum.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\FilterManager.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Function\ByteFieldSource.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Function\CustomScoreProvider.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Function\CustomScoreQuery.cs" />
@@ -357,10 +358,10 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Spans\SpanNotQuery.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Spans\SpanOrQuery.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Spans\SpanQuery.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Spans\Spans.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Spans\SpanScorer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Spans\SpanTermQuery.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Spans\SpanWeight.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Spans\Spans.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\Spans\TermSpans.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\TermQuery.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Search\TermRangeFilter.cs" />
@@ -382,9 +383,9 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\CheckSumIndexInput.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\CheckSumIndexOutput.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\Directory.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\FileSwitchDirectory.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\FSDirectory.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\FSLockFactory.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\FileSwitchDirectory.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\IndexInput.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\IndexOutput.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\Lock.cs" />
@@ -394,8 +395,8 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\LockStressTest.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\LockVerifyServer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\MMapDirectory.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\NativeFSLockFactory.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\NIOFSDirectory.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\NativeFSLockFactory.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\NoLockFactory.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\NoSuchDirectoryException.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Store\RAMDirectory.cs" />
@@ -410,6 +411,7 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\AttributeImplItem.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\BitSetSupport.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\BuildType.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\CRC32.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Character.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\CloseableThreadLocalProfiler.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\CollectionsHelper.cs" />
@@ -421,7 +423,6 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Compatibility\SortedSet.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Compatibility\ThreadLocal.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Compatibility\WrappedHashSet.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\CRC32.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Cryptography.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Deflater.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Double.cs" />
@@ -430,8 +431,8 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\GeneralKeyedCollection.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\HashMap.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\IChecksum.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Inflater.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\IThreadRunnable.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Inflater.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\Number.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\OS.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Support\SharpZipLib.cs" />
@@ -477,15 +478,28 @@
     <Compile Include="..\..\..\external\api-doc-tools\external\Lucene.Net.Light\src\core\Util\Version.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Mono.Documentation\ManifestResourceResolver.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Mono.Documentation\XmlDocUtils.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Mono.Utilities\colorizer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Mono.Utilities\LRUCache.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Mono.Utilities\colorizer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc.Ecma\EcmaDesc.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc.Ecma\EcmaUrlTokenizer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc.Ecma\prebuilt\EcmaUrlParser.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\HelpSource.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\HelpSource_Legacy.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\Node.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\Node_Legacy.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\Provider.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\RootTree.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\RootTree_Legacy.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\SearchableDocument.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\SearchableIndex.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\Tree.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\TypeUtils.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\cache.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\caches\FileCache.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\caches\NullCache.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generator.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\HtmlGenerator.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\RawGenerator.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\html\Addin2Html.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\html\Ecma2Html.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\html\Ecmaspec2Html.cs" />
@@ -494,36 +508,24 @@
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\html\Man2Html.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\html\MonoBook2Html.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\html\Toc2Html.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\HtmlGenerator.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\generators\RawGenerator.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\HelpSource.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\HelpSource_Legacy.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\index.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\Node.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\Node_Legacy.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\Provider.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\providers\addins-provider.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\providers\EcmaDoc.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\providers\addins-provider.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\providers\ecma-provider.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\providers\ecmaspec-provider.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\providers\ecmauncompiled-provider.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\providers\error-provider.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\providers\man-provider.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\providers\xhtml-provider.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\RootTree.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\RootTree_Legacy.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\SearchableDocument.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\SearchableIndex.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\settings.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\settings_Legacy.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\storage.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\storage\NullStorage.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\storage\UncompiledDocStorage.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\storage\ZipStorage.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\Tree.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\monodoc\Monodoc\TypeUtils.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj" />
diff --git a/mcs/ilasm/ilasm.csproj b/mcs/ilasm/ilasm.csproj
index 04ef123c505..24222b23dc1 100644
--- a/mcs/ilasm/ilasm.csproj
+++ b/mcs/ilasm/ilasm.csproj
@@ -41,10 +41,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+    <Compile Include="ILParser.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\build\common\Consts.cs" />
     <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Driver.cs" />
+    <Compile Include="Report.cs" />
     <Compile Include="codegen\Assembly.cs" />
     <Compile Include="codegen\BaseClassRef.cs" />
     <Compile Include="codegen\BaseGenericTypeRef.cs" />
@@ -75,17 +80,17 @@
     <Compile Include="codegen\GenericArguments.cs" />
     <Compile Include="codegen\GenericMethodRef.cs" />
     <Compile Include="codegen\GenericMethodSig.cs" />
-    <Compile Include="codegen\GenericParameters.cs" />
     <Compile Include="codegen\GenericParamRef.cs" />
+    <Compile Include="codegen\GenericParameters.cs" />
     <Compile Include="codegen\GenericTypeInst.cs" />
     <Compile Include="codegen\GlobalFieldRef.cs" />
     <Compile Include="codegen\GlobalMethodRef.cs" />
     <Compile Include="codegen\HandlerBlock.cs" />
     <Compile Include="codegen\IFieldRef.cs" />
     <Compile Include="codegen\IInstr.cs" />
+    <Compile Include="codegen\ISehClause.cs" />
     <Compile Include="codegen\InstrTable.cs" />
     <Compile Include="codegen\IntInstr.cs" />
-    <Compile Include="codegen\ISehClause.cs" />
     <Compile Include="codegen\LabelInfo.cs" />
     <Compile Include="codegen\LdcInstr.cs" />
     <Compile Include="codegen\LdstrInstr.cs" />
@@ -115,22 +120,20 @@
     <Compile Include="codegen\TypeRef.cs" />
     <Compile Include="codegen\TypeSpecFieldRef.cs" />
     <Compile Include="codegen\TypeSpecMethodRef.cs" />
-    <Compile Include="Driver.cs" />
     <Compile Include="parser\ScannerAdapter.cs" />
-    <Compile Include="Report.cs" />
     <Compile Include="scanner\ILReader.cs" />
     <Compile Include="scanner\ILTables.cs" />
     <Compile Include="scanner\ILToken.cs" />
     <Compile Include="scanner\ILTokenizer.cs" />
     <Compile Include="scanner\ILTokenizingException.cs" />
-    <Compile Include="scanner\InstrToken.cs" />
     <Compile Include="scanner\ITokenStream.cs" />
+    <Compile Include="scanner\InstrToken.cs" />
     <Compile Include="scanner\Location.cs" />
     <Compile Include="scanner\NumberHelper.cs" />
     <Compile Include="scanner\StringHelper.cs" />
     <Compile Include="scanner\StringHelperBase.cs" />
-    <Compile Include="ILParser.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/mcs/mcs.csproj b/mcs/mcs/mcs.csproj
index 308a8e3f163..5c21cf4ef04 100644
--- a/mcs/mcs/mcs.csproj
+++ b/mcs/mcs/mcs.csproj
@@ -41,25 +41,109 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\..\external\ikvm\reflect\*.cs" />
-    <Compile Include="..\..\external\ikvm\reflect\Emit\*.cs" />
+    <Compile Include="cs-parser.cs" />
+  </ItemGroup>
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
+    <Compile Include="..\..\external\ikvm\reflect\AmbiguousMatchException.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Assembly.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\AssemblyName.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\BadImageFormatException.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Binder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\ConstructorInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\CustomAttributeData.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\CustomAttributeNamedArgument.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\CustomAttributeTypedArgument.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\CustomModifiers.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\AssemblyBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\ConstructorBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\CustomAttributeBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\CustomModifiersBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\EnumBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\Enums.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\EventBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\ExceptionHandler.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\FieldBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\ILGenerator.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\MethodBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\ModuleBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\OpCode.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\OpCodes.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\ParameterBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\PropertyBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\SignatureHelper.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\Tokens.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Emit\TypeBuilder.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Enums.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\EventInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\ExceptionHandlingClause.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\FieldInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\FieldSignature.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Fusion.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\GenericWrappers.cs" />
     <Compile Include="..\..\external\ikvm\reflect\Impl\ITypeOwner.cs" />
     <Compile Include="..\..\external\ikvm\reflect\Impl\SymbolSupport.cs" />
-    <Compile Include="..\..\external\ikvm\reflect\Metadata\*.cs" />
-    <Compile Include="..\..\external\ikvm\reflect\Reader\*.cs" />
-    <Compile Include="..\..\external\ikvm\reflect\Writer\*.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\InterfaceMapping.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\LocalVariableInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\ManifestResourceInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\MarshalSpec.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\MemberInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Metadata\CliHeader.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Metadata\MetadataRW.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Metadata\Tables.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\MethodBase.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\MethodBody.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\MethodImplMap.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\MethodInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\MethodSignature.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Missing.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Module.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\ParameterInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\ParameterModifier.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Projection.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\PropertyInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\PropertySignature.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\AssemblyReader.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\Authenticode.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\ByteReader.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\EventInfoImpl.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\Field.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\GenericTypeParameter.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\MetadataReader.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\Method.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\ModuleReader.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\PEReader.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\PropertyInfoImpl.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\ResourceModule.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Reader\TypeDefImpl.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Signature.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\StandAloneMethodSig.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\StrongNameKeyPair.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Type.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\TypeInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\TypeNameParser.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Universe.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Util.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Writer\ByteBuffer.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Writer\Heaps.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Writer\MetadataWriter.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Writer\ModuleWriter.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Writer\PEWriter.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Writer\ResourceSection.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Writer\TextSection.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\Writer\VersionInfo.cs" />
+    <Compile Include="..\..\external\ikvm\reflect\coreclr.cs" />
     <Compile Include="..\build\common\Consts.cs" />
     <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
     <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
     <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />
     <Compile Include="..\class\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />
     <Compile Include="..\tools\monop\outline.cs" />
+    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="anonymous.cs" />
     <Compile Include="argument.cs" />
     <Compile Include="assembly.cs" />
-    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="assign.cs" />
     <Compile Include="async.cs" />
     <Compile Include="attribute.cs" />
@@ -109,8 +193,8 @@
     <Compile Include="typemanager.cs" />
     <Compile Include="typespec.cs" />
     <Compile Include="visit.cs" />
-    <Compile Include="cs-parser.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/nunit24/ClientUtilities/util/nunit.util.csproj b/mcs/nunit24/ClientUtilities/util/nunit.util.csproj
index ae47573c5a2..6fc17ada06e 100644
--- a/mcs/nunit24/ClientUtilities/util/nunit.util.csproj
+++ b/mcs/nunit24/ClientUtilities/util/nunit.util.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" />
     <Compile Include="AggregatingTestRunner.cs" />
     <Compile Include="AssemblyInfo.cs" />
@@ -103,6 +103,7 @@
     <Compile Include="XmlResultVisitor.cs" />
     <Compile Include="XmlSettingsStorage.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console.csproj b/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console.csproj
index d582f1bd64e..0d535930ce3 100644
--- a/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console.csproj
+++ b/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console.csproj
@@ -41,12 +41,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" />
-    <Compile Include="assemblyinfo.cs" />
     <Compile Include="Class1.cs" />
+    <Compile Include="assemblyinfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner.csproj b/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner.csproj
index 680f847e88d..df84d30c866 100644
--- a/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner.csproj
+++ b/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="ConsoleOptions.cs" />
@@ -50,6 +50,7 @@
     <Compile Include="EventCollector.cs" />
     <Compile Include="Runner.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/nunit24/NUnitCore/core/nunit.core.csproj b/mcs/nunit24/NUnitCore/core/nunit.core.csproj
index dc5883caf41..13b54f14fe0 100644
--- a/mcs/nunit24/NUnitCore/core/nunit.core.csproj
+++ b/mcs/nunit24/NUnitCore/core/nunit.core.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" />
     <Compile Include="AbstractTestCaseDecoration.cs" />
     <Compile Include="AssemblyInfo.cs" />
@@ -76,15 +76,15 @@
     <Compile Include="LegacySuite.cs" />
     <Compile Include="Log4NetCapture.cs" />
     <Compile Include="LogCapture.cs" />
-    <Compile Include="NamespaceTreeBuilder.cs" />
-    <Compile Include="NoTestFixturesException.cs" />
-    <Compile Include="NotRunnableTestCase.cs" />
     <Compile Include="NTrace.cs" />
-    <Compile Include="NullListener.cs" />
     <Compile Include="NUnitException.cs" />
     <Compile Include="NUnitFramework.cs" />
     <Compile Include="NUnitTestFixture.cs" />
     <Compile Include="NUnitTestMethod.cs" />
+    <Compile Include="NamespaceTreeBuilder.cs" />
+    <Compile Include="NoTestFixturesException.cs" />
+    <Compile Include="NotRunnableTestCase.cs" />
+    <Compile Include="NullListener.cs" />
     <Compile Include="PlatformHelper.cs" />
     <Compile Include="ProxyTestRunner.cs" />
     <Compile Include="QueuingEventListener.cs" />
@@ -107,9 +107,10 @@
     <Compile Include="TestSuite.cs" />
     <Compile Include="TestSuiteBuilder.cs" />
     <Compile Include="TextCapture.cs" />
-    <Compile Include="ThreadedTestRunner.cs" />
     <Compile Include="ThreadUtility.cs" />
+    <Compile Include="ThreadedTestRunner.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces.csproj b/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces.csproj
index 4e50a518846..e1a72f6f54e 100644
--- a/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces.csproj
+++ b/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="EventListener.cs" />
@@ -87,6 +87,7 @@
     <Compile Include="TestRunner.cs" />
     <Compile Include="TestSuiteResult.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions.csproj b/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions.csproj
index 2c70965cbb3..6c06c2c6220 100644
--- a/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions.csproj
+++ b/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="RepeatedTestCase.cs" />
@@ -54,6 +54,7 @@
     <Compile Include="RowTest\RowTestNameBuilder.cs" />
     <Compile Include="RowTest\RowTestSuite.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions.csproj b/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions.csproj
index 28d01303ff8..5060d6f8679 100644
--- a/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions.csproj
+++ b/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions.csproj
@@ -41,18 +41,19 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="RepeatAttribute.cs" />
     <Compile Include="RowAttribute.cs" />
+    <Compile Include="RowTestAttribute.cs" />
     <Compile Include="RowTest\RowAttribute.cs" />
     <Compile Include="RowTest\RowTestAttribute.cs" />
     <Compile Include="RowTest\SpecialValue.cs" />
-    <Compile Include="RowTestAttribute.cs" />
     <Compile Include="SpecialValue.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/nunit24/NUnitFramework/framework/NUnit.Framework.csproj b/mcs/nunit24/NUnitFramework/framework/NUnit.Framework.csproj
index cf00a05825d..c9b95be5678 100644
--- a/mcs/nunit24/NUnitFramework/framework/NUnit.Framework.csproj
+++ b/mcs/nunit24/NUnitFramework/framework/NUnit.Framework.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" />
     <Compile Include="AbstractAsserter.cs" />
     <Compile Include="AssemblyInfo.cs" />
@@ -98,6 +98,7 @@
     <Compile Include="TestFixtureTearDownAttribute.cs" />
     <Compile Include="TextMessageWriter.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/nunit24/NUnitMocks/mocks/nunit.mocks.csproj b/mcs/nunit24/NUnitMocks/mocks/nunit.mocks.csproj
index 6c8ca5adb12..87dd1312a7f 100644
--- a/mcs/nunit24/NUnitMocks/mocks/nunit.mocks.csproj
+++ b/mcs/nunit24/NUnitMocks/mocks/nunit.mocks.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="DynamicMock.cs" />
@@ -57,6 +57,7 @@
     <Compile Include="MockInterfaceHandler.cs" />
     <Compile Include="MockMethod.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/al/al.csproj b/mcs/tools/al/al.csproj
index beab88d5ac8..b3813c98d35 100644
--- a/mcs/tools/al/al.csproj
+++ b/mcs/tools/al/al.csproj
@@ -41,18 +41,103 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\..\..\external\ikvm\reflect\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Emit\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Impl\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Properties\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Reader\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Writer\*.cs" />
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
+    <Compile Include="..\..\..\external\ikvm\reflect\AmbiguousMatchException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Assembly.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\AssemblyName.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\BadImageFormatException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Binder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ConstructorInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeData.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeNamedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeTypedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomModifiers.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\AssemblyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ConstructorBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomAttributeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomModifiersBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EnumBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EventBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ExceptionHandler.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\FieldBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ILGenerator.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\MethodBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ModuleBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCodes.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ParameterBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\PropertyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\SignatureHelper.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Tokens.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\TypeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\EventInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ExceptionHandlingClause.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Fusion.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\GenericWrappers.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Impl\ITypeOwner.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Impl\MdbWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Impl\PdbWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Impl\SymbolSupport.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\InterfaceMapping.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\LocalVariableInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ManifestResourceInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MarshalSpec.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MemberInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\CliHeader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\MetadataRW.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\Tables.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBase.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBody.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodImplMap.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Missing.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Module.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterModifier.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Projection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertyInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertySignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\AssemblyReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Authenticode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ByteReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\EventInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Field.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\GenericTypeParameter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\MetadataReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Method.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ModuleReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PEReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PropertyInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ResourceModule.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\TypeDefImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Signature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StandAloneMethodSig.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StrongNameKeyPair.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Type.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeNameParser.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Universe.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Util.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ByteBuffer.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\Heaps.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\MetadataWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ModuleWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\PEWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ResourceSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\TextSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\VersionInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\coreclr.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="Al.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/browsercaps-updater/browsercaps-updater.csproj b/mcs/tools/browsercaps-updater/browsercaps-updater.csproj
index 1930852a8df..18deff6ce53 100644
--- a/mcs/tools/browsercaps-updater/browsercaps-updater.csproj
+++ b/mcs/tools/browsercaps-updater/browsercaps-updater.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="BrowserCapsUpdater.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/cccheck/cccheck.csproj b/mcs/tools/cccheck/cccheck.csproj
index a0558e1aeee..125582a9bd9 100644
--- a/mcs/tools/cccheck/cccheck.csproj
+++ b/mcs/tools/cccheck/cccheck.csproj
@@ -41,12 +41,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="Program.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/ccrewrite/ccrewrite.csproj b/mcs/tools/ccrewrite/ccrewrite.csproj
index 7294a5c7dc0..3496f8b11fe 100644
--- a/mcs/tools/ccrewrite/ccrewrite.csproj
+++ b/mcs/tools/ccrewrite/ccrewrite.csproj
@@ -41,12 +41,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="Program.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/cil-strip/mono-cil-strip.csproj b/mcs/tools/cil-strip/mono-cil-strip.csproj
index 7aaaf58af14..9b036b2c77e 100644
--- a/mcs/tools/cil-strip/mono-cil-strip.csproj
+++ b/mcs/tools/cil-strip/mono-cil-strip.csproj
@@ -46,322 +46,324 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
-    <Compile Include=".\AssemblyStripper.cs" />
-    <Compile Include=".\cilstrip.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\BaseImageVisitor.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\CLIHeader.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\CopyImageVisitor.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\DataDirectory.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\DebugHeader.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\DebugStoreType.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\DOSHeader.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ExportTable.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\IBinaryVisitable.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\IBinaryVisitor.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\IHeader.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\Image.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ImageCharacteristics.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ImageFormatException.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ImageInitializer.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ImageReader.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ImageWriter.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\Imports.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\MemoryBinaryWriter.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\PEFileHeader.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\PEOptionalHeader.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ResourceDataEntry.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ResourceDirectoryEntry.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ResourceDirectoryString.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ResourceDirectoryTable.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ResourceNode.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ResourceReader.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\ResourceWriter.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\RuntimeImage.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\RVA.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\Section.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\SectionCharacteristics.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\SectionCollection.cs" />
-    <Compile Include=".\Mono.Cecil.Binary\SubSystem.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\BaseCodeVisitor.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\CilWorker.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\Code.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\CodeReader.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\CodeWriter.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\Document.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\DocumentHashAlgorithm.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\DocumentLanguage.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\DocumentLanguageVendor.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\DocumentType.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\ExceptionHandler.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\ExceptionHandlerCollection.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\ExceptionHandlerType.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\FlowControl.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\GuidAttribute.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\ICodeVisitable.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\ICodeVisitor.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\Instruction.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\InstructionCollection.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\IScopeProvider.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\ISymbolReader.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\ISymbolStoreFactory.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\ISymbolWriter.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\IVariableDefinitionProvider.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\MethodBody.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\MethodDataSection.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\MethodHeader.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\OpCode.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\OpCodeNames.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\OpCodes.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\OpCodeType.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\OperandType.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\Scope.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\ScopeCollection.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\SequencePoint.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\StackBehaviour.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\SymbolStoreHelper.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\VariableDefinition.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\VariableDefinitionCollection.cs" />
-    <Compile Include=".\Mono.Cecil.Cil\VariableReference.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\Assembly.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\AssemblyOS.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\AssemblyProcessor.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\AssemblyRef.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\AssemblyRefOS.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\AssemblyRefProcessor.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\BaseMetadataVisitor.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\BlobHeap.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\ClassLayout.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\CodedIndex.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\Constant.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\CultureUtils.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\CustomAttribute.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\DeclSecurity.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\ElementType.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\Event.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\EventMap.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\EventPtr.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\ExportedType.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\Field.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\FieldLayout.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\FieldMarshal.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\FieldPtr.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\FieldRVA.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\File.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\GenericParam.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\GenericParamConstraint.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\GuidHeap.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\IMetadataRow.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\IMetadataTable.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\IMetadataVisitable.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\IMetadataVisitor.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\ImplMap.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\InterfaceImpl.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\ManifestResource.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MemberRef.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataFormatException.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataHeap.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataInitializer.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataReader.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataRoot.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataRowReader.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataRowWriter.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataStream.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataStreamCollection.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataTableReader.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataTableWriter.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataToken.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MetadataWriter.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\Method.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MethodImpl.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MethodPtr.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MethodSemantics.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\MethodSpec.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\Module.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\ModuleRef.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\NestedClass.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\Param.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\ParamPtr.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\Property.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\PropertyMap.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\PropertyPtr.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\RowCollection.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\StandAloneSig.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\StringsHeap.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\TableCollection.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\TablesHeap.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\TokenType.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\TypeDef.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\TypeRef.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\TypeSpec.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\UserStringsHeap.cs" />
-    <Compile Include=".\Mono.Cecil.Metadata\Utilities.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\Array.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\ArrayShape.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\BaseSignatureVisitor.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\Class.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\Constraint.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\CustomAttrib.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\CustomMod.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\FieldSig.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\FnPtr.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\GenericArg.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\GenericInst.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\GenericInstSignature.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\InputOutputItem.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\ISignatureVisitable.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\ISignatureVisitor.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\LocalVarSig.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\MarshalSig.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\MethodDefSig.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\MethodRefSig.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\MethodSig.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\MethodSpec.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\MVar.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\Param.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\PropertySig.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\Ptr.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\RetType.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\Signature.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\SignatureReader.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\SignatureWriter.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\SigType.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\SzArray.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\TypeSpec.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\ValueType.cs" />
-    <Compile Include=".\Mono.Cecil.Signatures\Var.cs" />
-    <Compile Include=".\Mono.Cecil\AggressiveReflectionReader.cs" />
-    <Compile Include=".\Mono.Cecil\ArrayDimension.cs" />
-    <Compile Include=".\Mono.Cecil\ArrayDimensionCollection.cs" />
-    <Compile Include=".\Mono.Cecil\ArrayType.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyFactory.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyFlags.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyHashAlgorithm.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyKind.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyLinkedResource.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyNameDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyNameReference.cs" />
-    <Compile Include=".\Mono.Cecil\AssemblyNameReferenceCollection.cs" />
-    <Compile Include=".\Mono.Cecil\BaseAssemblyResolver.cs" />
-    <Compile Include=".\Mono.Cecil\BaseReflectionReader.cs" />
-    <Compile Include=".\Mono.Cecil\BaseReflectionVisitor.cs" />
-    <Compile Include=".\Mono.Cecil\BaseStructureVisitor.cs" />
-    <Compile Include=".\Mono.Cecil\CallSite.cs" />
-    <Compile Include=".\Mono.Cecil\CompactFrameworkCompatibility.cs" />
-    <Compile Include=".\Mono.Cecil\Constants.cs" />
-    <Compile Include=".\Mono.Cecil\ConstraintCollection.cs" />
-    <Compile Include=".\Mono.Cecil\ConstructorCollection.cs" />
-    <Compile Include=".\Mono.Cecil\CustomAttribute.cs" />
-    <Compile Include=".\Mono.Cecil\CustomAttributeCollection.cs" />
-    <Compile Include=".\Mono.Cecil\DefaultAssemblyResolver.cs" />
-    <Compile Include=".\Mono.Cecil\DefaultImporter.cs" />
-    <Compile Include=".\Mono.Cecil\EmbeddedResource.cs" />
-    <Compile Include=".\Mono.Cecil\EventAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\EventDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\EventDefinitionCollection.cs" />
-    <Compile Include=".\Mono.Cecil\EventReference.cs" />
-    <Compile Include=".\Mono.Cecil\ExternTypeCollection.cs" />
-    <Compile Include=".\Mono.Cecil\FieldAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\FieldDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\FieldDefinitionCollection.cs" />
-    <Compile Include=".\Mono.Cecil\FieldReference.cs" />
-    <Compile Include=".\Mono.Cecil\FileAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\FunctionPointerType.cs" />
-    <Compile Include=".\Mono.Cecil\GenericArgumentCollection.cs" />
-    <Compile Include=".\Mono.Cecil\GenericContext.cs" />
-    <Compile Include=".\Mono.Cecil\GenericInstanceMethod.cs" />
-    <Compile Include=".\Mono.Cecil\GenericInstanceType.cs" />
-    <Compile Include=".\Mono.Cecil\GenericParameter.cs" />
-    <Compile Include=".\Mono.Cecil\GenericParameterAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\GenericParameterCollection.cs" />
-    <Compile Include=".\Mono.Cecil\HashCodeProvider.cs" />
-    <Compile Include=".\Mono.Cecil\IAnnotationProvider.cs" />
-    <Compile Include=".\Mono.Cecil\IAssemblyResolver.cs" />
-    <Compile Include=".\Mono.Cecil\ICustomAttributeProvider.cs" />
-    <Compile Include=".\Mono.Cecil\IDetailReader.cs" />
-    <Compile Include=".\Mono.Cecil\IGenericInstance.cs" />
-    <Compile Include=".\Mono.Cecil\IGenericParameterProvider.cs" />
-    <Compile Include=".\Mono.Cecil\IHasConstant.cs" />
-    <Compile Include=".\Mono.Cecil\IHasMarshalSpec.cs" />
-    <Compile Include=".\Mono.Cecil\IHasSecurity.cs" />
-    <Compile Include=".\Mono.Cecil\IImporter.cs" />
-    <Compile Include=".\Mono.Cecil\IMemberDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\IMemberReference.cs" />
-    <Compile Include=".\Mono.Cecil\IMetadataScope.cs" />
-    <Compile Include=".\Mono.Cecil\IMetadataTokenProvider.cs" />
-    <Compile Include=".\Mono.Cecil\IMethodSignature.cs" />
-    <Compile Include=".\Mono.Cecil\ImportContext.cs" />
-    <Compile Include=".\Mono.Cecil\InterfaceCollection.cs" />
-    <Compile Include=".\Mono.Cecil\IReflectionStructureVisitable.cs" />
-    <Compile Include=".\Mono.Cecil\IReflectionStructureVisitor.cs" />
-    <Compile Include=".\Mono.Cecil\IReflectionVisitable.cs" />
-    <Compile Include=".\Mono.Cecil\IReflectionVisitor.cs" />
-    <Compile Include=".\Mono.Cecil\IRequireResolving.cs" />
-    <Compile Include=".\Mono.Cecil\LinkedResource.cs" />
-    <Compile Include=".\Mono.Cecil\ManifestResourceAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\MarshalSpec.cs" />
-    <Compile Include=".\Mono.Cecil\MemberReference.cs" />
-    <Compile Include=".\Mono.Cecil\MemberReferenceCollection.cs" />
-    <Compile Include=".\Mono.Cecil\MetadataResolver.cs" />
-    <Compile Include=".\Mono.Cecil\MethodAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\MethodCallingConvention.cs" />
-    <Compile Include=".\Mono.Cecil\MethodDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\MethodDefinitionCollection.cs" />
-    <Compile Include=".\Mono.Cecil\MethodImplAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\MethodReference.cs" />
-    <Compile Include=".\Mono.Cecil\MethodReturnType.cs" />
-    <Compile Include=".\Mono.Cecil\MethodSemanticsAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\MethodSpecification.cs" />
-    <Compile Include=".\Mono.Cecil\Modifiers.cs" />
-    <Compile Include=".\Mono.Cecil\ModuleDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\ModuleDefinitionCollection.cs" />
-    <Compile Include=".\Mono.Cecil\ModuleReference.cs" />
-    <Compile Include=".\Mono.Cecil\ModuleReferenceCollection.cs" />
-    <Compile Include=".\Mono.Cecil\NativeType.cs" />
-    <Compile Include=".\Mono.Cecil\NestedTypeCollection.cs" />
-    <Compile Include=".\Mono.Cecil\NullReferenceImporter.cs" />
-    <Compile Include=".\Mono.Cecil\OverrideCollection.cs" />
-    <Compile Include=".\Mono.Cecil\ParameterAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\ParameterDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\ParameterDefinitionCollection.cs" />
-    <Compile Include=".\Mono.Cecil\ParameterReference.cs" />
-    <Compile Include=".\Mono.Cecil\PinnedType.cs" />
-    <Compile Include=".\Mono.Cecil\PInvokeAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\PInvokeInfo.cs" />
-    <Compile Include=".\Mono.Cecil\PointerType.cs" />
-    <Compile Include=".\Mono.Cecil\PropertyAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\PropertyDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\PropertyDefinitionCollection.cs" />
-    <Compile Include=".\Mono.Cecil\PropertyReference.cs" />
-    <Compile Include=".\Mono.Cecil\ReferenceType.cs" />
-    <Compile Include=".\Mono.Cecil\ReflectionController.cs" />
-    <Compile Include=".\Mono.Cecil\ReflectionException.cs" />
-    <Compile Include=".\Mono.Cecil\ReflectionHelper.cs" />
-    <Compile Include=".\Mono.Cecil\ReflectionReader.cs" />
-    <Compile Include=".\Mono.Cecil\ReflectionWriter.cs" />
-    <Compile Include=".\Mono.Cecil\Resource.cs" />
-    <Compile Include=".\Mono.Cecil\ResourceCollection.cs" />
-    <Compile Include=".\Mono.Cecil\SecurityAction.cs" />
-    <Compile Include=".\Mono.Cecil\SecurityDeclaration.cs" />
-    <Compile Include=".\Mono.Cecil\SecurityDeclarationCollection.cs" />
-    <Compile Include=".\Mono.Cecil\SecurityDeclarationReader.cs" />
-    <Compile Include=".\Mono.Cecil\SentinelType.cs" />
-    <Compile Include=".\Mono.Cecil\StructureReader.cs" />
-    <Compile Include=".\Mono.Cecil\StructureWriter.cs" />
-    <Compile Include=".\Mono.Cecil\TableComparers.cs" />
-    <Compile Include=".\Mono.Cecil\TargetRuntime.cs" />
-    <Compile Include=".\Mono.Cecil\TypeAttributes.cs" />
-    <Compile Include=".\Mono.Cecil\TypeDefinition.cs" />
-    <Compile Include=".\Mono.Cecil\TypeDefinitionCollection.cs" />
-    <Compile Include=".\Mono.Cecil\TypeReference.cs" />
-    <Compile Include=".\Mono.Cecil\TypeReferenceCollection.cs" />
-    <Compile Include=".\Mono.Cecil\TypeSpecification.cs" />
-    <Compile Include=".\Mono.Cecil\VariantType.cs" />
-    <Compile Include=".\Mono.Xml\SecurityParser.cs" />
-    <Compile Include=".\Mono.Xml\SmallXmlParser.cs" />
+    <Compile Include="AssemblyStripper.cs" />
+    <Compile Include="Mono.Cecil.Binary\BaseImageVisitor.cs" />
+    <Compile Include="Mono.Cecil.Binary\CLIHeader.cs" />
+    <Compile Include="Mono.Cecil.Binary\CopyImageVisitor.cs" />
+    <Compile Include="Mono.Cecil.Binary\DOSHeader.cs" />
+    <Compile Include="Mono.Cecil.Binary\DataDirectory.cs" />
+    <Compile Include="Mono.Cecil.Binary\DebugHeader.cs" />
+    <Compile Include="Mono.Cecil.Binary\DebugStoreType.cs" />
+    <Compile Include="Mono.Cecil.Binary\ExportTable.cs" />
+    <Compile Include="Mono.Cecil.Binary\IBinaryVisitable.cs" />
+    <Compile Include="Mono.Cecil.Binary\IBinaryVisitor.cs" />
+    <Compile Include="Mono.Cecil.Binary\IHeader.cs" />
+    <Compile Include="Mono.Cecil.Binary\Image.cs" />
+    <Compile Include="Mono.Cecil.Binary\ImageCharacteristics.cs" />
+    <Compile Include="Mono.Cecil.Binary\ImageFormatException.cs" />
+    <Compile Include="Mono.Cecil.Binary\ImageInitializer.cs" />
+    <Compile Include="Mono.Cecil.Binary\ImageReader.cs" />
+    <Compile Include="Mono.Cecil.Binary\ImageWriter.cs" />
+    <Compile Include="Mono.Cecil.Binary\Imports.cs" />
+    <Compile Include="Mono.Cecil.Binary\MemoryBinaryWriter.cs" />
+    <Compile Include="Mono.Cecil.Binary\PEFileHeader.cs" />
+    <Compile Include="Mono.Cecil.Binary\PEOptionalHeader.cs" />
+    <Compile Include="Mono.Cecil.Binary\RVA.cs" />
+    <Compile Include="Mono.Cecil.Binary\ResourceDataEntry.cs" />
+    <Compile Include="Mono.Cecil.Binary\ResourceDirectoryEntry.cs" />
+    <Compile Include="Mono.Cecil.Binary\ResourceDirectoryString.cs" />
+    <Compile Include="Mono.Cecil.Binary\ResourceDirectoryTable.cs" />
+    <Compile Include="Mono.Cecil.Binary\ResourceNode.cs" />
+    <Compile Include="Mono.Cecil.Binary\ResourceReader.cs" />
+    <Compile Include="Mono.Cecil.Binary\ResourceWriter.cs" />
+    <Compile Include="Mono.Cecil.Binary\RuntimeImage.cs" />
+    <Compile Include="Mono.Cecil.Binary\Section.cs" />
+    <Compile Include="Mono.Cecil.Binary\SectionCharacteristics.cs" />
+    <Compile Include="Mono.Cecil.Binary\SectionCollection.cs" />
+    <Compile Include="Mono.Cecil.Binary\SubSystem.cs" />
+    <Compile Include="Mono.Cecil.Cil\BaseCodeVisitor.cs" />
+    <Compile Include="Mono.Cecil.Cil\CilWorker.cs" />
+    <Compile Include="Mono.Cecil.Cil\Code.cs" />
+    <Compile Include="Mono.Cecil.Cil\CodeReader.cs" />
+    <Compile Include="Mono.Cecil.Cil\CodeWriter.cs" />
+    <Compile Include="Mono.Cecil.Cil\Document.cs" />
+    <Compile Include="Mono.Cecil.Cil\DocumentHashAlgorithm.cs" />
+    <Compile Include="Mono.Cecil.Cil\DocumentLanguage.cs" />
+    <Compile Include="Mono.Cecil.Cil\DocumentLanguageVendor.cs" />
+    <Compile Include="Mono.Cecil.Cil\DocumentType.cs" />
+    <Compile Include="Mono.Cecil.Cil\ExceptionHandler.cs" />
+    <Compile Include="Mono.Cecil.Cil\ExceptionHandlerCollection.cs" />
+    <Compile Include="Mono.Cecil.Cil\ExceptionHandlerType.cs" />
+    <Compile Include="Mono.Cecil.Cil\FlowControl.cs" />
+    <Compile Include="Mono.Cecil.Cil\GuidAttribute.cs" />
+    <Compile Include="Mono.Cecil.Cil\ICodeVisitable.cs" />
+    <Compile Include="Mono.Cecil.Cil\ICodeVisitor.cs" />
+    <Compile Include="Mono.Cecil.Cil\IScopeProvider.cs" />
+    <Compile Include="Mono.Cecil.Cil\ISymbolReader.cs" />
+    <Compile Include="Mono.Cecil.Cil\ISymbolStoreFactory.cs" />
+    <Compile Include="Mono.Cecil.Cil\ISymbolWriter.cs" />
+    <Compile Include="Mono.Cecil.Cil\IVariableDefinitionProvider.cs" />
+    <Compile Include="Mono.Cecil.Cil\Instruction.cs" />
+    <Compile Include="Mono.Cecil.Cil\InstructionCollection.cs" />
+    <Compile Include="Mono.Cecil.Cil\MethodBody.cs" />
+    <Compile Include="Mono.Cecil.Cil\MethodDataSection.cs" />
+    <Compile Include="Mono.Cecil.Cil\MethodHeader.cs" />
+    <Compile Include="Mono.Cecil.Cil\OpCode.cs" />
+    <Compile Include="Mono.Cecil.Cil\OpCodeNames.cs" />
+    <Compile Include="Mono.Cecil.Cil\OpCodeType.cs" />
+    <Compile Include="Mono.Cecil.Cil\OpCodes.cs" />
+    <Compile Include="Mono.Cecil.Cil\OperandType.cs" />
+    <Compile Include="Mono.Cecil.Cil\Scope.cs" />
+    <Compile Include="Mono.Cecil.Cil\ScopeCollection.cs" />
+    <Compile Include="Mono.Cecil.Cil\SequencePoint.cs" />
+    <Compile Include="Mono.Cecil.Cil\StackBehaviour.cs" />
+    <Compile Include="Mono.Cecil.Cil\SymbolStoreHelper.cs" />
+    <Compile Include="Mono.Cecil.Cil\VariableDefinition.cs" />
+    <Compile Include="Mono.Cecil.Cil\VariableDefinitionCollection.cs" />
+    <Compile Include="Mono.Cecil.Cil\VariableReference.cs" />
+    <Compile Include="Mono.Cecil.Metadata\Assembly.cs" />
+    <Compile Include="Mono.Cecil.Metadata\AssemblyOS.cs" />
+    <Compile Include="Mono.Cecil.Metadata\AssemblyProcessor.cs" />
+    <Compile Include="Mono.Cecil.Metadata\AssemblyRef.cs" />
+    <Compile Include="Mono.Cecil.Metadata\AssemblyRefOS.cs" />
+    <Compile Include="Mono.Cecil.Metadata\AssemblyRefProcessor.cs" />
+    <Compile Include="Mono.Cecil.Metadata\BaseMetadataVisitor.cs" />
+    <Compile Include="Mono.Cecil.Metadata\BlobHeap.cs" />
+    <Compile Include="Mono.Cecil.Metadata\ClassLayout.cs" />
+    <Compile Include="Mono.Cecil.Metadata\CodedIndex.cs" />
+    <Compile Include="Mono.Cecil.Metadata\Constant.cs" />
+    <Compile Include="Mono.Cecil.Metadata\CultureUtils.cs" />
+    <Compile Include="Mono.Cecil.Metadata\CustomAttribute.cs" />
+    <Compile Include="Mono.Cecil.Metadata\DeclSecurity.cs" />
+    <Compile Include="Mono.Cecil.Metadata\ElementType.cs" />
+    <Compile Include="Mono.Cecil.Metadata\Event.cs" />
+    <Compile Include="Mono.Cecil.Metadata\EventMap.cs" />
+    <Compile Include="Mono.Cecil.Metadata\EventPtr.cs" />
+    <Compile Include="Mono.Cecil.Metadata\ExportedType.cs" />
+    <Compile Include="Mono.Cecil.Metadata\Field.cs" />
+    <Compile Include="Mono.Cecil.Metadata\FieldLayout.cs" />
+    <Compile Include="Mono.Cecil.Metadata\FieldMarshal.cs" />
+    <Compile Include="Mono.Cecil.Metadata\FieldPtr.cs" />
+    <Compile Include="Mono.Cecil.Metadata\FieldRVA.cs" />
+    <Compile Include="Mono.Cecil.Metadata\File.cs" />
+    <Compile Include="Mono.Cecil.Metadata\GenericParam.cs" />
+    <Compile Include="Mono.Cecil.Metadata\GenericParamConstraint.cs" />
+    <Compile Include="Mono.Cecil.Metadata\GuidHeap.cs" />
+    <Compile Include="Mono.Cecil.Metadata\IMetadataRow.cs" />
+    <Compile Include="Mono.Cecil.Metadata\IMetadataTable.cs" />
+    <Compile Include="Mono.Cecil.Metadata\IMetadataVisitable.cs" />
+    <Compile Include="Mono.Cecil.Metadata\IMetadataVisitor.cs" />
+    <Compile Include="Mono.Cecil.Metadata\ImplMap.cs" />
+    <Compile Include="Mono.Cecil.Metadata\InterfaceImpl.cs" />
+    <Compile Include="Mono.Cecil.Metadata\ManifestResource.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MemberRef.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataFormatException.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataHeap.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataInitializer.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataReader.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataRoot.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataRowReader.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataRowWriter.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataStream.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataStreamCollection.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataTableReader.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataTableWriter.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataToken.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MetadataWriter.cs" />
+    <Compile Include="Mono.Cecil.Metadata\Method.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MethodImpl.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MethodPtr.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MethodSemantics.cs" />
+    <Compile Include="Mono.Cecil.Metadata\MethodSpec.cs" />
+    <Compile Include="Mono.Cecil.Metadata\Module.cs" />
+    <Compile Include="Mono.Cecil.Metadata\ModuleRef.cs" />
+    <Compile Include="Mono.Cecil.Metadata\NestedClass.cs" />
+    <Compile Include="Mono.Cecil.Metadata\Param.cs" />
+    <Compile Include="Mono.Cecil.Metadata\ParamPtr.cs" />
+    <Compile Include="Mono.Cecil.Metadata\Property.cs" />
+    <Compile Include="Mono.Cecil.Metadata\PropertyMap.cs" />
+    <Compile Include="Mono.Cecil.Metadata\PropertyPtr.cs" />
+    <Compile Include="Mono.Cecil.Metadata\RowCollection.cs" />
+    <Compile Include="Mono.Cecil.Metadata\StandAloneSig.cs" />
+    <Compile Include="Mono.Cecil.Metadata\StringsHeap.cs" />
+    <Compile Include="Mono.Cecil.Metadata\TableCollection.cs" />
+    <Compile Include="Mono.Cecil.Metadata\TablesHeap.cs" />
+    <Compile Include="Mono.Cecil.Metadata\TokenType.cs" />
+    <Compile Include="Mono.Cecil.Metadata\TypeDef.cs" />
+    <Compile Include="Mono.Cecil.Metadata\TypeRef.cs" />
+    <Compile Include="Mono.Cecil.Metadata\TypeSpec.cs" />
+    <Compile Include="Mono.Cecil.Metadata\UserStringsHeap.cs" />
+    <Compile Include="Mono.Cecil.Metadata\Utilities.cs" />
+    <Compile Include="Mono.Cecil.Signatures\Array.cs" />
+    <Compile Include="Mono.Cecil.Signatures\ArrayShape.cs" />
+    <Compile Include="Mono.Cecil.Signatures\BaseSignatureVisitor.cs" />
+    <Compile Include="Mono.Cecil.Signatures\Class.cs" />
+    <Compile Include="Mono.Cecil.Signatures\Constraint.cs" />
+    <Compile Include="Mono.Cecil.Signatures\CustomAttrib.cs" />
+    <Compile Include="Mono.Cecil.Signatures\CustomMod.cs" />
+    <Compile Include="Mono.Cecil.Signatures\FieldSig.cs" />
+    <Compile Include="Mono.Cecil.Signatures\FnPtr.cs" />
+    <Compile Include="Mono.Cecil.Signatures\GenericArg.cs" />
+    <Compile Include="Mono.Cecil.Signatures\GenericInst.cs" />
+    <Compile Include="Mono.Cecil.Signatures\GenericInstSignature.cs" />
+    <Compile Include="Mono.Cecil.Signatures\ISignatureVisitable.cs" />
+    <Compile Include="Mono.Cecil.Signatures\ISignatureVisitor.cs" />
+    <Compile Include="Mono.Cecil.Signatures\InputOutputItem.cs" />
+    <Compile Include="Mono.Cecil.Signatures\LocalVarSig.cs" />
+    <Compile Include="Mono.Cecil.Signatures\MVar.cs" />
+    <Compile Include="Mono.Cecil.Signatures\MarshalSig.cs" />
+    <Compile Include="Mono.Cecil.Signatures\MethodDefSig.cs" />
+    <Compile Include="Mono.Cecil.Signatures\MethodRefSig.cs" />
+    <Compile Include="Mono.Cecil.Signatures\MethodSig.cs" />
+    <Compile Include="Mono.Cecil.Signatures\MethodSpec.cs" />
+    <Compile Include="Mono.Cecil.Signatures\Param.cs" />
+    <Compile Include="Mono.Cecil.Signatures\PropertySig.cs" />
+    <Compile Include="Mono.Cecil.Signatures\Ptr.cs" />
+    <Compile Include="Mono.Cecil.Signatures\RetType.cs" />
+    <Compile Include="Mono.Cecil.Signatures\SigType.cs" />
+    <Compile Include="Mono.Cecil.Signatures\Signature.cs" />
+    <Compile Include="Mono.Cecil.Signatures\SignatureReader.cs" />
+    <Compile Include="Mono.Cecil.Signatures\SignatureWriter.cs" />
+    <Compile Include="Mono.Cecil.Signatures\SzArray.cs" />
+    <Compile Include="Mono.Cecil.Signatures\TypeSpec.cs" />
+    <Compile Include="Mono.Cecil.Signatures\ValueType.cs" />
+    <Compile Include="Mono.Cecil.Signatures\Var.cs" />
+    <Compile Include="Mono.Cecil\AggressiveReflectionReader.cs" />
+    <Compile Include="Mono.Cecil\ArrayDimension.cs" />
+    <Compile Include="Mono.Cecil\ArrayDimensionCollection.cs" />
+    <Compile Include="Mono.Cecil\ArrayType.cs" />
+    <Compile Include="Mono.Cecil\AssemblyDefinition.cs" />
+    <Compile Include="Mono.Cecil\AssemblyFactory.cs" />
+    <Compile Include="Mono.Cecil\AssemblyFlags.cs" />
+    <Compile Include="Mono.Cecil\AssemblyHashAlgorithm.cs" />
+    <Compile Include="Mono.Cecil\AssemblyInfo.cs" />
+    <Compile Include="Mono.Cecil\AssemblyKind.cs" />
+    <Compile Include="Mono.Cecil\AssemblyLinkedResource.cs" />
+    <Compile Include="Mono.Cecil\AssemblyNameDefinition.cs" />
+    <Compile Include="Mono.Cecil\AssemblyNameReference.cs" />
+    <Compile Include="Mono.Cecil\AssemblyNameReferenceCollection.cs" />
+    <Compile Include="Mono.Cecil\BaseAssemblyResolver.cs" />
+    <Compile Include="Mono.Cecil\BaseReflectionReader.cs" />
+    <Compile Include="Mono.Cecil\BaseReflectionVisitor.cs" />
+    <Compile Include="Mono.Cecil\BaseStructureVisitor.cs" />
+    <Compile Include="Mono.Cecil\CallSite.cs" />
+    <Compile Include="Mono.Cecil\CompactFrameworkCompatibility.cs" />
+    <Compile Include="Mono.Cecil\Constants.cs" />
+    <Compile Include="Mono.Cecil\ConstraintCollection.cs" />
+    <Compile Include="Mono.Cecil\ConstructorCollection.cs" />
+    <Compile Include="Mono.Cecil\CustomAttribute.cs" />
+    <Compile Include="Mono.Cecil\CustomAttributeCollection.cs" />
+    <Compile Include="Mono.Cecil\DefaultAssemblyResolver.cs" />
+    <Compile Include="Mono.Cecil\DefaultImporter.cs" />
+    <Compile Include="Mono.Cecil\EmbeddedResource.cs" />
+    <Compile Include="Mono.Cecil\EventAttributes.cs" />
+    <Compile Include="Mono.Cecil\EventDefinition.cs" />
+    <Compile Include="Mono.Cecil\EventDefinitionCollection.cs" />
+    <Compile Include="Mono.Cecil\EventReference.cs" />
+    <Compile Include="Mono.Cecil\ExternTypeCollection.cs" />
+    <Compile Include="Mono.Cecil\FieldAttributes.cs" />
+    <Compile Include="Mono.Cecil\FieldDefinition.cs" />
+    <Compile Include="Mono.Cecil\FieldDefinitionCollection.cs" />
+    <Compile Include="Mono.Cecil\FieldReference.cs" />
+    <Compile Include="Mono.Cecil\FileAttributes.cs" />
+    <Compile Include="Mono.Cecil\FunctionPointerType.cs" />
+    <Compile Include="Mono.Cecil\GenericArgumentCollection.cs" />
+    <Compile Include="Mono.Cecil\GenericContext.cs" />
+    <Compile Include="Mono.Cecil\GenericInstanceMethod.cs" />
+    <Compile Include="Mono.Cecil\GenericInstanceType.cs" />
+    <Compile Include="Mono.Cecil\GenericParameter.cs" />
+    <Compile Include="Mono.Cecil\GenericParameterAttributes.cs" />
+    <Compile Include="Mono.Cecil\GenericParameterCollection.cs" />
+    <Compile Include="Mono.Cecil\HashCodeProvider.cs" />
+    <Compile Include="Mono.Cecil\IAnnotationProvider.cs" />
+    <Compile Include="Mono.Cecil\IAssemblyResolver.cs" />
+    <Compile Include="Mono.Cecil\ICustomAttributeProvider.cs" />
+    <Compile Include="Mono.Cecil\IDetailReader.cs" />
+    <Compile Include="Mono.Cecil\IGenericInstance.cs" />
+    <Compile Include="Mono.Cecil\IGenericParameterProvider.cs" />
+    <Compile Include="Mono.Cecil\IHasConstant.cs" />
+    <Compile Include="Mono.Cecil\IHasMarshalSpec.cs" />
+    <Compile Include="Mono.Cecil\IHasSecurity.cs" />
+    <Compile Include="Mono.Cecil\IImporter.cs" />
+    <Compile Include="Mono.Cecil\IMemberDefinition.cs" />
+    <Compile Include="Mono.Cecil\IMemberReference.cs" />
+    <Compile Include="Mono.Cecil\IMetadataScope.cs" />
+    <Compile Include="Mono.Cecil\IMetadataTokenProvider.cs" />
+    <Compile Include="Mono.Cecil\IMethodSignature.cs" />
+    <Compile Include="Mono.Cecil\IReflectionStructureVisitable.cs" />
+    <Compile Include="Mono.Cecil\IReflectionStructureVisitor.cs" />
+    <Compile Include="Mono.Cecil\IReflectionVisitable.cs" />
+    <Compile Include="Mono.Cecil\IReflectionVisitor.cs" />
+    <Compile Include="Mono.Cecil\IRequireResolving.cs" />
+    <Compile Include="Mono.Cecil\ImportContext.cs" />
+    <Compile Include="Mono.Cecil\InterfaceCollection.cs" />
+    <Compile Include="Mono.Cecil\LinkedResource.cs" />
+    <Compile Include="Mono.Cecil\ManifestResourceAttributes.cs" />
+    <Compile Include="Mono.Cecil\MarshalSpec.cs" />
+    <Compile Include="Mono.Cecil\MemberReference.cs" />
+    <Compile Include="Mono.Cecil\MemberReferenceCollection.cs" />
+    <Compile Include="Mono.Cecil\MetadataResolver.cs" />
+    <Compile Include="Mono.Cecil\MethodAttributes.cs" />
+    <Compile Include="Mono.Cecil\MethodCallingConvention.cs" />
+    <Compile Include="Mono.Cecil\MethodDefinition.cs" />
+    <Compile Include="Mono.Cecil\MethodDefinitionCollection.cs" />
+    <Compile Include="Mono.Cecil\MethodImplAttributes.cs" />
+    <Compile Include="Mono.Cecil\MethodReference.cs" />
+    <Compile Include="Mono.Cecil\MethodReturnType.cs" />
+    <Compile Include="Mono.Cecil\MethodSemanticsAttributes.cs" />
+    <Compile Include="Mono.Cecil\MethodSpecification.cs" />
+    <Compile Include="Mono.Cecil\Modifiers.cs" />
+    <Compile Include="Mono.Cecil\ModuleDefinition.cs" />
+    <Compile Include="Mono.Cecil\ModuleDefinitionCollection.cs" />
+    <Compile Include="Mono.Cecil\ModuleReference.cs" />
+    <Compile Include="Mono.Cecil\ModuleReferenceCollection.cs" />
+    <Compile Include="Mono.Cecil\NativeType.cs" />
+    <Compile Include="Mono.Cecil\NestedTypeCollection.cs" />
+    <Compile Include="Mono.Cecil\NullReferenceImporter.cs" />
+    <Compile Include="Mono.Cecil\OverrideCollection.cs" />
+    <Compile Include="Mono.Cecil\PInvokeAttributes.cs" />
+    <Compile Include="Mono.Cecil\PInvokeInfo.cs" />
+    <Compile Include="Mono.Cecil\ParameterAttributes.cs" />
+    <Compile Include="Mono.Cecil\ParameterDefinition.cs" />
+    <Compile Include="Mono.Cecil\ParameterDefinitionCollection.cs" />
+    <Compile Include="Mono.Cecil\ParameterReference.cs" />
+    <Compile Include="Mono.Cecil\PinnedType.cs" />
+    <Compile Include="Mono.Cecil\PointerType.cs" />
+    <Compile Include="Mono.Cecil\PropertyAttributes.cs" />
+    <Compile Include="Mono.Cecil\PropertyDefinition.cs" />
+    <Compile Include="Mono.Cecil\PropertyDefinitionCollection.cs" />
+    <Compile Include="Mono.Cecil\PropertyReference.cs" />
+    <Compile Include="Mono.Cecil\ReferenceType.cs" />
+    <Compile Include="Mono.Cecil\ReflectionController.cs" />
+    <Compile Include="Mono.Cecil\ReflectionException.cs" />
+    <Compile Include="Mono.Cecil\ReflectionHelper.cs" />
+    <Compile Include="Mono.Cecil\ReflectionReader.cs" />
+    <Compile Include="Mono.Cecil\ReflectionWriter.cs" />
+    <Compile Include="Mono.Cecil\Resource.cs" />
+    <Compile Include="Mono.Cecil\ResourceCollection.cs" />
+    <Compile Include="Mono.Cecil\SecurityAction.cs" />
+    <Compile Include="Mono.Cecil\SecurityDeclaration.cs" />
+    <Compile Include="Mono.Cecil\SecurityDeclarationCollection.cs" />
+    <Compile Include="Mono.Cecil\SecurityDeclarationReader.cs" />
+    <Compile Include="Mono.Cecil\SentinelType.cs" />
+    <Compile Include="Mono.Cecil\StructureReader.cs" />
+    <Compile Include="Mono.Cecil\StructureWriter.cs" />
+    <Compile Include="Mono.Cecil\TableComparers.cs" />
+    <Compile Include="Mono.Cecil\TargetRuntime.cs" />
+    <Compile Include="Mono.Cecil\TypeAttributes.cs" />
+    <Compile Include="Mono.Cecil\TypeDefinition.cs" />
+    <Compile Include="Mono.Cecil\TypeDefinitionCollection.cs" />
+    <Compile Include="Mono.Cecil\TypeReference.cs" />
+    <Compile Include="Mono.Cecil\TypeReferenceCollection.cs" />
+    <Compile Include="Mono.Cecil\TypeSpecification.cs" />
+    <Compile Include="Mono.Cecil\VariantType.cs" />
+    <Compile Include="Mono.Xml\SecurityParser.cs" />
+    <Compile Include="Mono.Xml\SmallXmlParser.cs" />
+    <Compile Include="cilstrip.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../class/System/System.csproj" />
diff --git a/mcs/tools/compiler-tester/compiler-tester.csproj b/mcs/tools/compiler-tester/compiler-tester.csproj
index 2b3f5170299..e5920a9ad9d 100644
--- a/mcs/tools/compiler-tester/compiler-tester.csproj
+++ b/mcs/tools/compiler-tester/compiler-tester.csproj
@@ -41,13 +41,14 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
     <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
     <Compile Include="compiler-tester.cs" />
     <Compile Include="xmldocdiff.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/corcompare/mono-api-info.csproj b/mcs/tools/corcompare/mono-api-info.csproj
index 903bf2693f7..8f35d79877c 100644
--- a/mcs/tools/corcompare/mono-api-info.csproj
+++ b/mcs/tools/corcompare/mono-api-info.csproj
@@ -41,14 +41,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="AssemblyResolver.cs" />
-    <Compile Include="mono-api-info.cs" />
     <Compile Include="Util.cs" />
     <Compile Include="WellFormedXmlWriter.cs" />
+    <Compile Include="mono-api-info.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/csharp/csharp.csproj b/mcs/tools/csharp/csharp.csproj
index 6edba94a0ca..7ca80ed9faa 100644
--- a/mcs/tools/csharp/csharp.csproj
+++ b/mcs/tools/csharp/csharp.csproj
@@ -42,12 +42,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\class\corlib\Mono\DataConverter.cs" />
     <Compile Include="getline.cs" />
     <Compile Include="repl.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/culevel/culevel.csproj b/mcs/tools/culevel/culevel.csproj
index 7a19dc25cc6..4cb22b3e992 100644
--- a/mcs/tools/culevel/culevel.csproj
+++ b/mcs/tools/culevel/culevel.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="CompileUplevel.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/disco/disco.csproj b/mcs/tools/disco/disco.csproj
index 7337777f124..d3796c7d9b7 100644
--- a/mcs/tools/disco/disco.csproj
+++ b/mcs/tools/disco/disco.csproj
@@ -41,11 +41,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="disco.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/dtd2rng/dtd2rng.csproj b/mcs/tools/dtd2rng/dtd2rng.csproj
index 12442864a2f..2b1ab2b2aa3 100644
--- a/mcs/tools/dtd2rng/dtd2rng.csproj
+++ b/mcs/tools/dtd2rng/dtd2rng.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="dtd2rng.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/dtd2xsd/dtd2xsd.csproj b/mcs/tools/dtd2xsd/dtd2xsd.csproj
index 20e94b043f6..25aec1ee432 100644
--- a/mcs/tools/dtd2xsd/dtd2xsd.csproj
+++ b/mcs/tools/dtd2xsd/dtd2xsd.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="dtd2xsd.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/gacutil/gacutil.csproj b/mcs/tools/gacutil/gacutil.csproj
index bc4300559ca..15908de891b 100644
--- a/mcs/tools/gacutil/gacutil.csproj
+++ b/mcs/tools/gacutil/gacutil.csproj
@@ -42,18 +42,100 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\..\..\external\ikvm\reflect\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Emit\*.cs" />
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
+    <Compile Include="..\..\..\external\ikvm\reflect\AmbiguousMatchException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Assembly.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\AssemblyName.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\BadImageFormatException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Binder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ConstructorInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeData.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeNamedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeTypedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomModifiers.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\AssemblyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ConstructorBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomAttributeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomModifiersBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EnumBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EventBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ExceptionHandler.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\FieldBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ILGenerator.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\MethodBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ModuleBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCodes.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ParameterBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\PropertyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\SignatureHelper.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Tokens.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\TypeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\EventInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ExceptionHandlingClause.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Fusion.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\GenericWrappers.cs" />
     <Compile Include="..\..\..\external\ikvm\reflect\Impl\ITypeOwner.cs" />
     <Compile Include="..\..\..\external\ikvm\reflect\Impl\SymbolSupport.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Reader\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Writer\*.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\InterfaceMapping.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\LocalVariableInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ManifestResourceInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MarshalSpec.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MemberInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\CliHeader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\MetadataRW.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\Tables.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBase.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBody.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodImplMap.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Missing.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Module.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterModifier.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Projection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertyInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertySignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\AssemblyReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Authenticode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ByteReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\EventInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Field.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\GenericTypeParameter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\MetadataReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Method.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ModuleReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PEReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PropertyInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ResourceModule.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\TypeDefImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Signature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StandAloneMethodSig.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StrongNameKeyPair.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Type.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeNameParser.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Universe.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Util.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ByteBuffer.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\Heaps.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\MetadataWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ModuleWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\PEWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ResourceSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\TextSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\VersionInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\coreclr.cs" />
     <Compile Include="..\security\StrongNameManager.cs" />
     <Compile Include="driver.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/genxs/genxs.csproj b/mcs/tools/genxs/genxs.csproj
index 6bd12292154..09d4b57dbb8 100644
--- a/mcs/tools/genxs/genxs.csproj
+++ b/mcs/tools/genxs/genxs.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="genxs.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/ictool/ictool.csproj b/mcs/tools/ictool/ictool.csproj
index 4d5700e95ca..cae37f54b9c 100644
--- a/mcs/tools/ictool/ictool.csproj
+++ b/mcs/tools/ictool/ictool.csproj
@@ -41,12 +41,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="depgraph.cs" />
     <Compile Include="ictool.cs" />
     <Compile Include="peer.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/ikdasm/ikdasm.csproj b/mcs/tools/ikdasm/ikdasm.csproj
index f06aeb1fa31..2bc361e62ee 100644
--- a/mcs/tools/ikdasm/ikdasm.csproj
+++ b/mcs/tools/ikdasm/ikdasm.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\ikdasm\CABlob.cs" />
     <Compile Include="..\..\..\external\ikdasm\Disassembler.cs" />
     <Compile Include="..\..\..\external\ikdasm\ExportedMethods.cs" />
@@ -53,15 +53,97 @@
     <Compile Include="..\..\..\external\ikdasm\TableDumper.cs" />
     <Compile Include="..\..\..\external\ikdasm\Util.cs" />
     <Compile Include="..\..\..\external\ikdasm\VTableFixups.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Emit\*.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\AmbiguousMatchException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Assembly.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\AssemblyName.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\BadImageFormatException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Binder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ConstructorInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeData.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeNamedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeTypedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomModifiers.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\AssemblyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ConstructorBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomAttributeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomModifiersBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EnumBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EventBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ExceptionHandler.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\FieldBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ILGenerator.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\MethodBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ModuleBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCodes.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ParameterBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\PropertyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\SignatureHelper.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Tokens.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\TypeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\EventInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ExceptionHandlingClause.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Fusion.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\GenericWrappers.cs" />
     <Compile Include="..\..\..\external\ikvm\reflect\Impl\ITypeOwner.cs" />
     <Compile Include="..\..\..\external\ikvm\reflect\Impl\SymbolSupport.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Reader\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Writer\*.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\InterfaceMapping.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\LocalVariableInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ManifestResourceInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MarshalSpec.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MemberInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\CliHeader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\MetadataRW.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\Tables.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBase.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBody.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodImplMap.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Missing.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Module.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterModifier.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Projection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertyInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertySignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\AssemblyReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Authenticode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ByteReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\EventInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Field.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\GenericTypeParameter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\MetadataReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Method.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ModuleReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PEReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PropertyInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ResourceModule.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\TypeDefImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Signature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StandAloneMethodSig.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StrongNameKeyPair.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Type.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeNameParser.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Universe.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Util.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ByteBuffer.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\Heaps.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\MetadataWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ModuleWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\PEWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ResourceSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\TextSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\VersionInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\coreclr.cs" />
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/installutil/installutil.csproj b/mcs/tools/installutil/installutil.csproj
index e4da53ffd22..d0b30b103d0 100644
--- a/mcs/tools/installutil/installutil.csproj
+++ b/mcs/tools/installutil/installutil.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="installutil.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/installvst/installvst.csproj b/mcs/tools/installvst/installvst.csproj
index 6142ab631ed..37c5c338cc2 100644
--- a/mcs/tools/installvst/installvst.csproj
+++ b/mcs/tools/installvst/installvst.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="installvst.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/lc/lc.csproj b/mcs/tools/lc/lc.csproj
index 250c82e0573..f470cee64c3 100644
--- a/mcs/tools/lc/lc.csproj
+++ b/mcs/tools/lc/lc.csproj
@@ -41,12 +41,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="lc.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/linker-analyzer/illinkanalyzer.csproj b/mcs/tools/linker-analyzer/illinkanalyzer.csproj
index 5aed9eb82a8..cc1a8ae6216 100644
--- a/mcs/tools/linker-analyzer/illinkanalyzer.csproj
+++ b/mcs/tools/linker-analyzer/illinkanalyzer.csproj
@@ -46,11 +46,15 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
-    <Compile Include="..\..\..\external\linker\analyzer\*.cs" />
-    <Compile Include="..\..\..\external\linker\analyzer\LinkerAnalyzerCore\*.cs" />
+    <Compile Include="..\..\..\external\linker\analyzer\ConsoleDependencyGraph.cs" />
+    <Compile Include="..\..\..\external\linker\analyzer\LinkerAnalyzerCore\DependencyGraph.cs" />
+    <Compile Include="..\..\..\external\linker\analyzer\LinkerAnalyzerCore\SpaceAnalyzer.cs" />
+    <Compile Include="..\..\..\external\linker\analyzer\Main.cs" />
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../class/System/System.csproj" />
diff --git a/mcs/tools/linker/monolinker.csproj b/mcs/tools/linker/monolinker.csproj
index c5b56330a42..ab77c906156 100644
--- a/mcs/tools/linker/monolinker.csproj
+++ b/mcs/tools/linker/monolinker.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\external\linker\linker\Linker.Steps\AddBypassNGenStep.cs" />
     <Compile Include="..\..\..\external\linker\linker\Linker.Steps\BaseStep.cs" />
     <Compile Include="..\..\..\external\linker\linker\Linker.Steps\BlacklistStep.cs" />
@@ -83,6 +83,7 @@
     <Compile Include="..\..\..\external\linker\linker\Linker\TypeReferenceExtensions.cs" />
     <Compile Include="..\..\..\external\linker\linker\Linker\XApiReader.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/macpack/macpack.csproj b/mcs/tools/macpack/macpack.csproj
index 02eefcc5964..72106ff534e 100644
--- a/mcs/tools/macpack/macpack.csproj
+++ b/mcs/tools/macpack/macpack.csproj
@@ -41,12 +41,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="MacPack.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' "></ItemGroup>
diff --git a/mcs/tools/mconfig/mconfig.csproj b/mcs/tools/mconfig/mconfig.csproj
index 68135a572b1..600ee767a1e 100644
--- a/mcs/tools/mconfig/mconfig.csproj
+++ b/mcs/tools/mconfig/mconfig.csproj
@@ -41,9 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="mconfig.cs" />
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="Mono.MonoConfig\Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.MonoConfig\ConfigBlockBlock.cs" />
     <Compile Include="Mono.MonoConfig\ConfigBlockNodeHandler.cs" />
@@ -63,7 +62,9 @@
     <Compile Include="Mono.MonoConfig\IFeatureGenerator.cs" />
     <Compile Include="Mono.MonoConfig\IStorageConsumer.cs" />
     <Compile Include="Mono.MonoConfig\Section.cs" />
+    <Compile Include="mconfig.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mdb2ppdb/mdb2ppdb.csproj b/mcs/tools/mdb2ppdb/mdb2ppdb.csproj
index a69d8d65580..aa71fb8d742 100644
--- a/mcs/tools/mdb2ppdb/mdb2ppdb.csproj
+++ b/mcs/tools/mdb2ppdb/mdb2ppdb.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="mdb2ppdb.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mdbrebase/mdbrebase.csproj b/mcs/tools/mdbrebase/mdbrebase.csproj
index 36cbbfcef20..d82cfe40eda 100644
--- a/mcs/tools/mdbrebase/mdbrebase.csproj
+++ b/mcs/tools/mdbrebase/mdbrebase.csproj
@@ -41,11 +41,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
-    <Compile Include=".\mdbrebase.cs" />
+    <Compile Include="mdbrebase.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mdoc/mdoc.csproj b/mcs/tools/mdoc/mdoc.csproj
index 24fa066ca94..48b03015e98 100644
--- a/mcs/tools/mdoc/mdoc.csproj
+++ b/mcs/tools/mdoc/mdoc.csproj
@@ -46,19 +46,21 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
-    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\assembler.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\dump.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\ecmadoc.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\exceptions.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\Frameworks\AssemblySet.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\Frameworks\FrameworkEntry.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\Frameworks\FrameworkIndex.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\Frameworks\FrameworkTypeEntry.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\MdocFile.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\XhtmlWriter.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\assembler.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\dump.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\ecmadoc.cs" />
+    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\exceptions.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\frameworksbootstrapper.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\index.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\mdoc.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\MdocFile.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\monodocer.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\monodocs2html.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\monodocs2slashdoc.cs" />
@@ -66,7 +68,6 @@
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\normalize.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\validate.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\webdoc.cs" />
-    <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Documentation\XhtmlWriter.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Rocks\ObjectRocks.cs" />
     <Compile Include="..\..\..\external\api-doc-tools\mdoc\Mono.Rocks\StreamRocks.cs" />
     <Compile Include="..\..\..\external\cecil\rocks\Mono.Cecil.Rocks\DocCommentId.cs" />
@@ -74,6 +75,7 @@
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="cecil.mixin.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../class/monodoc/monodoc.csproj" />
diff --git a/mcs/tools/mkbundle/mkbundle.csproj b/mcs/tools/mkbundle/mkbundle.csproj
index 83e8f1a46d2..80f5d00d95b 100644
--- a/mcs/tools/mkbundle/mkbundle.csproj
+++ b/mcs/tools/mkbundle/mkbundle.csproj
@@ -46,16 +46,99 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
-    <Compile Include="..\..\..\external\ikvm\reflect\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Emit\*.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\AmbiguousMatchException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Assembly.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\AssemblyName.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\BadImageFormatException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Binder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ConstructorInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeData.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeNamedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeTypedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomModifiers.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\AssemblyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ConstructorBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomAttributeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomModifiersBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EnumBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EventBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ExceptionHandler.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\FieldBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ILGenerator.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\MethodBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ModuleBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCodes.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ParameterBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\PropertyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\SignatureHelper.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Tokens.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\TypeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\EventInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ExceptionHandlingClause.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Fusion.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\GenericWrappers.cs" />
     <Compile Include="..\..\..\external\ikvm\reflect\Impl\ITypeOwner.cs" />
     <Compile Include="..\..\..\external\ikvm\reflect\Impl\SymbolSupport.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Reader\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Writer\*.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\InterfaceMapping.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\LocalVariableInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ManifestResourceInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MarshalSpec.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MemberInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\CliHeader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\MetadataRW.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\Tables.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBase.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBody.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodImplMap.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Missing.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Module.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterModifier.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Projection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertyInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertySignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\AssemblyReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Authenticode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ByteReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\EventInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Field.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\GenericTypeParameter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\MetadataReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Method.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ModuleReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PEReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PropertyInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ResourceModule.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\TypeDefImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Signature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StandAloneMethodSig.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StrongNameKeyPair.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Type.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeNameParser.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Universe.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Util.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ByteBuffer.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\Heaps.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\MetadataWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ModuleWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\PEWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ResourceSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\TextSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\VersionInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\coreclr.cs" />
     <Compile Include="mkbundle.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../class/System.XML/System.Xml.csproj" />
diff --git a/mcs/tools/mod/mod.csproj b/mcs/tools/mod/mod.csproj
index 121836cf2b9..956af8d288e 100644
--- a/mcs/tools/mod/mod.csproj
+++ b/mcs/tools/mod/mod.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="mod.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mono-api-html/mono-api-html.csproj b/mcs/tools/mono-api-html/mono-api-html.csproj
index a6e52e326c6..5be43afe2fb 100644
--- a/mcs/tools/mono-api-html/mono-api-html.csproj
+++ b/mcs/tools/mono-api-html/mono-api-html.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="ApiChange.cs" />
     <Compile Include="ApiDiff.cs" />
@@ -62,6 +62,7 @@
     <Compile Include="NamespaceComparer.cs" />
     <Compile Include="PropertyComparer.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj b/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj
index 08ffb31bbc5..f9461569bb5 100644
--- a/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj
+++ b/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj
@@ -41,13 +41,14 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\build\common\Consts.cs" />
     <Compile Include="..\..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="config.cs" />
     <Compile Include="main.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj b/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj
index 0447c7ec51f..df476247bd6 100644
--- a/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj
+++ b/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\..\build\common\Consts.cs" />
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.Configuration.Crypto\ConfigSection.cs" />
@@ -50,6 +50,7 @@
     <Compile Include="Mono.Configuration.Crypto\KeyContainer.cs" />
     <Compile Include="Mono.Configuration.Crypto\KeyContainerCollection.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mono-service/mono-service.csproj b/mcs/tools/mono-service/mono-service.csproj
index 703173a5e0c..93c590b83e4 100644
--- a/mcs/tools/mono-service/mono-service.csproj
+++ b/mcs/tools/mono-service/mono-service.csproj
@@ -44,12 +44,13 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="mono-service.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mono-shlib-cop/mono-shlib-cop.csproj b/mcs/tools/mono-shlib-cop/mono-shlib-cop.csproj
index 3c4e2305895..ab8fa950dd9 100644
--- a/mcs/tools/mono-shlib-cop/mono-shlib-cop.csproj
+++ b/mcs/tools/mono-shlib-cop/mono-shlib-cop.csproj
@@ -41,11 +41,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="mono-shlib-cop.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mono-symbolicate/mono-symbolicate.csproj b/mcs/tools/mono-symbolicate/mono-symbolicate.csproj
index 8294e9b952d..6aff50035bf 100644
--- a/mcs/tools/mono-symbolicate/mono-symbolicate.csproj
+++ b/mcs/tools/mono-symbolicate/mono-symbolicate.csproj
@@ -46,10 +46,47 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\*.cs" />
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\*.cs" />
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\*.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Code.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeReader.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\CodeWriter.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Document.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ExceptionHandler.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\ILProcessor.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Instruction.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\MethodBody.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCode.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\OpCodes.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\PortablePdb.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\SequencePoint.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\Symbols.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableDefinition.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Cil\VariableReference.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\BlobHeap.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Buffers.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\CodedIndex.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\ElementType.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\GuidHeap.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Heap.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\MetadataToken.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\PdbHeap.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Row.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\StringHeap.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TableHeap.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\TokenType.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\UserStringHeap.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.Metadata\Utilities.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamReader.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\BinaryStreamWriter.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBuffer.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ByteBufferEqualityComparer.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\DataDirectory.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Image.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageReader.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\ImageWriter.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\Section.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil.PE\TextMap.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ArrayType.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyDefinition.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\AssemblyFlags.cs" />
@@ -107,13 +144,13 @@
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleKind.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ModuleReference.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\NativeType.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeAttributes.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeInfo.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterAttributes.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinition.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterDefinitionCollection.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\ParameterReference.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\PinnedType.cs" />
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeAttributes.cs" />
-    <Compile Include="..\..\..\external\cecil\Mono.Cecil\PInvokeInfo.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\PointerType.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyAttributes.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\PropertyDefinition.cs" />
@@ -133,22 +170,63 @@
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\TypeSystem.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\VariantType.cs" />
     <Compile Include="..\..\..\external\cecil\Mono.Cecil\WindowsRuntimeProjections.cs" />
-    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\*.cs" />
-    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\*.cs" />
-    <Compile Include="..\..\..\external\cecil\Mono\*.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\Collection.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Collections.Generic\ReadOnlyCollection.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoConvert.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoService.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono\Disposable.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono\Empty.cs" />
+    <Compile Include="..\..\..\external\cecil\Mono\Type.cs" />
     <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbReader.cs" />
     <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.Cecil.Mdb\MdbWriter.cs" />
-    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\*.cs" />
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\*.cs" />
-    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\*.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\mdb\Mono.CompilerServices.SymbolWriter\SymbolWriterImpl.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\BitAccess.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\BitSet.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\CvInfo.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\DataStream.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\DbiDbgHdr.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\DbiHeader.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\DbiModuleInfo.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\DbiSecCon.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\IntHashTable.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\Interfaces.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\MsfDirectory.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbConstant.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbDebugException.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbException.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbFile.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbFileHeader.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbFunction.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbLine.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbLines.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbReader.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbScope.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbSlot.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbSource.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\PdbTokenLine.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Microsoft.Cci.Pdb\SourceLocationProvider.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\ISymUnmanagedDocumentWriter.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\ISymUnmanagedWriter2.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\ModuleMetadata.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\NativePdbReader.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\NativePdbWriter.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\PdbHelper.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\SymDocumentWriter.cs" />
+    <Compile Include="..\..\..\external\cecil\symbols\pdb\Mono.Cecil.Pdb\SymWriter.cs" />
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="LocationProvider.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="SeqPointInfo.cs" />
     <Compile Include="StackFrameData.cs" />
-    <Compile Include="symbolicate.cs" />
     <Compile Include="SymbolManager.cs" />
+    <Compile Include="symbolicate.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../class/System.XML/System.Xml.csproj" />
diff --git a/mcs/tools/mono-xmltool/mono-xmltool.csproj b/mcs/tools/mono-xmltool/mono-xmltool.csproj
index 467796aca48..f4c80555970 100644
--- a/mcs/tools/mono-xmltool/mono-xmltool.csproj
+++ b/mcs/tools/mono-xmltool/mono-xmltool.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="xmltool.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/mono-xsd/xsd.csproj b/mcs/tools/mono-xsd/xsd.csproj
index c68a37f449c..3c03b1e9159 100644
--- a/mcs/tools/mono-xsd/xsd.csproj
+++ b/mcs/tools/mono-xsd/xsd.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="NewMonoXSD.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/monop/monop.csproj b/mcs/tools/monop/monop.csproj
index 77091bd7424..6f1c79b1c31 100644
--- a/mcs/tools/monop/monop.csproj
+++ b/mcs/tools/monop/monop.csproj
@@ -41,24 +41,106 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include="..\..\..\external\ikvm\reflect\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Emit\*.cs" />
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
+    <Compile Include="..\..\..\external\ikvm\reflect\AmbiguousMatchException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Assembly.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\AssemblyName.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\BadImageFormatException.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Binder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ConstructorInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeData.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeNamedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomAttributeTypedArgument.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\CustomModifiers.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\AssemblyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ConstructorBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomAttributeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\CustomModifiersBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EnumBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\EventBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ExceptionHandler.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\FieldBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ILGenerator.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\MethodBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ModuleBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\OpCodes.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\ParameterBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\PropertyBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\SignatureHelper.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\Tokens.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Emit\TypeBuilder.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Enums.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\EventInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ExceptionHandlingClause.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\FieldSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Fusion.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\GenericWrappers.cs" />
     <Compile Include="..\..\..\external\ikvm\reflect\Impl\ITypeOwner.cs" />
     <Compile Include="..\..\..\external\ikvm\reflect\Impl\SymbolSupport.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Reader\*.cs" />
-    <Compile Include="..\..\..\external\ikvm\reflect\Writer\*.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\InterfaceMapping.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\LocalVariableInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ManifestResourceInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MarshalSpec.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MemberInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\CliHeader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\MetadataRW.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Metadata\Tables.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBase.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodBody.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodImplMap.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\MethodSignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Missing.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Module.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\ParameterModifier.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Projection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertyInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\PropertySignature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\AssemblyReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Authenticode.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ByteReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\EventInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Field.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\GenericTypeParameter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\MetadataReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\Method.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ModuleReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PEReader.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\PropertyInfoImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\ResourceModule.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Reader\TypeDefImpl.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Signature.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StandAloneMethodSig.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\StrongNameKeyPair.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Type.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\TypeNameParser.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Universe.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Util.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ByteBuffer.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\Heaps.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\MetadataWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ModuleWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\PEWriter.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\ResourceSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\TextSection.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\Writer\VersionInfo.cs" />
+    <Compile Include="..\..\..\external\ikvm\reflect\coreclr.cs" />
     <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
     <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
     <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\SourceMethodBuilder.cs" />
     <Compile Include="..\..\class\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs" />
+    <Compile Include="TypeSorter.cs" />
     <Compile Include="monop.cs" />
     <Compile Include="options.cs" />
     <Compile Include="outline.cs" />
-    <Compile Include="TypeSorter.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/nunit-lite/NUnitLite/nunitlite.csproj b/mcs/tools/nunit-lite/NUnitLite/nunitlite.csproj
index 91f3a37017c..83123036500 100644
--- a/mcs/tools/nunit-lite/NUnitLite/nunitlite.csproj
+++ b/mcs/tools/nunit-lite/NUnitLite/nunitlite.csproj
@@ -46,6 +46,7 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Api\ExpectedExceptionData.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Api\IParameterDataSource.cs" />
@@ -74,8 +75,8 @@
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\CultureAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\DataAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\DatapointAttribute.cs" />
-    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\DatapointsAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\DatapointSourceAttribute.cs" />
+    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\DatapointsAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\DescriptionAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\ExpectedExceptionAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\ExplicitAttribute.cs" />
@@ -102,8 +103,8 @@
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\TestFixtureTearDownAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\TheoryAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\TimeoutAttribute.cs" />
-    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\ValuesAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\ValueSourceAttribute.cs" />
+    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Attributes\ValuesAttribute.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\AllItemsConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\AndConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\AssignableFromConstraint.cs" />
@@ -144,20 +145,20 @@
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\FloatingPointNumerics.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\GreaterThanConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\GreaterThanOrEqualConstraint.cs" />
-    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\InstanceOfTypeConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\IResolveConstraint.cs" />
+    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\InstanceOfTypeConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\LessThanConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\LessThanOrEqualConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\MessageWriter.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\MsgUtils.cs" />
+    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\NUnitComparer.cs" />
+    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\NUnitEqualityComparer.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\NaNConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\NoItemConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\NotConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\NullConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\NullOrEmptyStringConstraint.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\Numerics.cs" />
-    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\NUnitComparer.cs" />
-    <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\NUnitEqualityComparer.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\Operators\AllOperator.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\Operators\AndOperator.cs" />
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Constraints\Operators\AttributeOperator.cs" />
@@ -316,6 +317,7 @@
     <Compile Include="..\..\..\..\external\nunit-lite\NUnitLite-1.0.0\src\framework\Throws.cs" />
     <Compile Include="BabysitterSupport.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../../../class/System/System.csproj" />
diff --git a/mcs/tools/nunit-lite/nunit-lite-console/nunit-lite-console.csproj b/mcs/tools/nunit-lite/nunit-lite-console/nunit-lite-console.csproj
index 9502a22c4b3..fe85c5b4b42 100644
--- a/mcs/tools/nunit-lite/nunit-lite-console/nunit-lite-console.csproj
+++ b/mcs/tools/nunit-lite/nunit-lite-console/nunit-lite-console.csproj
@@ -46,9 +46,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- @BUILT_SOURCES@ -->
   <ItemGroup>
     <Compile Include="Console.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
     <ProjectReference Include="../NUnitLite/nunitlite.csproj" />
diff --git a/mcs/tools/nunitreport/nunitreport.csproj b/mcs/tools/nunitreport/nunitreport.csproj
index da21605853f..4ac71474c3e 100644
--- a/mcs/tools/nunitreport/nunitreport.csproj
+++ b/mcs/tools/nunitreport/nunitreport.csproj
@@ -41,11 +41,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="FailedTest.cs" />
     <Compile Include="NUnitReport.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/pdb2mdb/pdb2mdb.csproj b/mcs/tools/pdb2mdb/pdb2mdb.csproj
index 68b5e330cdc..d888c653339 100644
--- a/mcs/tools/pdb2mdb/pdb2mdb.csproj
+++ b/mcs/tools/pdb2mdb/pdb2mdb.csproj
@@ -41,8 +41,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="BitAccess.cs" />
     <Compile Include="BitSet.cs" />
     <Compile Include="CvInfo.cs" />
@@ -52,8 +52,8 @@
     <Compile Include="DbiModuleInfo.cs" />
     <Compile Include="DbiSecCon.cs" />
     <Compile Include="Driver.cs" />
-    <Compile Include="Interfaces.cs" />
     <Compile Include="IntHashTable.cs" />
+    <Compile Include="Interfaces.cs" />
     <Compile Include="MsfDirectory.cs" />
     <Compile Include="PdbConstant.cs" />
     <Compile Include="PdbDebugException.cs" />
@@ -70,6 +70,7 @@
     <Compile Include="PdbWriter.cs" />
     <Compile Include="SourceLocationProvider.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/resgen/resgen.csproj b/mcs/tools/resgen/resgen.csproj
index 89c099383ba..94a2981916b 100644
--- a/mcs/tools/resgen/resgen.csproj
+++ b/mcs/tools/resgen/resgen.csproj
@@ -42,8 +42,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
@@ -68,6 +68,7 @@
     <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="monoresgen.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/sgen/sgen.csproj b/mcs/tools/sgen/sgen.csproj
index 45581f0cd33..e61f4156c6a 100644
--- a/mcs/tools/sgen/sgen.csproj
+++ b/mcs/tools/sgen/sgen.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="sgen.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/soapsuds/soapsuds.csproj b/mcs/tools/soapsuds/soapsuds.csproj
index 0dba8f31c19..1cd72edcee9 100644
--- a/mcs/tools/soapsuds/soapsuds.csproj
+++ b/mcs/tools/soapsuds/soapsuds.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="soapsuds.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/sqlmetal/sqlmetal.csproj b/mcs/tools/sqlmetal/sqlmetal.csproj
index a55d5cf4a9f..6a992410b01 100644
--- a/mcs/tools/sqlmetal/sqlmetal.csproj
+++ b/mcs/tools/sqlmetal/sqlmetal.csproj
@@ -43,8 +43,8 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\class\System.Data.Linq\src\DbLinq.ProductInfo.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\AbstractParameters.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Configuration\ProvidersSection.cs" />
@@ -58,16 +58,16 @@
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\EntityInterface\Implementation\InterfaceImplementation.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\GenerationContext.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\ICodeGenerator.cs" />
+    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\IProcessor.cs" />
+    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\ISchemaLoaderFactory.cs" />
+    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\CodeTextGenerator\CSCodeGenerator.cs" />
+    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\CodeTextGenerator\CSCodeWriter.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\CodeTextGenerator\CodeGenerator.Class.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\CodeTextGenerator\CodeGenerator.Context.Ctor.cs" />
-    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\CodeTextGenerator\CodeGenerator.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\CodeTextGenerator\CodeGenerator.Procedure.cs" />
-    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\CodeTextGenerator\CSCodeGenerator.cs" />
-    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\CodeTextGenerator\CSCodeWriter.cs" />
+    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\CodeTextGenerator\CodeGenerator.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\Processor.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\Implementation\SchemaLoaderFactory.cs" />
-    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\IProcessor.cs" />
-    <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\ISchemaLoaderFactory.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\ParameterDefinition.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Generator\SpecificationDefinition.cs" />
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Language\EnglishWords.cs" />
@@ -86,6 +86,7 @@
     <Compile Include="..\..\class\System.Data.Linq\src\DbMetal\Utility\VariablesExtension.cs" />
     <Compile Include="AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/sqlsharp/sqlsharp.csproj b/mcs/tools/sqlsharp/sqlsharp.csproj
index 8447ef98e4c..1f2faf9ac93 100644
--- a/mcs/tools/sqlsharp/sqlsharp.csproj
+++ b/mcs/tools/sqlsharp/sqlsharp.csproj
@@ -41,10 +41,11 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="SqlSharpCli.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/svcutil/svcutil.csproj b/mcs/tools/svcutil/svcutil.csproj
index d48e8269c99..64805959a8f 100644
--- a/mcs/tools/svcutil/svcutil.csproj
+++ b/mcs/tools/svcutil/svcutil.csproj
@@ -41,13 +41,14 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="CommandLineOptions.cs" />
     <Compile Include="Driver.cs" />
     <Compile Include="MoonlightChannelBaseExtension.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
diff --git a/mcs/tools/wsdl/wsdl.csproj b/mcs/tools/wsdl/wsdl.csproj
index bdc64e0cb27..a79311205af 100644
--- a/mcs/tools/wsdl/wsdl.csproj
+++ b/mcs/tools/wsdl/wsdl.csproj
@@ -41,11 +41,12 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- @COMMON_SOURCES@ -->
-  <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+  <!-- @BUILT_SOURCES@ -->
+  <ItemGroup>
     <Compile Include="MonoWSDL2.cs" />
     <Compile Include="SampleGenerator.cs" />
   </ItemGroup>
+  <ItemGroup></ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
author	Katelyn Gadd <kg@luminance.org>	2018-06-29 09:01:31 +0300
committer	Marek Safar <marek.safar@gmail.com>	2018-06-29 09:01:31 +0300
commit	e271c293ee7a364a853a30f8574830ea84e0481a (patch)
tree	2cf0d6da865890a2498d6ebb3beebf3b91532041 /mcs
parent	57b474ba90c4224c0ed0db618c2cf212cd1a0bf4 (diff)