23 files changed, 1478 insertions, 1066 deletions
diff --git a/external/api-snapshot b/external/api-snapshot
-Subproject 91d3eefb6069d3392e6d436c673128991eb0079
+Subproject 1882986bf11d87e57fa6b13a6c60ab5e925ecda
diff --git a/mcs/build/gensources.cs b/mcs/build/gensources.cs
new file mode 100644
index 00000000000..d55c627d4dc
--- /dev/null
+++ b/mcs/build/gensources.cs
@@ -0,0 +1,411 @@
+using System;
+using System.Text;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+public static class Program {
+    public static int Main (string[] _args) {
+        var args = new List<string> (_args);
+        bool useStdout = false, showHelp = false, strictMode = false;
+
+        for (int i = 0; i < args.Count; i++) {
+            var arg = args[i];
+            if (!arg.StartsWith ("-"))
+                continue;
+
+            switch (arg) {
+                case "-?":
+                case "--help":
+                case "-h":
+                    showHelp = true;
+                    break;
+                case "--trace":
+                case "--trace1":
+                    SourcesParser.TraceLevel = 1;
+                    break;
+                case "--trace2":
+                    SourcesParser.TraceLevel = 2;
+                    break;
+                case "--trace3":
+                    SourcesParser.TraceLevel = 3;
+                    break;
+                case "--trace4":
+                    SourcesParser.TraceLevel = 4;
+                    break;
+                case "--stdout":
+                    useStdout = true;
+                    break;
+                case "--strict":
+                    strictMode = true;
+                    break;
+                default:
+                    Console.Error.WriteLine ("Unrecognized switch " + arg);
+                    break;
+            }
+
+            args.RemoveAt (i);
+            i--;            
+        }
+
+        if (args.Count != 4)
+            showHelp = true;
+
+        if (showHelp) {
+            Console.Error.WriteLine ("Usage: mcs/build/gensources.exe [options] (outputFileName|--stdout) libraryDirectoryAndName platformName profileName");
+            Console.Error.WriteLine ("You can specify * for platformName and profileName to read all sources files");
+            Console.Error.WriteLine ("Available options:");
+            Console.Error.WriteLine ("--help -h -?");
+            Console.Error.WriteLine ("  Show command line info");
+            Console.Error.WriteLine ("--trace1 --trace2 --trace3 --trace4");
+            Console.Error.WriteLine ("  Enable diagnostic output");
+            Console.Error.WriteLine ("--stdout");
+            Console.Error.WriteLine ("  Writes results to standard output (omit outputFileName if you use this)");
+            Console.Error.WriteLine ("--strict");
+            Console.Error.WriteLine ("  Produces an error exit code if files or directories are invalid/missing");
+            return 1;
+        }
+
+        var myAssembly = Assembly.GetExecutingAssembly ();
+        var codeBase = new Uri (myAssembly.CodeBase);
+        var executablePath = Path.GetFullPath (codeBase.LocalPath);
+        var executableDirectory = Path.GetDirectoryName (executablePath);
+
+        var outFile = Path.GetFullPath (args[0]);
+        var libraryFullName = Path.GetFullPath (args[1]);
+        var platformName = args[2];
+        var profileName = args[3];
+        var platformsFolder = Path.Combine (executableDirectory, "platforms");
+        var profilesFolder = Path.Combine (executableDirectory, "profiles");
+
+        var libraryDirectory = Path.GetDirectoryName (libraryFullName);
+        var libraryName = Path.GetFileName (libraryFullName);
+
+        var parser = new SourcesParser (platformsFolder, profilesFolder);
+        var result = parser.Parse (libraryDirectory, libraryName, platformName, profileName);
+
+        if (SourcesParser.TraceLevel > 0)
+            Console.Error.WriteLine ($"// Writing sources for platform {platformName} and profile {profileName}, relative to {libraryDirectory}, to {outFile}.");
+
+        TextWriter output;
+        if (useStdout)
+            output = Console.Out;
+        else
+            output = new StreamWriter (outFile);
+
+        using (output) {
+            foreach (var fileName in result.GetFileNames ().OrderBy (s => s, StringComparer.Ordinal))
+                output.WriteLine (fileName);
+        }
+
+        if (strictMode)
+            return result.ErrorCount;
+        else
+            return 0;
+    }
+}
+
+public struct ParseEntry {
+    public string SourcesFileName;
+    public string Directory;
+    public string Pattern;
+    public string HostPlatform;
+    public string ProfileName;
+}
+
+public struct Source {
+    public string FileName;
+}
+
+public class ParseResult {
+    public readonly string LibraryDirectory, LibraryName;
+
+    public readonly List<ParseEntry> Sources = new List<ParseEntry> ();
+    public readonly List<ParseEntry> Exclusions = new List<ParseEntry> ();
+
+    // FIXME: This is a bad spot for this value but enumerators don't have outparam support
+    public int ErrorCount = 0;
+
+    public ParseResult (string libraryDirectory, string libraryName) {
+        LibraryDirectory = libraryDirectory;
+        LibraryName = libraryName;
+    }
+
+    private static string GetRelativePath (string fullPath, string relativeToDirectory) {
+        fullPath = fullPath.Replace (SourcesParser.DirectorySeparator, "/");
+        relativeToDirectory = relativeToDirectory.Replace (SourcesParser.DirectorySeparator, "/");
+
+        if (!relativeToDirectory.EndsWith (SourcesParser.DirectorySeparator))
+            relativeToDirectory += SourcesParser.DirectorySeparator;
+        var dirUri = new Uri (relativeToDirectory);
+        var pathUri = new Uri (fullPath);
+
+        var relativeUri = Uri.UnescapeDataString (
+            dirUri.MakeRelativeUri (pathUri).OriginalString
+        ).Replace ("/", SourcesParser.DirectorySeparator);
+
+        if (SourcesParser.TraceLevel >= 4)
+            Console.Error.WriteLine ($"// {fullPath} -> {relativeUri}");
+
+        return relativeUri;
+    }
+
+    private IEnumerable<string> EnumerateMatches (
+        IEnumerable<ParseEntry> entries,
+        string hostPlatformName, string profileName
+    ) {
+        foreach (var entry in entries) {
+            if (
+                (hostPlatformName != null) &&
+                (entry.HostPlatform ?? hostPlatformName) != hostPlatformName
+            )
+                continue;
+            if (
+                (profileName != null) &&
+                (entry.ProfileName ?? profileName) != profileName
+            )
+                continue;
+
+            var absolutePath = Path.Combine (entry.Directory, entry.Pattern);
+            var absoluteDirectory = Path.GetDirectoryName (absolutePath);
+            var absolutePattern = Path.GetFileName (absolutePath);
+
+            if (SourcesParser.TraceLevel >= 3) {
+                if ((absolutePattern != entry.Pattern) || (absoluteDirectory != entry.Directory))
+                    Console.Error.WriteLine ($"// {entry.Directory} / {entry.Pattern} -> {absoluteDirectory} / {absolutePattern}");
+            }            
+
+            if (!Directory.Exists (absoluteDirectory)) {
+                Console.Error.WriteLine ($"Directory does not exist: {Path.GetFullPath (absoluteDirectory)}");
+                ErrorCount += 1;
+                continue;
+            }
+
+            var matchingFiles = Directory.GetFiles (absoluteDirectory, absolutePattern);
+            foreach (var fileName in matchingFiles) {
+                var relativePath = GetRelativePath (fileName, LibraryDirectory);
+                yield return relativePath;
+            }
+        }
+    }
+
+    // If you loaded sources files for multiple profiles, you can use the arguments here
+    //  to filter the results
+    public IEnumerable<string> GetFileNames (
+        string hostPlatformName = null, string profileName = null
+    ) {
+        var encounteredFileNames = new HashSet<string> (StringComparer.Ordinal);
+
+        var excludedFiles = new HashSet<string> (
+            EnumerateMatches (Exclusions, hostPlatformName, profileName),
+            StringComparer.Ordinal
+        );
+
+        foreach (var fileName in EnumerateMatches (Sources, hostPlatformName, profileName)) {
+            if (excludedFiles.Contains (fileName)) {
+                if (SourcesParser.TraceLevel >= 3)
+                    Console.Error.WriteLine ($"// Excluding {fileName}");
+                continue;
+            }
+
+            // Skip duplicates
+            if (encounteredFileNames.Contains (fileName))
+                continue;
+
+            encounteredFileNames.Add (fileName);
+            yield return fileName;
+        }
+    }
+}
+
+public class SourcesParser {
+    public static readonly string DirectorySeparator = new String (Path.DirectorySeparatorChar, 1);    
+    public static int TraceLevel = 0;
+
+    private class State {
+        public ParseResult Result;
+        public string HostPlatform;
+        public string ProfileName;
+
+        public int SourcesFilesParsed, ExclusionsFilesParsed;
+
+        public List<ParseEntry> ParsedSources {
+            get {
+                return Result.Sources;
+            }
+        }
+
+        public List<ParseEntry> ParsedExclusions {
+            get {
+                return Result.Exclusions;
+            }
+        }
+    }
+
+    public readonly string[] AllHostPlatformNames;
+    public readonly string[] AllProfileNames;
+
+    private int ParseDepth = 0;
+
+    public SourcesParser (
+        string platformsFolder, string profilesFolder
+    ) {
+        AllHostPlatformNames = Directory.GetFiles (platformsFolder, "*.make")
+            .Select (Path.GetFileNameWithoutExtension)
+            .ToArray ();
+        AllProfileNames = Directory.GetFiles (profilesFolder, "*.make")
+            .Select (Path.GetFileNameWithoutExtension)
+            .ToArray ();
+    }
+
+    public ParseResult Parse (string libraryDirectory, string libraryName, string hostPlatform, string profile) {
+        var state = new State {
+            Result = new ParseResult (libraryDirectory, libraryName),
+            ProfileName = profile,
+            HostPlatform = hostPlatform
+        };
+
+        var testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{profile}_{libraryName}");
+        var ok = TryParseSingleFile (state, testPath + ".sources", false);
+        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+
+        if (ok) {
+            PrintSummary (state);
+            return state.Result;
+        }
+
+        state.HostPlatform = null;
+
+        testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}");
+        ok = TryParseSingleFile (state, testPath + ".sources", false);
+        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+
+        if (ok) {
+            PrintSummary (state);
+            return state.Result;
+        }
+
+        state.ProfileName = null;
+
+        testPath = Path.Combine (libraryDirectory, libraryName);
+        TryParseSingleFile (state, testPath + ".sources", false);
+        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+
+        PrintSummary (state);
+
+        return state.Result;
+    }
+
+    public ParseResult Parse (string libraryDirectory, string libraryName) {
+        var state = new State {
+            Result = new ParseResult (libraryDirectory, libraryName)
+        };
+
+        string testPath = Path.Combine (libraryDirectory, libraryName);
+        TryParseSingleFile (state, testPath + ".sources", false);
+        TryParseSingleFile (state, testPath + ".exclude.sources", true);
+
+        foreach (var profile in AllProfileNames) {
+            state.ProfileName = profile;
+
+            foreach (var hostPlatform in AllHostPlatformNames) {
+                state.HostPlatform = hostPlatform;
+
+                testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{profile}_{libraryName}");
+                TryParseSingleFile (state, testPath + ".sources", false);
+                TryParseSingleFile (state, testPath + ".exclude.sources", true);
+            }
+
+            state.HostPlatform = null;
+
+            testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}");
+            TryParseSingleFile (state, testPath + ".sources", false);
+            TryParseSingleFile (state, testPath + ".exclude.sources", true);
+        }
+
+        PrintSummary (state);
+
+        return state.Result;
+    }
+
+    private void PrintSummary (State state) {
+        if (TraceLevel > 0)
+            Console.Error.WriteLine ($"// Parsed {state.SourcesFilesParsed} sources file(s) and {state.ExclusionsFilesParsed} exclusions file(s).");
+    }
+
+    private void HandleMetaDirective (State state, string directory, bool asExclusionsList, string directive) {
+        var include = "#include ";
+        if (directive.StartsWith (include))
+            ParseSingleFile (state, Path.Combine (directory, directive.Substring (include.Length)), asExclusionsList);
+    }
+
+    private bool TryParseSingleFile (State state, string fileName, bool asExclusionsList) {
+        if (!File.Exists (fileName))
+            return false;
+
+        ParseSingleFile (state, fileName, asExclusionsList);
+        return true;
+    }
+
+    private void ParseSingleFile (State state, string fileName, bool asExclusionsList) {
+        var nullStr = "<none>";
+        if (TraceLevel >= 1)
+            Console.Error.WriteLine ($"// {new String (' ', ParseDepth * 2)}{fileName}  [{state.HostPlatform ?? nullStr}] [{state.ProfileName ?? nullStr}]");
+        ParseDepth += 1;
+
+        var directory = Path.GetDirectoryName (fileName);
+
+        using (var sr = new StreamReader (fileName)) {
+            if (asExclusionsList)
+                state.ExclusionsFilesParsed++;
+            else
+                state.SourcesFilesParsed++;
+
+            string line;
+            while ((line = sr.ReadLine ()) != null) {
+                if (String.IsNullOrWhiteSpace (line))
+                    continue;
+
+                if (line.StartsWith ("#")) {
+                    HandleMetaDirective (state, directory, asExclusionsList, line);
+                    continue;
+                }
+
+                var parts = line.Split (':');
+
+                if (parts.Length > 1) {
+                    var explicitExclusions = parts[1].Split (',');
+
+                    // gensources.sh implemented these explicit exclusions like so:
+                    // ../foo/bar/*.cs:A.cs,B.cs
+                    // This would generate exclusions for ../foo/bar/A.cs and ../foo/bar/B.cs,
+                    //  not ./A.cs and ./B.cs as you might expect
+
+                    var mainPatternDirectory = Path.GetDirectoryName (parts[0]);
+
+                    foreach (var pattern in explicitExclusions) {
+                        state.ParsedExclusions.Add (new ParseEntry {
+                            SourcesFileName = fileName,
+                            Directory = directory,
+                            Pattern = Path.Combine (mainPatternDirectory, pattern),
+                            HostPlatform = state.HostPlatform,
+                            ProfileName = state.ProfileName
+                        });
+                    }
+                }
+
+                (asExclusionsList ? state.ParsedExclusions : state.ParsedSources)
+                    .Add (new ParseEntry {
+                        SourcesFileName = fileName,
+                        Directory = directory,
+                        Pattern = parts[0],
+                        HostPlatform = state.HostPlatform,
+                        ProfileName = state.ProfileName
+                    });
+            }
+        }
+
+        ParseDepth -= 1;
+    }
+}
+\ No newline at end of file
diff --git a/mcs/build/library.make b/mcs/build/library.make
index 5e44bce9fb0..e5a8cdcb6d2 100644
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -298,11 +298,19 @@ endif
 PROFILE_sources := $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).sources)) $(wildcard $(PROFILE)_$(LIBRARY).sources) $(wildcard $(LIBRARY).sources))
 PROFILE_excludes = $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).exclude.sources)) $(wildcard $(PROFILE)_$(LIBRARY).exclude.sources))
 
-# Note, gensources.sh can create a $(sourcefile).makefrag if it sees any '#include's
-# We don't include it in the dependencies since it isn't always created
+gensources = $(topdir)/build/gensources.exe
+$(gensources): $(topdir)/build/gensources.cs
+	$(BOOTSTRAP_MCS) -noconfig -debug:portable -r:mscorlib.dll -r:System.dll -r:System.Core.dll -out:$(gensources) $(topdir)/build/gensources.cs
+
+ifdef PROFILE_RUNTIME
+GENSOURCES_RUNTIME = $(PROFILE_RUNTIME)
+else
+GENSOURCES_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"  $(RUNTIME)
+endif
+
 sourcefile = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).sources
-$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(topdir)/build/gensources.sh $(depsdir)/.stamp
-	$(SHELL) $(topdir)/build/gensources.sh $@ '$(PROFILE_sources)' '$(PROFILE_excludes)'
+$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(depsdir)/.stamp $(gensources)
+	$(GENSOURCES_RUNTIME) --debug $(gensources) "$@" "$(LIBRARY)" "$(PROFILE_PLATFORM)" "$(PROFILE)"
 
 library_CLEAN_FILES += $(sourcefile)
 
diff --git a/mcs/class/CustomMarshalers/CustomMarshalers.csproj b/mcs/class/CustomMarshalers/CustomMarshalers.csproj
index 937c8e8e3b7..daafe78e3e4 100644
--- a/mcs/class/CustomMarshalers/CustomMarshalers.csproj
+++ b/mcs/class/CustomMarshalers/CustomMarshalers.csproj
@@ -48,11 +48,11 @@
     <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.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
-    <Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />
+    <Compile Include="System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />
+    <Compile Include="System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
+    <Compile Include="System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj b/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj
index 8d0806c24ae..103e64432cd 100644
--- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj
+++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj
@@ -46,31 +46,31 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- @COMMON_SOURCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2ClientUtils.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2CLIWrapper.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2Command.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2CommandBuilder.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2Connection.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2ConnectionPool.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2ConnectionSettings.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2Constants.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2DataAdapter.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2DataReader.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2Environment.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2Error.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2ErrorCollection.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2Exception.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2InfoMessageEventHandler.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2OpenConnection.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2Parameter.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2ParameterCollection.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventArgs.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatedEventHandler.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventArgs.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2RowUpdatingEventHandler.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2Transaction.cs" />
-    <Compile Include=".\IBM.Data.DB2\DB2Type.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="IBM.Data.DB2\DB2ClientUtils.cs" />
+    <Compile Include="IBM.Data.DB2\DB2CLIWrapper.cs" />
+    <Compile Include="IBM.Data.DB2\DB2Command.cs" />
+    <Compile Include="IBM.Data.DB2\DB2CommandBuilder.cs" />
+    <Compile Include="IBM.Data.DB2\DB2Connection.cs" />
+    <Compile Include="IBM.Data.DB2\DB2ConnectionPool.cs" />
+    <Compile Include="IBM.Data.DB2\DB2ConnectionSettings.cs" />
+    <Compile Include="IBM.Data.DB2\DB2Constants.cs" />
+    <Compile Include="IBM.Data.DB2\DB2DataAdapter.cs" />
+    <Compile Include="IBM.Data.DB2\DB2DataReader.cs" />
+    <Compile Include="IBM.Data.DB2\DB2Environment.cs" />
+    <Compile Include="IBM.Data.DB2\DB2Error.cs" />
+    <Compile Include="IBM.Data.DB2\DB2ErrorCollection.cs" />
+    <Compile Include="IBM.Data.DB2\DB2Exception.cs" />
+    <Compile Include="IBM.Data.DB2\DB2InfoMessageEventHandler.cs" />
+    <Compile Include="IBM.Data.DB2\DB2OpenConnection.cs" />
+    <Compile Include="IBM.Data.DB2\DB2Parameter.cs" />
+    <Compile Include="IBM.Data.DB2\DB2ParameterCollection.cs" />
+    <Compile Include="IBM.Data.DB2\DB2RowUpdatedEventArgs.cs" />
+    <Compile Include="IBM.Data.DB2\DB2RowUpdatedEventHandler.cs" />
+    <Compile Include="IBM.Data.DB2\DB2RowUpdatingEventArgs.cs" />
+    <Compile Include="IBM.Data.DB2\DB2RowUpdatingEventHandler.cs" />
+    <Compile Include="IBM.Data.DB2\DB2Transaction.cs" />
+    <Compile Include="IBM.Data.DB2\DB2Type.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
diff --git a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
index 1342d455e80..76c6221a66b 100644
--- a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
+++ b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
@@ -48,12 +48,12 @@
     <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=".\Microsoft.Web.Infrastructure.DynamicModuleHelper\DynamicModuleUtility.cs" />
-    <Compile Include=".\Microsoft.Web.Infrastructure.DynamicValidationHelper\LazyWebROCollection.cs" />
-    <Compile Include=".\Microsoft.Web.Infrastructure.DynamicValidationHelper\ValidationUtility.cs" />
-    <Compile Include=".\Microsoft.Web.Infrastructure\HttpContextHelper.cs" />
-    <Compile Include=".\Microsoft.Web.Infrastructure\InfrastructureHelper.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Microsoft.Web.Infrastructure.DynamicModuleHelper\DynamicModuleUtility.cs" />
+    <Compile Include="Microsoft.Web.Infrastructure.DynamicValidationHelper\LazyWebROCollection.cs" />
+    <Compile Include="Microsoft.Web.Infrastructure.DynamicValidationHelper\ValidationUtility.cs" />
+    <Compile Include="Microsoft.Web.Infrastructure\HttpContextHelper.cs" />
+    <Compile Include="Microsoft.Web.Infrastructure\InfrastructureHelper.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
diff --git a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
index 764f5dbb572..8f48c728d39 100644
--- a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
+++ b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
@@ -54,7 +54,6 @@
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
     <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-    <Compile Include=".\Properties\AssemblyInfo.cs" />
     <Compile Include="Mono.Btls.Interface\BtlsObject.cs" />
     <Compile Include="Mono.Btls.Interface\BtlsProvider.cs" />
     <Compile Include="Mono.Btls.Interface\BtlsX509.cs" />
@@ -72,6 +71,7 @@
     <Compile Include="Mono.Btls.Interface\BtlsX509VerifyFlags.cs" />
     <Compile Include="Mono.Btls.Interface\BtlsX509VerifyParam.cs" />
     <Compile Include="Mono.Btls.Interface\VersionInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
diff --git a/mcs/class/Mono.CSharp/Mono.CSharp.csproj b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
index d6011d16d18..2fc3ceb58a6 100644
--- a/mcs/class/Mono.CSharp/Mono.CSharp.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
@@ -115,10 +115,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <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="..\..\mcs\anonymous.cs" />
     <Compile Include="..\..\mcs\argument.cs" />
     <Compile Include="..\..\mcs\assembly.cs" />
@@ -171,6 +167,10 @@
     <Compile Include="..\..\mcs\typespec.cs" />
     <Compile Include="..\..\mcs\visit.cs" />
     <Compile Include="..\..\tools\monop\outline.cs" />
+    <Compile Include="..\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
+    <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" />
   </ItemGroup>
diff --git a/mcs/class/Mono.Cairo/Mono.Cairo.csproj b/mcs/class/Mono.Cairo/Mono.Cairo.csproj
index e313cad4209..dcf1773185c 100644
--- a/mcs/class/Mono.Cairo/Mono.Cairo.csproj
+++ b/mcs/class/Mono.Cairo/Mono.Cairo.csproj
@@ -47,65 +47,65 @@
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Cairo\Antialias.cs" />
-    <Compile Include=".\Mono.Cairo\Cairo.cs" />
-    <Compile Include=".\Mono.Cairo\CairoDebug.cs" />
-    <Compile Include=".\Mono.Cairo\Color.cs" />
-    <Compile Include=".\Mono.Cairo\Content.cs" />
-    <Compile Include=".\Mono.Cairo\Context.cs" />
-    <Compile Include=".\Mono.Cairo\Device.cs" />
-    <Compile Include=".\Mono.Cairo\DirectFBSurface.cs" />
-    <Compile Include=".\Mono.Cairo\Distance.cs" />
-    <Compile Include=".\Mono.Cairo\EGLDevice.cs" />
-    <Compile Include=".\Mono.Cairo\Extend.cs" />
-    <Compile Include=".\Mono.Cairo\FillRule.cs" />
-    <Compile Include=".\Mono.Cairo\Filter.cs" />
-    <Compile Include=".\Mono.Cairo\FontExtents.cs" />
-    <Compile Include=".\Mono.Cairo\FontFace.cs" />
-    <Compile Include=".\Mono.Cairo\FontOptions.cs" />
-    <Compile Include=".\Mono.Cairo\FontSlant.cs" />
-    <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\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\Matrix.cs" />
-    <Compile Include=".\Mono.Cairo\NativeMethods.cs" />
-    <Compile Include=".\Mono.Cairo\Operator.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" />
-    <Compile Include=".\Mono.Cairo\ScaledFont.cs" />
-    <Compile Include=".\Mono.Cairo\SolidPattern.cs" />
-    <Compile Include=".\Mono.Cairo\Status.cs" />
-    <Compile Include=".\Mono.Cairo\SubpixelOrder.cs" />
-    <Compile Include=".\Mono.Cairo\Surface.cs" />
-    <Compile Include=".\Mono.Cairo\SurfacePattern.cs" />
-    <Compile Include=".\Mono.Cairo\SurfaceType.cs" />
-    <Compile Include=".\Mono.Cairo\SvgSurface.cs" />
-    <Compile Include=".\Mono.Cairo\SvgVersion.cs" />
-    <Compile Include=".\Mono.Cairo\TextExtents.cs" />
-    <Compile Include=".\Mono.Cairo\WGLDevice.cs" />
-    <Compile Include=".\Mono.Cairo\Win32Surface.cs" />
-    <Compile Include=".\Mono.Cairo\XcbSurface.cs" />
-    <Compile Include=".\Mono.Cairo\XlibSurface.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Mono.Cairo\Antialias.cs" />
+    <Compile Include="Mono.Cairo\Cairo.cs" />
+    <Compile Include="Mono.Cairo\CairoDebug.cs" />
+    <Compile Include="Mono.Cairo\Color.cs" />
+    <Compile Include="Mono.Cairo\Content.cs" />
+    <Compile Include="Mono.Cairo\Context.cs" />
+    <Compile Include="Mono.Cairo\Device.cs" />
+    <Compile Include="Mono.Cairo\DirectFBSurface.cs" />
+    <Compile Include="Mono.Cairo\Distance.cs" />
+    <Compile Include="Mono.Cairo\EGLDevice.cs" />
+    <Compile Include="Mono.Cairo\Extend.cs" />
+    <Compile Include="Mono.Cairo\FillRule.cs" />
+    <Compile Include="Mono.Cairo\Filter.cs" />
+    <Compile Include="Mono.Cairo\FontExtents.cs" />
+    <Compile Include="Mono.Cairo\FontFace.cs" />
+    <Compile Include="Mono.Cairo\FontOptions.cs" />
+    <Compile Include="Mono.Cairo\FontSlant.cs" />
+    <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\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\Matrix.cs" />
+    <Compile Include="Mono.Cairo\NativeMethods.cs" />
+    <Compile Include="Mono.Cairo\Operator.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" />
+    <Compile Include="Mono.Cairo\ScaledFont.cs" />
+    <Compile Include="Mono.Cairo\SolidPattern.cs" />
+    <Compile Include="Mono.Cairo\Status.cs" />
+    <Compile Include="Mono.Cairo\SubpixelOrder.cs" />
+    <Compile Include="Mono.Cairo\Surface.cs" />
+    <Compile Include="Mono.Cairo\SurfacePattern.cs" />
+    <Compile Include="Mono.Cairo\SurfaceType.cs" />
+    <Compile Include="Mono.Cairo\SvgSurface.cs" />
+    <Compile Include="Mono.Cairo\SvgVersion.cs" />
+    <Compile Include="Mono.Cairo\TextExtents.cs" />
+    <Compile Include="Mono.Cairo\WGLDevice.cs" />
+    <Compile Include="Mono.Cairo\Win32Surface.cs" />
+    <Compile Include="Mono.Cairo\XcbSurface.cs" />
+    <Compile Include="Mono.Cairo\XlibSurface.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
index bfe7b896ade..3350ae7757f 100644
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
+++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
@@ -48,7 +48,7 @@
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Mono.Debugger.Soft\AbsentInformationException.cs" />
     <Compile Include="Mono.Debugger.Soft\AppDomainCreateEvent.cs" />
     <Compile Include="Mono.Debugger.Soft\AppDomainMirror.cs" />
diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
index 113b7218ca6..5db1be8eb6b 100644
--- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
@@ -47,15 +47,15 @@
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Messaging.RabbitMQ\IMessagingContext.cs" />
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessageFactory.cs" />
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessagingContext.cs" />
-    <Compile Include=".\Mono.Messaging.RabbitMQ\MessagingContextPool.cs" />
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageEnumerator.cs" />
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageQueue.cs" />
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessageQueueTransaction.cs" />
-    <Compile Include=".\Mono.Messaging.RabbitMQ\RabbitMQMessagingProvider.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Mono.Messaging.RabbitMQ\IMessagingContext.cs" />
+    <Compile Include="Mono.Messaging.RabbitMQ\MessageFactory.cs" />
+    <Compile Include="Mono.Messaging.RabbitMQ\MessagingContext.cs" />
+    <Compile Include="Mono.Messaging.RabbitMQ\MessagingContextPool.cs" />
+    <Compile Include="Mono.Messaging.RabbitMQ\RabbitMQMessageEnumerator.cs" />
+    <Compile Include="Mono.Messaging.RabbitMQ\RabbitMQMessageQueue.cs" />
+    <Compile Include="Mono.Messaging.RabbitMQ\RabbitMQMessageQueueTransaction.cs" />
+    <Compile Include="Mono.Messaging.RabbitMQ\RabbitMQMessagingProvider.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
diff --git a/mcs/class/Mono.Messaging/Mono.Messaging.csproj b/mcs/class/Mono.Messaging/Mono.Messaging.csproj
index dc485cbd2fa..635c7cfffc1 100644
--- a/mcs/class/Mono.Messaging/Mono.Messaging.csproj
+++ b/mcs/class/Mono.Messaging/Mono.Messaging.csproj
@@ -51,32 +51,32 @@
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Messaging\AcknowledgeTypes.cs" />
-    <Compile Include=".\Mono.Messaging\Acknowledgment.cs" />
-    <Compile Include=".\Mono.Messaging\CompletedEventArgs.cs" />
-    <Compile Include=".\Mono.Messaging\CompletedEventHandler.cs" />
-    <Compile Include=".\Mono.Messaging\ConcurrentLinkedQueue.cs" />
-    <Compile Include=".\Mono.Messaging\ConnectionException.cs" />
-    <Compile Include=".\Mono.Messaging\CryptographicProviderType.cs" />
-    <Compile Include=".\Mono.Messaging\EncryptionAlgorithm.cs" />
-    <Compile Include=".\Mono.Messaging\EncryptionRequired.cs" />
-    <Compile Include=".\Mono.Messaging\HashAlgorithm.cs" />
-    <Compile Include=".\Mono.Messaging\IMessage.cs" />
-    <Compile Include=".\Mono.Messaging\IMessageEnumerator.cs" />
-    <Compile Include=".\Mono.Messaging\IMessageQueue.cs" />
-    <Compile Include=".\Mono.Messaging\IMessageQueueTransaction.cs" />
-    <Compile Include=".\Mono.Messaging\IMessagingProvider.cs" />
-    <Compile Include=".\Mono.Messaging\MessageBase.cs" />
-    <Compile Include=".\Mono.Messaging\MessagePriority.cs" />
-    <Compile Include=".\Mono.Messaging\MessageQueueBase.cs" />
-    <Compile Include=".\Mono.Messaging\MessageQueueTransactionStatus.cs" />
-    <Compile Include=".\Mono.Messaging\MessageQueueTransactionType.cs" />
-    <Compile Include=".\Mono.Messaging\MessageType.cs" />
-    <Compile Include=".\Mono.Messaging\MessageUnavailableException.cs" />
-    <Compile Include=".\Mono.Messaging\MessagingProviderLocator.cs" />
-    <Compile Include=".\Mono.Messaging\MonoMessagingException.cs" />
-    <Compile Include=".\Mono.Messaging\QueueReference.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Mono.Messaging\AcknowledgeTypes.cs" />
+    <Compile Include="Mono.Messaging\Acknowledgment.cs" />
+    <Compile Include="Mono.Messaging\CompletedEventArgs.cs" />
+    <Compile Include="Mono.Messaging\CompletedEventHandler.cs" />
+    <Compile Include="Mono.Messaging\ConcurrentLinkedQueue.cs" />
+    <Compile Include="Mono.Messaging\ConnectionException.cs" />
+    <Compile Include="Mono.Messaging\CryptographicProviderType.cs" />
+    <Compile Include="Mono.Messaging\EncryptionAlgorithm.cs" />
+    <Compile Include="Mono.Messaging\EncryptionRequired.cs" />
+    <Compile Include="Mono.Messaging\HashAlgorithm.cs" />
+    <Compile Include="Mono.Messaging\IMessage.cs" />
+    <Compile Include="Mono.Messaging\IMessageEnumerator.cs" />
+    <Compile Include="Mono.Messaging\IMessageQueue.cs" />
+    <Compile Include="Mono.Messaging\IMessageQueueTransaction.cs" />
+    <Compile Include="Mono.Messaging\IMessagingProvider.cs" />
+    <Compile Include="Mono.Messaging\MessageBase.cs" />
+    <Compile Include="Mono.Messaging\MessagePriority.cs" />
+    <Compile Include="Mono.Messaging\MessageQueueBase.cs" />
+    <Compile Include="Mono.Messaging\MessageQueueTransactionStatus.cs" />
+    <Compile Include="Mono.Messaging\MessageQueueTransactionType.cs" />
+    <Compile Include="Mono.Messaging\MessageType.cs" />
+    <Compile Include="Mono.Messaging\MessageUnavailableException.cs" />
+    <Compile Include="Mono.Messaging\MessagingProviderLocator.cs" />
+    <Compile Include="Mono.Messaging\MonoMessagingException.cs" />
+    <Compile Include="Mono.Messaging\QueueReference.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
diff --git a/mcs/class/Mono.Options/Mono.Options.csproj b/mcs/class/Mono.Options/Mono.Options.csproj
index 4d3170f3b76..d0fc5313437 100644
--- a/mcs/class/Mono.Options/Mono.Options.csproj
+++ b/mcs/class/Mono.Options/Mono.Options.csproj
@@ -47,8 +47,8 @@
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Options\Options.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Mono.Options\Options.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
diff --git a/mcs/class/Mono.Posix/Mono.Posix.csproj b/mcs/class/Mono.Posix/Mono.Posix.csproj
index 3a6b1fd6b95..d57279d23e2 100644
--- a/mcs/class/Mono.Posix/Mono.Posix.csproj
+++ b/mcs/class/Mono.Posix/Mono.Posix.csproj
@@ -57,64 +57,64 @@
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Posix\Catalog.cs" />
-    <Compile Include=".\Mono.Posix\PeerCred.cs" />
-    <Compile Include=".\Mono.Posix\Syscall.cs" />
-    <Compile Include=".\Mono.Posix\UnixEndPoint.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSink.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSinkProvider.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryCore.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSink.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSinkProvider.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixChannel.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientChannel.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSink.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixClientTransportSinkProvider.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixConnectionPool.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixMessageIO.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerChannel.cs" />
-    <Compile Include=".\Mono.Remoting.Channels.Unix\UnixServerTransportSink.cs" />
-    <Compile Include=".\Mono.Unix.Native\CdeclFunction.cs" />
-    <Compile Include=".\Mono.Unix.Native\FileNameMarshaler.cs" />
-    <Compile Include=".\Mono.Unix.Native\MapAttribute.cs" />
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.cs" />
-    <Compile Include=".\Mono.Unix.Native\NativeConvert.generated.cs" />
-    <Compile Include=".\Mono.Unix.Native\RealTimeSignum.cs" />
-    <Compile Include=".\Mono.Unix.Native\Stdlib.cs" />
-    <Compile Include=".\Mono.Unix.Native\Syscall.cs" />
-    <Compile Include=".\Mono.Unix.Native\TypeAttributes.cs" />
-    <Compile Include=".\Mono.Unix\AbstractUnixEndPoint.cs" />
-    <Compile Include=".\Mono.Unix\Catalog.cs" />
-    <Compile Include=".\Mono.Unix\FileAccessPattern.cs" />
-    <Compile Include=".\Mono.Unix\FileAccessPermissions.cs" />
-    <Compile Include=".\Mono.Unix\FileHandleOperations.cs" />
-    <Compile Include=".\Mono.Unix\FileSpecialAttributes.cs" />
-    <Compile Include=".\Mono.Unix\FileTypes.cs" />
-    <Compile Include=".\Mono.Unix\PeerCred.cs" />
-    <Compile Include=".\Mono.Unix\StdioFileStream.cs" />
-    <Compile Include=".\Mono.Unix\UnixClient.cs" />
-    <Compile Include=".\Mono.Unix\UnixDirectoryInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixDriveInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixEncoding.cs" />
-    <Compile Include=".\Mono.Unix\UnixEndPoint.cs" />
-    <Compile Include=".\Mono.Unix\UnixEnvironment.cs" />
-    <Compile Include=".\Mono.Unix\UnixFileInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixFileSystemInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixGroupInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixIOException.cs" />
-    <Compile Include=".\Mono.Unix\UnixListener.cs" />
-    <Compile Include=".\Mono.Unix\UnixMarshal.cs" />
-    <Compile Include=".\Mono.Unix\UnixPath.cs" />
-    <Compile Include=".\Mono.Unix\UnixPipes.cs" />
-    <Compile Include=".\Mono.Unix\UnixProcess.cs" />
-    <Compile Include=".\Mono.Unix\UnixSignal.cs" />
-    <Compile Include=".\Mono.Unix\UnixStream.cs" />
-    <Compile Include=".\Mono.Unix\UnixSymbolicLinkInfo.cs" />
-    <Compile Include=".\Mono.Unix\UnixUserInfo.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Mono.Posix\Catalog.cs" />
+    <Compile Include="Mono.Posix\PeerCred.cs" />
+    <Compile Include="Mono.Posix\Syscall.cs" />
+    <Compile Include="Mono.Posix\UnixEndPoint.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSink.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixBinaryClientFormatterSinkProvider.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixBinaryCore.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSink.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixBinaryServerFormatterSinkProvider.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixChannel.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixClientChannel.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixClientTransportSink.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixClientTransportSinkProvider.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixConnectionPool.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixMessageIO.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixServerChannel.cs" />
+    <Compile Include="Mono.Remoting.Channels.Unix\UnixServerTransportSink.cs" />
+    <Compile Include="Mono.Unix.Native\CdeclFunction.cs" />
+    <Compile Include="Mono.Unix.Native\FileNameMarshaler.cs" />
+    <Compile Include="Mono.Unix.Native\MapAttribute.cs" />
+    <Compile Include="Mono.Unix.Native\NativeConvert.cs" />
+    <Compile Include="Mono.Unix.Native\NativeConvert.generated.cs" />
+    <Compile Include="Mono.Unix.Native\RealTimeSignum.cs" />
+    <Compile Include="Mono.Unix.Native\Stdlib.cs" />
+    <Compile Include="Mono.Unix.Native\Syscall.cs" />
+    <Compile Include="Mono.Unix.Native\TypeAttributes.cs" />
+    <Compile Include="Mono.Unix\AbstractUnixEndPoint.cs" />
+    <Compile Include="Mono.Unix\Catalog.cs" />
+    <Compile Include="Mono.Unix\FileAccessPattern.cs" />
+    <Compile Include="Mono.Unix\FileAccessPermissions.cs" />
+    <Compile Include="Mono.Unix\FileHandleOperations.cs" />
+    <Compile Include="Mono.Unix\FileSpecialAttributes.cs" />
+    <Compile Include="Mono.Unix\FileTypes.cs" />
+    <Compile Include="Mono.Unix\PeerCred.cs" />
+    <Compile Include="Mono.Unix\StdioFileStream.cs" />
+    <Compile Include="Mono.Unix\UnixClient.cs" />
+    <Compile Include="Mono.Unix\UnixDirectoryInfo.cs" />
+    <Compile Include="Mono.Unix\UnixDriveInfo.cs" />
+    <Compile Include="Mono.Unix\UnixEncoding.cs" />
+    <Compile Include="Mono.Unix\UnixEndPoint.cs" />
+    <Compile Include="Mono.Unix\UnixEnvironment.cs" />
+    <Compile Include="Mono.Unix\UnixFileInfo.cs" />
+    <Compile Include="Mono.Unix\UnixFileSystemInfo.cs" />
+    <Compile Include="Mono.Unix\UnixGroupInfo.cs" />
+    <Compile Include="Mono.Unix\UnixIOException.cs" />
+    <Compile Include="Mono.Unix\UnixListener.cs" />
+    <Compile Include="Mono.Unix\UnixMarshal.cs" />
+    <Compile Include="Mono.Unix\UnixPath.cs" />
+    <Compile Include="Mono.Unix\UnixPipes.cs" />
+    <Compile Include="Mono.Unix\UnixProcess.cs" />
+    <Compile Include="Mono.Unix\UnixSignal.cs" />
+    <Compile Include="Mono.Unix\UnixStream.cs" />
+    <Compile Include="Mono.Unix\UnixSymbolicLinkInfo.cs" />
+    <Compile Include="Mono.Unix\UnixUserInfo.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
-    <Compile Include=".\Mono.Unix.Android\AndroidUtils.cs" />
+    <Compile Include="Mono.Unix.Android\AndroidUtils.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
diff --git a/mcs/class/Mono.Security/Mono.Security.csproj b/mcs/class/Mono.Security/Mono.Security.csproj
index 3e7bd67307a..a5c61c747d1 100644
--- a/mcs/class/Mono.Security/Mono.Security.csproj
+++ b/mcs/class/Mono.Security/Mono.Security.csproj
@@ -113,155 +113,155 @@
     <Compile Include="..\..\build\common\AssemblyRef.cs" />
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Mono.Math.Prime.Generator\NextPrimeFinder.cs" />
-    <Compile Include=".\Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />
-    <Compile Include=".\Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />
-    <Compile Include=".\Mono.Math.Prime\ConfidenceFactor.cs" />
-    <Compile Include=".\Mono.Math.Prime\PrimalityTests.cs" />
-    <Compile Include=".\Mono.Math\BigInteger.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeBase.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\AuthenticodeFormatter.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\PrivateKey.cs" />
-    <Compile Include=".\Mono.Security.Authenticode\SoftwarePublisherCertificate.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\ARC4Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\CryptoConvert.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\CryptoTools.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DHKeyGeneration.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DHParameters.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellman.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\DiffieHellmanManaged.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\KeyPairPersistence.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD2.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD2Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD4.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD4Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\MD5SHA1.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\PKCS1.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\PKCS8.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\RC4.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\RSAManaged.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\SHA224.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\SHA224Managed.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\SymmetricTransform.cs" />
-    <Compile Include=".\Mono.Security.Cryptography\TlsHMAC.cs" />
-    <Compile Include=".\Mono.Security.Interface\Alert.cs" />
-    <Compile Include=".\Mono.Security.Interface\CertificateValidationHelper.cs" />
-    <Compile Include=".\Mono.Security.Interface\CipherAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Interface\CipherSuiteCode.cs" />
-    <Compile Include=".\Mono.Security.Interface\ExchangeAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Interface\HashAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Interface\IMonoAuthenticationOptions.cs" />
-    <Compile Include=".\Mono.Security.Interface\IMonoSslStream.cs" />
-    <Compile Include=".\Mono.Security.Interface\MonoTlsConnectionInfo.cs" />
-    <Compile Include=".\Mono.Security.Interface\MonoTlsProvider.cs" />
-    <Compile Include=".\Mono.Security.Interface\MonoTlsProviderFactory.cs" />
-    <Compile Include=".\Mono.Security.Interface\MonoTlsSettings.cs" />
-    <Compile Include=".\Mono.Security.Interface\TlsException.cs" />
-    <Compile Include=".\Mono.Security.Interface\TlsProtocolCode.cs" />
-    <Compile Include=".\Mono.Security.Interface\TlsProtocols.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\ChallengeResponse2.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\MessageBase.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmAuthLevel.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\NtlmSettings.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type1Message.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type2Message.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Ntlm\Type3Message.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\Alert.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuite.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientContext.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ClientSessionCache.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ContentType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\Context.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\DebugHelper.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />
-    <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\SecurityCompressionType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityParameters.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerContext.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslCipherSuite.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslClientStream.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslServerStream.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\SslStreamBase.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsClientSettings.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsException.cs" />
-    <Compile Include=".\Mono.Security.Protocol.Tls\TlsServerSettings.cs" />
-    <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\ExtendedKeyUsageExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\GeneralNames.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyAttributesExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\KeyUsageExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\NetscapeCertTypeExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\PrivateKeyUsagePeriodExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectAltNameExtension.cs" />
-    <Compile Include=".\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />
-    <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\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" />
-    <Compile Include=".\Mono.Security.X509\X509StoreManager.cs" />
-    <Compile Include=".\Mono.Security.X509\X509Stores.cs" />
-    <Compile Include=".\Mono.Security.X509\X520Attributes.cs" />
-    <Compile Include=".\Mono.Security\ASN1.cs" />
-    <Compile Include=".\Mono.Security\ASN1Convert.cs" />
-    <Compile Include=".\Mono.Security\BitConverterLE.cs" />
-    <Compile Include=".\Mono.Security\PKCS7.cs" />
-    <Compile Include=".\Mono.Security\StrongName.cs" />
-    <Compile Include=".\Mono.Xml\MiniParser.cs" />
-    <Compile Include=".\Mono.Xml\SecurityParser.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Mono.Math.Prime.Generator\NextPrimeFinder.cs" />
+    <Compile Include="Mono.Math.Prime.Generator\PrimeGeneratorBase.cs" />
+    <Compile Include="Mono.Math.Prime.Generator\SequentialSearchPrimeGeneratorBase.cs" />
+    <Compile Include="Mono.Math.Prime\ConfidenceFactor.cs" />
+    <Compile Include="Mono.Math.Prime\PrimalityTests.cs" />
+    <Compile Include="Mono.Math\BigInteger.cs" />
+    <Compile Include="Mono.Security.Authenticode\AuthenticodeBase.cs" />
+    <Compile Include="Mono.Security.Authenticode\AuthenticodeDeformatter.cs" />
+    <Compile Include="Mono.Security.Authenticode\AuthenticodeFormatter.cs" />
+    <Compile Include="Mono.Security.Authenticode\PrivateKey.cs" />
+    <Compile Include="Mono.Security.Authenticode\SoftwarePublisherCertificate.cs" />
+    <Compile Include="Mono.Security.Cryptography\ARC4Managed.cs" />
+    <Compile Include="Mono.Security.Cryptography\CryptoConvert.cs" />
+    <Compile Include="Mono.Security.Cryptography\CryptoTools.cs" />
+    <Compile Include="Mono.Security.Cryptography\DHKeyGeneration.cs" />
+    <Compile Include="Mono.Security.Cryptography\DHParameters.cs" />
+    <Compile Include="Mono.Security.Cryptography\DiffieHellman.cs" />
+    <Compile Include="Mono.Security.Cryptography\DiffieHellmanManaged.cs" />
+    <Compile Include="Mono.Security.Cryptography\KeyPairPersistence.cs" />
+    <Compile Include="Mono.Security.Cryptography\MD2.cs" />
+    <Compile Include="Mono.Security.Cryptography\MD2Managed.cs" />
+    <Compile Include="Mono.Security.Cryptography\MD4.cs" />
+    <Compile Include="Mono.Security.Cryptography\MD4Managed.cs" />
+    <Compile Include="Mono.Security.Cryptography\MD5SHA1.cs" />
+    <Compile Include="Mono.Security.Cryptography\PKCS1.cs" />
+    <Compile Include="Mono.Security.Cryptography\PKCS8.cs" />
+    <Compile Include="Mono.Security.Cryptography\RC4.cs" />
+    <Compile Include="Mono.Security.Cryptography\RSAManaged.cs" />
+    <Compile Include="Mono.Security.Cryptography\SHA224.cs" />
+    <Compile Include="Mono.Security.Cryptography\SHA224Managed.cs" />
+    <Compile Include="Mono.Security.Cryptography\SymmetricTransform.cs" />
+    <Compile Include="Mono.Security.Cryptography\TlsHMAC.cs" />
+    <Compile Include="Mono.Security.Interface\Alert.cs" />
+    <Compile Include="Mono.Security.Interface\CertificateValidationHelper.cs" />
+    <Compile Include="Mono.Security.Interface\CipherAlgorithmType.cs" />
+    <Compile Include="Mono.Security.Interface\CipherSuiteCode.cs" />
+    <Compile Include="Mono.Security.Interface\ExchangeAlgorithmType.cs" />
+    <Compile Include="Mono.Security.Interface\HashAlgorithmType.cs" />
+    <Compile Include="Mono.Security.Interface\IMonoAuthenticationOptions.cs" />
+    <Compile Include="Mono.Security.Interface\IMonoSslStream.cs" />
+    <Compile Include="Mono.Security.Interface\MonoTlsConnectionInfo.cs" />
+    <Compile Include="Mono.Security.Interface\MonoTlsProvider.cs" />
+    <Compile Include="Mono.Security.Interface\MonoTlsProviderFactory.cs" />
+    <Compile Include="Mono.Security.Interface\MonoTlsSettings.cs" />
+    <Compile Include="Mono.Security.Interface\TlsException.cs" />
+    <Compile Include="Mono.Security.Interface\TlsProtocolCode.cs" />
+    <Compile Include="Mono.Security.Interface\TlsProtocols.cs" />
+    <Compile Include="Mono.Security.Protocol.Ntlm\ChallengeResponse.cs" />
+    <Compile Include="Mono.Security.Protocol.Ntlm\ChallengeResponse2.cs" />
+    <Compile Include="Mono.Security.Protocol.Ntlm\MessageBase.cs" />
+    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmAuthLevel.cs" />
+    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmFlags.cs" />
+    <Compile Include="Mono.Security.Protocol.Ntlm\NtlmSettings.cs" />
+    <Compile Include="Mono.Security.Protocol.Ntlm\Type1Message.cs" />
+    <Compile Include="Mono.Security.Protocol.Ntlm\Type2Message.cs" />
+    <Compile Include="Mono.Security.Protocol.Ntlm\Type3Message.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificate.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientCertificateVerify.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientFinished.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientHello.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsClientKeyExchange.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificate.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerCertificateRequest.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerFinished.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHello.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerHelloDone.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Client\TlsServerKeyExchange.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificate.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientCertificateVerify.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientFinished.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientHello.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsClientKeyExchange.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificate.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerCertificateRequest.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerFinished.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHello.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerHelloDone.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake.Server\TlsServerKeyExchange.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake\ClientCertificateType.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeMessage.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls.Handshake\HandshakeType.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\Alert.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\CipherAlgorithmType.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\CipherSuite.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteCollection.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\CipherSuiteFactory.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\ClientContext.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\ClientRecordProtocol.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\ClientSessionCache.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\ContentType.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\Context.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\DebugHelper.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\ExchangeAlgorithmType.cs" />
+    <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\SecurityCompressionType.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\SecurityParameters.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\SecurityProtocolType.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\ServerContext.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\ServerRecordProtocol.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\SslCipherSuite.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\SslClientStream.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\SslHandshakeHash.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\SslServerStream.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\SslStreamBase.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\TlsCipherSuite.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\TlsClientSettings.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\TlsException.cs" />
+    <Compile Include="Mono.Security.Protocol.Tls\TlsServerSettings.cs" />
+    <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\ExtendedKeyUsageExtension.cs" />
+    <Compile Include="Mono.Security.X509.Extensions\GeneralNames.cs" />
+    <Compile Include="Mono.Security.X509.Extensions\KeyAttributesExtension.cs" />
+    <Compile Include="Mono.Security.X509.Extensions\KeyUsageExtension.cs" />
+    <Compile Include="Mono.Security.X509.Extensions\NetscapeCertTypeExtension.cs" />
+    <Compile Include="Mono.Security.X509.Extensions\PrivateKeyUsagePeriodExtension.cs" />
+    <Compile Include="Mono.Security.X509.Extensions\SubjectAltNameExtension.cs" />
+    <Compile Include="Mono.Security.X509.Extensions\SubjectKeyIdentifierExtension.cs" />
+    <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\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" />
+    <Compile Include="Mono.Security.X509\X509StoreManager.cs" />
+    <Compile Include="Mono.Security.X509\X509Stores.cs" />
+    <Compile Include="Mono.Security.X509\X520Attributes.cs" />
+    <Compile Include="Mono.Security\ASN1.cs" />
+    <Compile Include="Mono.Security\ASN1Convert.cs" />
+    <Compile Include="Mono.Security\BitConverterLE.cs" />
+    <Compile Include="Mono.Security\PKCS7.cs" />
+    <Compile Include="Mono.Security\StrongName.cs" />
+    <Compile Include="Mono.Xml\MiniParser.cs" />
+    <Compile Include="Mono.Xml\SecurityParser.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
     <Compile Include="..\corlib\CommonCrypto\CommonCrypto.cs" />
diff --git a/mcs/class/PEAPI/PEAPI.csproj b/mcs/class/PEAPI/PEAPI.csproj
index 61815b24c3e..023a2417945 100644
--- a/mcs/class/PEAPI/PEAPI.csproj
+++ b/mcs/class/PEAPI/PEAPI.csproj
@@ -47,7 +47,7 @@
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <Compile Include="..\..\build\common\Consts.cs" />
     <Compile Include="..\..\build\common\Locale.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
     <Compile Include="Code.cs" />
     <Compile Include="Metadata.cs" />
     <Compile Include="PEAPI.cs" />
diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
index 4c65acb0f13..8966256417f 100644
--- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
+++ b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
@@ -55,121 +55,121 @@
     <Compile Include="..\util\Semaphore.cs" />
     <Compile Include="..\util\SharedQueue.cs" />
     <Compile Include="..\util\XmlUtil.cs" />
-    <Compile Include=".\api\AmqpTcpEndpoint.cs" />
-    <Compile Include=".\api\AmqpTimestamp.cs" />
-    <Compile Include=".\api\AmqpVersion.cs" />
-    <Compile Include=".\api\BinaryTableValue.cs" />
-    <Compile Include=".\api\ConnectionFactory.cs" />
-    <Compile Include=".\api\DefaultBasicConsumer.cs" />
-    <Compile Include=".\api\ExchangeType.cs" />
-    <Compile Include=".\api\IBasicConsumer.cs" />
-    <Compile Include=".\api\IBasicProperties.cs" />
-    <Compile Include=".\api\IConnection.cs" />
-    <Compile Include=".\api\IContentHeader.cs" />
-    <Compile Include=".\api\IFileProperties.cs" />
-    <Compile Include=".\api\IMethod.cs" />
-    <Compile Include=".\api\IModel.cs" />
-    <Compile Include=".\api\IProtocol.cs" />
-    <Compile Include=".\api\IStreamProperties.cs" />
-    <Compile Include=".\api\Protocols.cs" />
-    <Compile Include=".\api\PublicationAddress.cs" />
-    <Compile Include=".\api\QueueingBasicConsumer.cs" />
-    <Compile Include=".\api\ShutdownEventArgs.cs" />
-    <Compile Include=".\api\ShutdownInitiator.cs" />
-    <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" />
-    <Compile Include=".\content\BytesMessageReader.cs" />
-    <Compile Include=".\content\BytesWireFormatting.cs" />
-    <Compile Include=".\content\IBytesMessageBuilder.cs" />
-    <Compile Include=".\content\IBytesMessageReader.cs" />
-    <Compile Include=".\content\IMapMessageBuilder.cs" />
-    <Compile Include=".\content\IMapMessageReader.cs" />
-    <Compile Include=".\content\IMessageBuilder.cs" />
-    <Compile Include=".\content\IMessageReader.cs" />
-    <Compile Include=".\content\IStreamMessageBuilder.cs" />
-    <Compile Include=".\content\IStreamMessageReader.cs" />
-    <Compile Include=".\content\MapMessageBuilder.cs" />
-    <Compile Include=".\content\MapMessageReader.cs" />
-    <Compile Include=".\content\MapWireFormatting.cs" />
-    <Compile Include=".\content\PrimitiveParser.cs" />
-    <Compile Include=".\content\StreamMessageBuilder.cs" />
-    <Compile Include=".\content\StreamMessageReader.cs" />
-    <Compile Include=".\content\StreamWireFormatting.cs" />
-    <Compile Include=".\events\BasicDeliverEventArgs.cs" />
-    <Compile Include=".\events\BasicDeliverEventHandler.cs" />
-    <Compile Include=".\events\BasicReturnEventArgs.cs" />
-    <Compile Include=".\events\BasicReturnEventHandler.cs" />
-    <Compile Include=".\events\CallbackExceptionEventArgs.cs" />
-    <Compile Include=".\events\CallbackExceptionEventHandler.cs" />
-    <Compile Include=".\events\ConnectionShutdownEventHandler.cs" />
-    <Compile Include=".\events\ConsumerEventArgs.cs" />
-    <Compile Include=".\events\ConsumerEventHandler.cs" />
-    <Compile Include=".\events\ConsumerShutdownEventHandler.cs" />
-    <Compile Include=".\events\EventingBasicConsumer.cs" />
-    <Compile Include=".\events\ModelShutdownEventHandler.cs" />
-    <Compile Include=".\exceptions\AlreadyClosedException.cs" />
-    <Compile Include=".\exceptions\BrokerUnreachableException.cs" />
-    <Compile Include=".\exceptions\ChannelAllocationException.cs" />
-    <Compile Include=".\exceptions\OperationInterruptedException.cs" />
-    <Compile Include=".\exceptions\PacketNotRecognizedException.cs" />
-    <Compile Include=".\exceptions\PossibleAuthenticationFailureException.cs" />
-    <Compile Include=".\exceptions\ProtocolVersionMismatchException.cs" />
-    <Compile Include=".\exceptions\UnexpectedMethodException.cs" />
-    <Compile Include=".\exceptions\UnsupportedMethodException.cs" />
-    <Compile Include=".\exceptions\UnsupportedMethodFieldException.cs" />
-    <Compile Include=".\exceptions\WireFormattingException.cs" />
-    <Compile Include=".\impl\AbstractProtocolBase.cs" />
-    <Compile Include=".\impl\BasicProperties.cs" />
-    <Compile Include=".\impl\ChannelErrorException.cs" />
-    <Compile Include=".\impl\Command.cs" />
-    <Compile Include=".\impl\CommandAssembler.cs" />
-    <Compile Include=".\impl\ConnectionBase.cs" />
-    <Compile Include=".\impl\ConnectionStartDetails.cs" />
-    <Compile Include=".\impl\ContentHeaderBase.cs" />
-    <Compile Include=".\impl\ContentHeaderPropertyReader.cs" />
-    <Compile Include=".\impl\ContentHeaderPropertyWriter.cs" />
-    <Compile Include=".\impl\FileProperties.cs" />
-    <Compile Include=".\impl\Frame.cs" />
-    <Compile Include=".\impl\HardProtocolException.cs" />
-    <Compile Include=".\impl\IFrameHandler.cs" />
-    <Compile Include=".\impl\IRpcContinuation.cs" />
-    <Compile Include=".\impl\ISession.cs" />
-    <Compile Include=".\impl\MainSession.cs" />
-    <Compile Include=".\impl\MalformedFrameException.cs" />
-    <Compile Include=".\impl\MethodArgumentReader.cs" />
-    <Compile Include=".\impl\MethodArgumentWriter.cs" />
-    <Compile Include=".\impl\MethodBase.cs" />
-    <Compile Include=".\impl\ModelBase.cs" />
-    <Compile Include=".\impl\ProtocolException.cs" />
-    <Compile Include=".\impl\QuiescingSession.cs" />
-    <Compile Include=".\impl\RedirectException.cs" />
-    <Compile Include=".\impl\RpcContinuationQueue.cs" />
-    <Compile Include=".\impl\Session.cs" />
-    <Compile Include=".\impl\SessionBase.cs" />
-    <Compile Include=".\impl\SessionManager.cs" />
-    <Compile Include=".\impl\ShutdownContinuation.cs" />
-    <Compile Include=".\impl\SimpleBlockingRpcContinuation.cs" />
-    <Compile Include=".\impl\SocketFrameHandler_0_9.cs" />
-    <Compile Include=".\impl\SoftProtocolException.cs" />
-    <Compile Include=".\impl\StreamProperties.cs" />
-    <Compile Include=".\impl\SyntaxError.cs" />
-    <Compile Include=".\impl\UnexpectedFrameException.cs" />
-    <Compile Include=".\impl\UnknownClassOrMethodException.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="api\AmqpTcpEndpoint.cs" />
+    <Compile Include="api\AmqpTimestamp.cs" />
+    <Compile Include="api\AmqpVersion.cs" />
+    <Compile Include="api\BinaryTableValue.cs" />
+    <Compile Include="api\ConnectionFactory.cs" />
+    <Compile Include="api\DefaultBasicConsumer.cs" />
+    <Compile Include="api\ExchangeType.cs" />
+    <Compile Include="api\IBasicConsumer.cs" />
+    <Compile Include="api\IBasicProperties.cs" />
+    <Compile Include="api\IConnection.cs" />
+    <Compile Include="api\IContentHeader.cs" />
+    <Compile Include="api\IFileProperties.cs" />
+    <Compile Include="api\IMethod.cs" />
+    <Compile Include="api\IModel.cs" />
+    <Compile Include="api\IProtocol.cs" />
+    <Compile Include="api\IStreamProperties.cs" />
+    <Compile Include="api\Protocols.cs" />
+    <Compile Include="api\PublicationAddress.cs" />
+    <Compile Include="api\QueueingBasicConsumer.cs" />
+    <Compile Include="api\ShutdownEventArgs.cs" />
+    <Compile Include="api\ShutdownInitiator.cs" />
+    <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" />
+    <Compile Include="content\BytesMessageReader.cs" />
+    <Compile Include="content\BytesWireFormatting.cs" />
+    <Compile Include="content\IBytesMessageBuilder.cs" />
+    <Compile Include="content\IBytesMessageReader.cs" />
+    <Compile Include="content\IMapMessageBuilder.cs" />
+    <Compile Include="content\IMapMessageReader.cs" />
+    <Compile Include="content\IMessageBuilder.cs" />
+    <Compile Include="content\IMessageReader.cs" />
+    <Compile Include="content\IStreamMessageBuilder.cs" />
+    <Compile Include="content\IStreamMessageReader.cs" />
+    <Compile Include="content\MapMessageBuilder.cs" />
+    <Compile Include="content\MapMessageReader.cs" />
+    <Compile Include="content\MapWireFormatting.cs" />
+    <Compile Include="content\PrimitiveParser.cs" />
+    <Compile Include="content\StreamMessageBuilder.cs" />
+    <Compile Include="content\StreamMessageReader.cs" />
+    <Compile Include="content\StreamWireFormatting.cs" />
+    <Compile Include="events\BasicDeliverEventArgs.cs" />
+    <Compile Include="events\BasicDeliverEventHandler.cs" />
+    <Compile Include="events\BasicReturnEventArgs.cs" />
+    <Compile Include="events\BasicReturnEventHandler.cs" />
+    <Compile Include="events\CallbackExceptionEventArgs.cs" />
+    <Compile Include="events\CallbackExceptionEventHandler.cs" />
+    <Compile Include="events\ConnectionShutdownEventHandler.cs" />
+    <Compile Include="events\ConsumerEventArgs.cs" />
+    <Compile Include="events\ConsumerEventHandler.cs" />
+    <Compile Include="events\ConsumerShutdownEventHandler.cs" />
+    <Compile Include="events\EventingBasicConsumer.cs" />
+    <Compile Include="events\ModelShutdownEventHandler.cs" />
+    <Compile Include="exceptions\AlreadyClosedException.cs" />
+    <Compile Include="exceptions\BrokerUnreachableException.cs" />
+    <Compile Include="exceptions\ChannelAllocationException.cs" />
+    <Compile Include="exceptions\OperationInterruptedException.cs" />
+    <Compile Include="exceptions\PacketNotRecognizedException.cs" />
+    <Compile Include="exceptions\PossibleAuthenticationFailureException.cs" />
+    <Compile Include="exceptions\ProtocolVersionMismatchException.cs" />
+    <Compile Include="exceptions\UnexpectedMethodException.cs" />
+    <Compile Include="exceptions\UnsupportedMethodException.cs" />
+    <Compile Include="exceptions\UnsupportedMethodFieldException.cs" />
+    <Compile Include="exceptions\WireFormattingException.cs" />
+    <Compile Include="impl\AbstractProtocolBase.cs" />
+    <Compile Include="impl\BasicProperties.cs" />
+    <Compile Include="impl\ChannelErrorException.cs" />
+    <Compile Include="impl\Command.cs" />
+    <Compile Include="impl\CommandAssembler.cs" />
+    <Compile Include="impl\ConnectionBase.cs" />
+    <Compile Include="impl\ConnectionStartDetails.cs" />
+    <Compile Include="impl\ContentHeaderBase.cs" />
+    <Compile Include="impl\ContentHeaderPropertyReader.cs" />
+    <Compile Include="impl\ContentHeaderPropertyWriter.cs" />
+    <Compile Include="impl\FileProperties.cs" />
+    <Compile Include="impl\Frame.cs" />
+    <Compile Include="impl\HardProtocolException.cs" />
+    <Compile Include="impl\IFrameHandler.cs" />
+    <Compile Include="impl\IRpcContinuation.cs" />
+    <Compile Include="impl\ISession.cs" />
+    <Compile Include="impl\MainSession.cs" />
+    <Compile Include="impl\MalformedFrameException.cs" />
+    <Compile Include="impl\MethodArgumentReader.cs" />
+    <Compile Include="impl\MethodArgumentWriter.cs" />
+    <Compile Include="impl\MethodBase.cs" />
+    <Compile Include="impl\ModelBase.cs" />
+    <Compile Include="impl\ProtocolException.cs" />
+    <Compile Include="impl\QuiescingSession.cs" />
+    <Compile Include="impl\RedirectException.cs" />
+    <Compile Include="impl\RpcContinuationQueue.cs" />
+    <Compile Include="impl\Session.cs" />
+    <Compile Include="impl\SessionBase.cs" />
+    <Compile Include="impl\SessionManager.cs" />
+    <Compile Include="impl\ShutdownContinuation.cs" />
+    <Compile Include="impl\SimpleBlockingRpcContinuation.cs" />
+    <Compile Include="impl\SocketFrameHandler_0_9.cs" />
+    <Compile Include="impl\SoftProtocolException.cs" />
+    <Compile Include="impl\StreamProperties.cs" />
+    <Compile Include="impl\SyntaxError.cs" />
+    <Compile Include="impl\UnexpectedFrameException.cs" />
+    <Compile Include="impl\UnknownClassOrMethodException.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" />
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 af15108fcae..771d992f437 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
@@ -105,121 +105,121 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Compile Include="..\..\build\common\Consts.cs" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\Client\Parameterized.System.Data.Services.Client.cs" />
-    <Compile Include=".\Client\System.Data.Services.Client.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\DataServiceExpressionVisitor.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\DataServiceQueryProvider.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\Evaluator.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionNormalizer.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionVisitor.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ExpressionWriter.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\FilterQueryOptionExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\InputBinder.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\InputReferenceExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\NavigationPropertySingletonExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\OrderByQueryOptionExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ParameterReplacerVisitor.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\PathBox.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionAnalyzer.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionQueryOptionExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ProjectionRewriter.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\QueryComponents.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\QueryOptionExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ReflectionUtil.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceBinder.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceExpressionType.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\ResourceSetExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\SkipQueryOptionExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\TakeQueryOptionExpression.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\TypeSystem.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\UriHelper.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ALinq\UriWriter.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ArraySet.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\AtomContentProperty.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\AtomDataKind.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\AtomEntry.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\AtomFeed.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\AtomMaterializer.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\AtomMaterializerLog.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\AtomParser.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\BaseAsyncResult.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\BatchStream.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\BatchStreamState.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingEntityInfo.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingGraph.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingObserver.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\BindingUtils.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceCollectionOfT.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceEntityAttribute.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\DataServiceSaveChangesEventArgs.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\EntityChangedParams.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\EntityCollectionChangedParams.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Binding\LoadCompletedEventArgs.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ChangesetResponse.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ClientConvert.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ClientType.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceClientException.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceContext.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceEntityAttribute.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceKeyAttribute.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceProtocolVersion.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQuery.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryContinuation.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryException.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceQueryOfT.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequest.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestArgs.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestException.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceRequestOfT.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceResponse.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\DataServiceStreamResponse.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Descriptor.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\EntityDescriptor.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\EntityPropertyMappingAttribute.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\EntityStates.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Epm\EpmSyndicationContentSerializer.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\Error.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\GetReadStreamResult.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\HasStreamAttribute.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\LinkDescriptor.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\MaterializeFromAtom.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\MediaEntryAttribute.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\MemberAssignmentAnalysis.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\MergeOption.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\MimeTypePropertyAttribute.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\OpenObject.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\OpenObjectAttribute.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\OperationResponse.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPath.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPathBuilder.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPathSegment.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPlan.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ProjectionPlanCompiler.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\QueryOperationResponseOfT.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\QueryResponse.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\QueryResult.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ReadingWritingEntityEventArgs.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\ReferenceEqualityComparer.cs" />
-    <Compile Include=".\Client\System\Data\Services\Client\SaveChangesOptions.cs" />
-    <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\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" />
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmSourcePathSegment.cs" />
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmSourceTree.cs" />
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmTargetPathSegment.cs" />
-    <Compile Include=".\Server\System\Data\Services\Epm\EpmTargetTree.cs" />
-    <Compile Include=".\Server\System\Data\Services\HttpProcessUtility.cs" />
-    <Compile Include=".\Server\System\Data\Services\Parsing\WebConvert.cs" />
-    <Compile Include=".\Server\System\Data\Services\Providers\EntityPropertyMappingInfo.cs" />
-    <Compile Include=".\Server\System\Data\Services\XmlConstants.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="Client\Parameterized.System.Data.Services.Client.cs" />
+    <Compile Include="Client\System.Data.Services.Client.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\DataServiceExpressionVisitor.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\DataServiceQueryProvider.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\Evaluator.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ExpressionNormalizer.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ExpressionVisitor.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ExpressionWriter.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\FilterQueryOptionExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\InputBinder.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\InputReferenceExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\NavigationPropertySingletonExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\OrderByQueryOptionExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ParameterReplacerVisitor.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\PathBox.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ProjectionAnalyzer.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ProjectionQueryOptionExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ProjectionRewriter.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\QueryComponents.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\QueryOptionExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ReflectionUtil.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ResourceBinder.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ResourceExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ResourceExpressionType.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\ResourceSetExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\SkipQueryOptionExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\TakeQueryOptionExpression.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\TypeSystem.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\UriHelper.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ALinq\UriWriter.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ArraySet.cs" />
+    <Compile Include="Client\System\Data\Services\Client\AtomContentProperty.cs" />
+    <Compile Include="Client\System\Data\Services\Client\AtomDataKind.cs" />
+    <Compile Include="Client\System\Data\Services\Client\AtomEntry.cs" />
+    <Compile Include="Client\System\Data\Services\Client\AtomFeed.cs" />
+    <Compile Include="Client\System\Data\Services\Client\AtomMaterializer.cs" />
+    <Compile Include="Client\System\Data\Services\Client\AtomMaterializerLog.cs" />
+    <Compile Include="Client\System\Data\Services\Client\AtomParser.cs" />
+    <Compile Include="Client\System\Data\Services\Client\BaseAsyncResult.cs" />
+    <Compile Include="Client\System\Data\Services\Client\BatchStream.cs" />
+    <Compile Include="Client\System\Data\Services\Client\BatchStreamState.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\BindingEntityInfo.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\BindingGraph.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\BindingObserver.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\BindingUtils.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\DataServiceCollectionOfT.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\DataServiceEntityAttribute.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\DataServiceSaveChangesEventArgs.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\EntityChangedParams.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\EntityCollectionChangedParams.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Binding\LoadCompletedEventArgs.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ChangesetResponse.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ClientConvert.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ClientType.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceClientException.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceContext.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceEntityAttribute.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceKeyAttribute.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceProtocolVersion.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceQuery.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceQueryContinuation.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceQueryException.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceQueryOfT.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceRequest.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceRequestArgs.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceRequestException.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceRequestOfT.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceResponse.cs" />
+    <Compile Include="Client\System\Data\Services\Client\DataServiceStreamResponse.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Descriptor.cs" />
+    <Compile Include="Client\System\Data\Services\Client\EntityDescriptor.cs" />
+    <Compile Include="Client\System\Data\Services\Client\EntityPropertyMappingAttribute.cs" />
+    <Compile Include="Client\System\Data\Services\Client\EntityStates.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Epm\EpmSyndicationContentSerializer.cs" />
+    <Compile Include="Client\System\Data\Services\Client\Error.cs" />
+    <Compile Include="Client\System\Data\Services\Client\GetReadStreamResult.cs" />
+    <Compile Include="Client\System\Data\Services\Client\HasStreamAttribute.cs" />
+    <Compile Include="Client\System\Data\Services\Client\LinkDescriptor.cs" />
+    <Compile Include="Client\System\Data\Services\Client\MaterializeFromAtom.cs" />
+    <Compile Include="Client\System\Data\Services\Client\MediaEntryAttribute.cs" />
+    <Compile Include="Client\System\Data\Services\Client\MemberAssignmentAnalysis.cs" />
+    <Compile Include="Client\System\Data\Services\Client\MergeOption.cs" />
+    <Compile Include="Client\System\Data\Services\Client\MimeTypePropertyAttribute.cs" />
+    <Compile Include="Client\System\Data\Services\Client\OpenObject.cs" />
+    <Compile Include="Client\System\Data\Services\Client\OpenObjectAttribute.cs" />
+    <Compile Include="Client\System\Data\Services\Client\OperationResponse.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ProjectionPath.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ProjectionPathBuilder.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ProjectionPathSegment.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ProjectionPlan.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ProjectionPlanCompiler.cs" />
+    <Compile Include="Client\System\Data\Services\Client\QueryOperationResponseOfT.cs" />
+    <Compile Include="Client\System\Data\Services\Client\QueryResponse.cs" />
+    <Compile Include="Client\System\Data\Services\Client\QueryResult.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ReadingWritingEntityEventArgs.cs" />
+    <Compile Include="Client\System\Data\Services\Client\ReferenceEqualityComparer.cs" />
+    <Compile Include="Client\System\Data\Services\Client\SaveChangesOptions.cs" />
+    <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\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" />
+    <Compile Include="Server\System\Data\Services\Epm\EpmSourcePathSegment.cs" />
+    <Compile Include="Server\System\Data\Services\Epm\EpmSourceTree.cs" />
+    <Compile Include="Server\System\Data\Services\Epm\EpmTargetPathSegment.cs" />
+    <Compile Include="Server\System\Data\Services\Epm\EpmTargetTree.cs" />
+    <Compile Include="Server\System\Data\Services\HttpProcessUtility.cs" />
+    <Compile Include="Server\System\Data\Services\Parsing\WebConvert.cs" />
+    <Compile Include="Server\System\Data\Services\Providers\EntityPropertyMappingInfo.cs" />
+    <Compile Include="Server\System\Data\Services\XmlConstants.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <ItemGroup>
diff --git a/mcs/class/System.Data.Services/System.Data.Services.csproj b/mcs/class/System.Data.Services/System.Data.Services.csproj
index 8f9aae53283..da6918f8a2f 100644
--- a/mcs/class/System.Data.Services/System.Data.Services.csproj
+++ b/mcs/class/System.Data.Services/System.Data.Services.csproj
@@ -48,7 +48,7 @@
     <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="Assembly\AssemblyInfo.cs" />
     <Compile Include="System.Data.Services.Internal\ExpandedWrapper`1.cs" />
     <Compile Include="System.Data.Services.Internal\ExpandedWrapper`10.cs" />
     <Compile Include="System.Data.Services.Internal\ExpandedWrapper`11.cs" />
diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj
index 9f6a5eff87c..1882c77fa5d 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj
+++ b/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj
@@ -49,144 +49,144 @@
     <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" />
-    <Compile Include=".\Assembly\AssemblyInfo.cs" />
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientFormsAuthenticationCredentials.cs" />
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientFormsAuthenticationMembershipProvider.cs" />
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientRoleProvider.cs" />
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientSettingsProvider.cs" />
-    <Compile Include=".\System.Web.ClientServices.Providers\ClientWindowsAuthenticationMembershipProvider.cs" />
-    <Compile Include=".\System.Web.ClientServices.Providers\IClientFormsAuthenticationCredentialsProvider.cs" />
-    <Compile Include=".\System.Web.ClientServices.Providers\SettingsSavedEventArgs.cs" />
-    <Compile Include=".\System.Web.ClientServices.Providers\UserValidatedEventArgs.cs" />
-    <Compile Include=".\System.Web.ClientServices\ClientFormsIdentity.cs" />
-    <Compile Include=".\System.Web.ClientServices\ClientRolePrincipal.cs" />
-    <Compile Include=".\System.Web.ClientServices\ConnectivityStatus.cs" />
-    <Compile Include=".\System.Web.Configuration\Converter.cs" />
-    <Compile Include=".\System.Web.Configuration\ConvertersCollection.cs" />
-    <Compile Include=".\System.Web.Configuration\ScriptingAuthenticationServiceSection.cs" />
-    <Compile Include=".\System.Web.Configuration\ScriptingJsonSerializationSection.cs" />
-    <Compile Include=".\System.Web.Configuration\ScriptingProfileServiceSection.cs" />
-    <Compile Include=".\System.Web.Configuration\ScriptingRoleServiceSection.cs" />
-    <Compile Include=".\System.Web.Configuration\ScriptingScriptResourceHandlerSection.cs" />
-    <Compile Include=".\System.Web.Configuration\ScriptingSectionGroup.cs" />
-    <Compile Include=".\System.Web.Configuration\ScriptingWebServicesSectionGroup.cs" />
-    <Compile Include=".\System.Web.Configuration\SystemWebExtensionsSectionGroup.cs" />
-    <Compile Include=".\System.Web.DynamicData\DynamicDataSourceOperation.cs" />
-    <Compile Include=".\System.Web.DynamicData\DynamicValidatorEventArgs.cs" />
-    <Compile Include=".\System.Web.DynamicData\IDynamicDataSource.cs" />
-    <Compile Include=".\System.Web.DynamicData\IDynamicValidatorException.cs" />
-    <Compile Include=".\System.Web.Handlers\ScriptModule.cs" />
-    <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\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" />
-    <Compile Include=".\System.Web.Script.Serialization\SimpleTypeResolver.cs" />
-    <Compile Include=".\System.Web.Script.Serialization\StringBuilderExtensions.cs" />
-    <Compile Include=".\System.Web.Script.Services\AuthenticationService.cs" />
-    <Compile Include=".\System.Web.Script.Services\ClientProxyHandler.cs" />
-    <Compile Include=".\System.Web.Script.Services\GenerateScriptTypeAttribute.cs" />
-    <Compile Include=".\System.Web.Script.Services\LogicalTypeInfo.cs" />
-    <Compile Include=".\System.Web.Script.Services\ProfileService.cs" />
-    <Compile Include=".\System.Web.Script.Services\ProxyGenerator.cs" />
-    <Compile Include=".\System.Web.Script.Services\ResponseFormat.cs" />
-    <Compile Include=".\System.Web.Script.Services\RestHandler.cs" />
-    <Compile Include=".\System.Web.Script.Services\ScriptHandlerFactory.cs" />
-    <Compile Include=".\System.Web.Script.Services\ScriptMethodAttribute.cs" />
-    <Compile Include=".\System.Web.Script.Services\ScriptServiceAttribute.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\DataPager.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerCommandEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerField.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\DataPagerFieldCollection.cs" />
-    <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\LinqDataSource.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceContextEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceDeleteEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceDisposeEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceInsertEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceSelectEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceStatusEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceUpdateEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceValidationException.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\LinqDataSourceView.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\ListView.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCancelEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\ListViewCancelMode.cs" />
-    <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\ListViewEditEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\ListViewInsertedEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\ListViewInsertEventArgs.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" />
-    <Compile Include=".\System.Web.UI.WebControls\ListViewPagedDataSource.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\ListViewSelectEventArgs.cs" />
-    <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\NextPreviousPagerField.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\NumericPagerField.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\PageEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\PagePropertiesChangingEventArgs.cs" />
-    <Compile Include=".\System.Web.UI.WebControls\TemplatePagerField.cs" />
-    <Compile Include=".\System.Web.UI\AsyncPostBackErrorEventArgs.cs" />
-    <Compile Include=".\System.Web.UI\AsyncPostBackTrigger.cs" />
-    <Compile Include=".\System.Web.UI\AuthenticationServiceManager.cs" />
-    <Compile Include=".\System.Web.UI\CompositeEntry.cs" />
-    <Compile Include=".\System.Web.UI\CompositeScriptReference.cs" />
-    <Compile Include=".\System.Web.UI\CompositeScriptReferenceEventArgs.cs" />
-    <Compile Include=".\System.Web.UI\ExtenderControl.cs" />
-    <Compile Include=".\System.Web.UI\IExtenderControl.cs" />
-    <Compile Include=".\System.Web.UI\IScriptControl.cs" />
-    <Compile Include=".\System.Web.UI\PostBackTrigger.cs" />
-    <Compile Include=".\System.Web.UI\ProfileServiceManager.cs" />
-    <Compile Include=".\System.Web.UI\RegisteredArrayDeclaration.cs" />
-    <Compile Include=".\System.Web.UI\RegisteredDisposeScript.cs" />
-    <Compile Include=".\System.Web.UI\RegisteredExpandoAttribute.cs" />
-    <Compile Include=".\System.Web.UI\RegisteredHiddenField.cs" />
-    <Compile Include=".\System.Web.UI\RegisteredScript.cs" />
-    <Compile Include=".\System.Web.UI\RegisteredScriptType.cs" />
-    <Compile Include=".\System.Web.UI\ScriptBehaviorDescriptor.cs" />
-    <Compile Include=".\System.Web.UI\ScriptComponentDescriptor.cs" />
-    <Compile Include=".\System.Web.UI\ScriptControl.cs" />
-    <Compile Include=".\System.Web.UI\ScriptControlDescriptor.cs" />
-    <Compile Include=".\System.Web.UI\ScriptDescriptor.cs" />
-    <Compile Include=".\System.Web.UI\ScriptManager.cs" />
-    <Compile Include=".\System.Web.UI\ScriptManagerProxy.cs" />
-    <Compile Include=".\System.Web.UI\ScriptMode.cs" />
-    <Compile Include=".\System.Web.UI\ScriptReference.cs" />
-    <Compile Include=".\System.Web.UI\ScriptReferenceBase.cs" />
-    <Compile Include=".\System.Web.UI\ScriptReferenceCollection.cs" />
-    <Compile Include=".\System.Web.UI\ScriptReferenceEventArgs.cs" />
-    <Compile Include=".\System.Web.UI\ScriptResourceAttribute.cs" />
-    <Compile Include=".\System.Web.UI\ServiceReference.cs" />
-    <Compile Include=".\System.Web.UI\ServiceReferenceCollection.cs" />
-    <Compile Include=".\System.Web.UI\TargetControlTypeAttribute.cs" />
-    <Compile Include=".\System.Web.UI\Timer.cs" />
-    <Compile Include=".\System.Web.UI\UpdatePanel.cs" />
-    <Compile Include=".\System.Web.UI\UpdatePanelControlTrigger.cs" />
-    <Compile Include=".\System.Web.UI\UpdatePanelRenderMode.cs" />
-    <Compile Include=".\System.Web.UI\UpdatePanelTrigger.cs" />
-    <Compile Include=".\System.Web.UI\UpdatePanelTriggerCollection.cs" />
-    <Compile Include=".\System.Web.UI\UpdatePanelUpdateMode.cs" />
-    <Compile Include=".\System.Web.UI\UpdateProgress.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="System.Web.ClientServices.Providers\ClientFormsAuthenticationCredentials.cs" />
+    <Compile Include="System.Web.ClientServices.Providers\ClientFormsAuthenticationMembershipProvider.cs" />
+    <Compile Include="System.Web.ClientServices.Providers\ClientRoleProvider.cs" />
+    <Compile Include="System.Web.ClientServices.Providers\ClientSettingsProvider.cs" />
+    <Compile Include="System.Web.ClientServices.Providers\ClientWindowsAuthenticationMembershipProvider.cs" />
+    <Compile Include="System.Web.ClientServices.Providers\IClientFormsAuthenticationCredentialsProvider.cs" />
+    <Compile Include="System.Web.ClientServices.Providers\SettingsSavedEventArgs.cs" />
+    <Compile Include="System.Web.ClientServices.Providers\UserValidatedEventArgs.cs" />
+    <Compile Include="System.Web.ClientServices\ClientFormsIdentity.cs" />
+    <Compile Include="System.Web.ClientServices\ClientRolePrincipal.cs" />
+    <Compile Include="System.Web.ClientServices\ConnectivityStatus.cs" />
+    <Compile Include="System.Web.Configuration\Converter.cs" />
+    <Compile Include="System.Web.Configuration\ConvertersCollection.cs" />
+    <Compile Include="System.Web.Configuration\ScriptingAuthenticationServiceSection.cs" />
+    <Compile Include="System.Web.Configuration\ScriptingJsonSerializationSection.cs" />
+    <Compile Include="System.Web.Configuration\ScriptingProfileServiceSection.cs" />
+    <Compile Include="System.Web.Configuration\ScriptingRoleServiceSection.cs" />
+    <Compile Include="System.Web.Configuration\ScriptingScriptResourceHandlerSection.cs" />
+    <Compile Include="System.Web.Configuration\ScriptingSectionGroup.cs" />
+    <Compile Include="System.Web.Configuration\ScriptingWebServicesSectionGroup.cs" />
+    <Compile Include="System.Web.Configuration\SystemWebExtensionsSectionGroup.cs" />
+    <Compile Include="System.Web.DynamicData\DynamicDataSourceOperation.cs" />
+    <Compile Include="System.Web.DynamicData\DynamicValidatorEventArgs.cs" />
+    <Compile Include="System.Web.DynamicData\IDynamicDataSource.cs" />
+    <Compile Include="System.Web.DynamicData\IDynamicValidatorException.cs" />
+    <Compile Include="System.Web.Handlers\ScriptModule.cs" />
+    <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\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" />
+    <Compile Include="System.Web.Script.Serialization\SimpleTypeResolver.cs" />
+    <Compile Include="System.Web.Script.Serialization\StringBuilderExtensions.cs" />
+    <Compile Include="System.Web.Script.Services\AuthenticationService.cs" />
+    <Compile Include="System.Web.Script.Services\ClientProxyHandler.cs" />
+    <Compile Include="System.Web.Script.Services\GenerateScriptTypeAttribute.cs" />
+    <Compile Include="System.Web.Script.Services\LogicalTypeInfo.cs" />
+    <Compile Include="System.Web.Script.Services\ProfileService.cs" />
+    <Compile Include="System.Web.Script.Services\ProxyGenerator.cs" />
+    <Compile Include="System.Web.Script.Services\ResponseFormat.cs" />
+    <Compile Include="System.Web.Script.Services\RestHandler.cs" />
+    <Compile Include="System.Web.Script.Services\ScriptHandlerFactory.cs" />
+    <Compile Include="System.Web.Script.Services\ScriptMethodAttribute.cs" />
+    <Compile Include="System.Web.Script.Services\ScriptServiceAttribute.cs" />
+    <Compile Include="System.Web.UI.WebControls\DataPager.cs" />
+    <Compile Include="System.Web.UI.WebControls\DataPagerCommandEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\DataPagerField.cs" />
+    <Compile Include="System.Web.UI.WebControls\DataPagerFieldCollection.cs" />
+    <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\LinqDataSource.cs" />
+    <Compile Include="System.Web.UI.WebControls\LinqDataSourceContextEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\LinqDataSourceDeleteEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\LinqDataSourceDisposeEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\LinqDataSourceInsertEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\LinqDataSourceSelectEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\LinqDataSourceStatusEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\LinqDataSourceUpdateEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\LinqDataSourceValidationException.cs" />
+    <Compile Include="System.Web.UI.WebControls\LinqDataSourceView.cs" />
+    <Compile Include="System.Web.UI.WebControls\ListView.cs" />
+    <Compile Include="System.Web.UI.WebControls\ListViewCancelEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\ListViewCancelMode.cs" />
+    <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\ListViewEditEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\ListViewInsertedEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\ListViewInsertEventArgs.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" />
+    <Compile Include="System.Web.UI.WebControls\ListViewPagedDataSource.cs" />
+    <Compile Include="System.Web.UI.WebControls\ListViewSelectEventArgs.cs" />
+    <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\NextPreviousPagerField.cs" />
+    <Compile Include="System.Web.UI.WebControls\NumericPagerField.cs" />
+    <Compile Include="System.Web.UI.WebControls\PageEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\PagePropertiesChangingEventArgs.cs" />
+    <Compile Include="System.Web.UI.WebControls\TemplatePagerField.cs" />
+    <Compile Include="System.Web.UI\AsyncPostBackErrorEventArgs.cs" />
+    <Compile Include="System.Web.UI\AsyncPostBackTrigger.cs" />
+    <Compile Include="System.Web.UI\AuthenticationServiceManager.cs" />
+    <Compile Include="System.Web.UI\CompositeEntry.cs" />
+    <Compile Include="System.Web.UI\CompositeScriptReference.cs" />
+    <Compile Include="System.Web.UI\CompositeScriptReferenceEventArgs.cs" />
+    <Compile Include="System.Web.UI\ExtenderControl.cs" />
+    <Compile Include="System.Web.UI\IExtenderControl.cs" />
+    <Compile Include="System.Web.UI\IScriptControl.cs" />
+    <Compile Include="System.Web.UI\PostBackTrigger.cs" />
+    <Compile Include="System.Web.UI\ProfileServiceManager.cs" />
+    <Compile Include="System.Web.UI\RegisteredArrayDeclaration.cs" />
+    <Compile Include="System.Web.UI\RegisteredDisposeScript.cs" />
+    <Compile Include="System.Web.UI\RegisteredExpandoAttribute.cs" />
+    <Compile Include="System.Web.UI\RegisteredHiddenField.cs" />
+    <Compile Include="System.Web.UI\RegisteredScript.cs" />
+    <Compile Include="System.Web.UI\RegisteredScriptType.cs" />
+    <Compile Include="System.Web.UI\ScriptBehaviorDescriptor.cs" />
+    <Compile Include="System.Web.UI\ScriptComponentDescriptor.cs" />
+    <Compile Include="System.Web.UI\ScriptControl.cs" />
+    <Compile Include="System.Web.UI\ScriptControlDescriptor.cs" />
+    <Compile Include="System.Web.UI\ScriptDescriptor.cs" />
+    <Compile Include="System.Web.UI\ScriptManager.cs" />
+    <Compile Include="System.Web.UI\ScriptManagerProxy.cs" />
+    <Compile Include="System.Web.UI\ScriptMode.cs" />
+    <Compile Include="System.Web.UI\ScriptReference.cs" />
+    <Compile Include="System.Web.UI\ScriptReferenceBase.cs" />
+    <Compile Include="System.Web.UI\ScriptReferenceCollection.cs" />
+    <Compile Include="System.Web.UI\ScriptReferenceEventArgs.cs" />
+    <Compile Include="System.Web.UI\ScriptResourceAttribute.cs" />
+    <Compile Include="System.Web.UI\ServiceReference.cs" />
+    <Compile Include="System.Web.UI\ServiceReferenceCollection.cs" />
+    <Compile Include="System.Web.UI\TargetControlTypeAttribute.cs" />
+    <Compile Include="System.Web.UI\Timer.cs" />
+    <Compile Include="System.Web.UI\UpdatePanel.cs" />
+    <Compile Include="System.Web.UI\UpdatePanelControlTrigger.cs" />
+    <Compile Include="System.Web.UI\UpdatePanelRenderMode.cs" />
+    <Compile Include="System.Web.UI\UpdatePanelTrigger.cs" />
+    <Compile Include="System.Web.UI\UpdatePanelTriggerCollection.cs" />
+    <Compile Include="System.Web.UI\UpdatePanelUpdateMode.cs" />
+    <Compile Include="System.Web.UI\UpdateProgress.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj
index b85152ed1f2..e202022bc73 100644
--- a/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj
+++ b/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj
@@ -46,347 +46,347 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- @COMMON_SOURCES@ -->
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
-    <Compile Include=".\GlobalAssemblyInfo.cs" />
-    <Compile Include=".\GlobalSuppressions.cs" />
-    <Compile Include=".\Mvc\AcceptVerbsAttribute.cs" />
-    <Compile Include=".\Mvc\ActionDescriptor.cs" />
-    <Compile Include=".\Mvc\ActionExecutedContext.cs" />
-    <Compile Include=".\Mvc\ActionExecutingContext.cs" />
-    <Compile Include=".\Mvc\ActionFilterAttribute.cs" />
-    <Compile Include=".\Mvc\ActionMethodDispatcher.cs" />
-    <Compile Include=".\Mvc\ActionMethodDispatcherCache.cs" />
-    <Compile Include=".\Mvc\ActionMethodSelector.cs" />
-    <Compile Include=".\Mvc\ActionMethodSelectorAttribute.cs" />
-    <Compile Include=".\Mvc\ActionNameAttribute.cs" />
-    <Compile Include=".\Mvc\ActionNameSelectorAttribute.cs" />
-    <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\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\Async\ActionDescriptorCreator.cs" />
-    <Compile Include=".\Mvc\Async\AsyncActionDescriptor.cs" />
-    <Compile Include=".\Mvc\Async\AsyncActionMethodSelector.cs" />
-    <Compile Include=".\Mvc\Async\AsyncControllerActionInvoker.cs" />
-    <Compile Include=".\Mvc\Async\AsyncManager.cs" />
-    <Compile Include=".\Mvc\Async\AsyncResultWrapper.cs" />
-    <Compile Include=".\Mvc\Async\AsyncUtil.cs" />
-    <Compile Include=".\Mvc\Async\AsyncVoid.cs" />
-    <Compile Include=".\Mvc\Async\BeginInvokeDelegate.cs" />
-    <Compile Include=".\Mvc\Async\EndInvokeDelegate.cs" />
-    <Compile Include=".\Mvc\Async\EndInvokeDelegate`1.cs" />
-    <Compile Include=".\Mvc\Async\IAsyncActionInvoker.cs" />
-    <Compile Include=".\Mvc\Async\IAsyncController.cs" />
-    <Compile Include=".\Mvc\Async\IAsyncManagerContainer.cs" />
-    <Compile Include=".\Mvc\Async\OperationCounter.cs" />
-    <Compile Include=".\Mvc\Async\ReflectedAsyncActionDescriptor.cs" />
-    <Compile Include=".\Mvc\Async\ReflectedAsyncControllerDescriptor.cs" />
-    <Compile Include=".\Mvc\Async\SimpleAsyncResult.cs" />
-    <Compile Include=".\Mvc\Async\SingleEntryGate.cs" />
-    <Compile Include=".\Mvc\Async\SynchronizationContextUtil.cs" />
-    <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" />
-    <Compile Include=".\Mvc\BuildManagerCompiledView.cs" />
-    <Compile Include=".\Mvc\BuildManagerViewEngine.cs" />
-    <Compile Include=".\Mvc\BuildManagerWrapper.cs" />
-    <Compile Include=".\Mvc\ByteArrayModelBinder.cs" />
-    <Compile Include=".\Mvc\ChildActionOnlyAttribute.cs" />
-    <Compile Include=".\Mvc\ChildActionValueProvider.cs" />
-    <Compile Include=".\Mvc\ChildActionValueProviderFactory.cs" />
-    <Compile Include=".\Mvc\ClientDataTypeModelValidatorProvider.cs" />
-    <Compile Include=".\Mvc\CompareAttribute.cs" />
-    <Compile Include=".\Mvc\ContentResult.cs" />
-    <Compile Include=".\Mvc\Controller.cs" />
-    <Compile Include=".\Mvc\ControllerActionInvoker.cs" />
-    <Compile Include=".\Mvc\ControllerBase.cs" />
-    <Compile Include=".\Mvc\ControllerBuilder.cs" />
-    <Compile Include=".\Mvc\ControllerContext.cs" />
-    <Compile Include=".\Mvc\ControllerDescriptor.cs" />
-    <Compile Include=".\Mvc\ControllerDescriptorCache.cs" />
-    <Compile Include=".\Mvc\ControllerInstanceFilterProvider.cs" />
-    <Compile Include=".\Mvc\ControllerTypeCache.cs" />
-    <Compile Include=".\Mvc\CustomModelBinderAttribute.cs" />
-    <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\DataErrorInfoModelValidatorProvider.cs" />
-    <Compile Include=".\Mvc\DataTypeUtil.cs" />
-    <Compile Include=".\Mvc\DefaultControllerFactory.cs" />
-    <Compile Include=".\Mvc\DefaultModelBinder.cs" />
-    <Compile Include=".\Mvc\DefaultViewLocationCache.cs" />
-    <Compile Include=".\Mvc\DependencyResolver.cs" />
-    <Compile Include=".\Mvc\DependencyResolverExtensions.cs" />
-    <Compile Include=".\Mvc\DescriptorUtil.cs" />
-    <Compile Include=".\Mvc\DictionaryHelpers.cs" />
-    <Compile Include=".\Mvc\DictionaryValueProvider`1.cs" />
-    <Compile Include=".\Mvc\DynamicViewDataDictionary.cs" />
-    <Compile Include=".\Mvc\EmptyModelMetadataProvider.cs" />
-    <Compile Include=".\Mvc\EmptyModelValidatorProvider.cs" />
-    <Compile Include=".\Mvc\EmptyResult.cs" />
-    <Compile Include=".\Mvc\Error.cs" />
-    <Compile Include=".\Mvc\ExceptionContext.cs" />
-    <Compile Include=".\Mvc\ExpressionHelper.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\BinaryExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\CachedExpressionCompiler.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\ConditionalExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\ConstantExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\DefaultExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\ExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\ExpressionFingerprintChain.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\FingerprintingExpressionVisitor.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\HashCodeCombiner.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\Hoisted`2.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\HoistingExpressionVisitor.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\IndexExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\LambdaExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\MemberExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\MethodCallExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\ParameterExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\TypeBinaryExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\ExpressionUtil\UnaryExpressionFingerprint.cs" />
-    <Compile Include=".\Mvc\FieldValidationMetadata.cs" />
-    <Compile Include=".\Mvc\FileContentResult.cs" />
-    <Compile Include=".\Mvc\FilePathResult.cs" />
-    <Compile Include=".\Mvc\FileResult.cs" />
-    <Compile Include=".\Mvc\FileStreamResult.cs" />
-    <Compile Include=".\Mvc\Filter.cs" />
-    <Compile Include=".\Mvc\FilterAttribute.cs" />
-    <Compile Include=".\Mvc\FilterAttributeFilterProvider.cs" />
-    <Compile Include=".\Mvc\FilterInfo.cs" />
-    <Compile Include=".\Mvc\FilterProviderCollection.cs" />
-    <Compile Include=".\Mvc\FilterProviders.cs" />
-    <Compile Include=".\Mvc\FilterScope.cs" />
-    <Compile Include=".\Mvc\FormCollection.cs" />
-    <Compile Include=".\Mvc\FormContext.cs" />
-    <Compile Include=".\Mvc\FormMethod.cs" />
-    <Compile Include=".\Mvc\FormValueProvider.cs" />
-    <Compile Include=".\Mvc\FormValueProviderFactory.cs" />
-    <Compile Include=".\Mvc\GlobalFilterCollection.cs" />
-    <Compile Include=".\Mvc\GlobalFilters.cs" />
-    <Compile Include=".\Mvc\HandleErrorAttribute.cs" />
-    <Compile Include=".\Mvc\HandleErrorInfo.cs" />
-    <Compile Include=".\Mvc\HiddenInputAttribute.cs" />
-    <Compile Include=".\Mvc\Html\ChildActionExtensions.cs" />
-    <Compile Include=".\Mvc\Html\DefaultDisplayTemplates.cs" />
-    <Compile Include=".\Mvc\Html\DefaultEditorTemplates.cs" />
-    <Compile Include=".\Mvc\Html\DisplayExtensions.cs" />
-    <Compile Include=".\Mvc\Html\DisplayTextExtensions.cs" />
-    <Compile Include=".\Mvc\Html\EditorExtensions.cs" />
-    <Compile Include=".\Mvc\Html\FormExtensions.cs" />
-    <Compile Include=".\Mvc\Html\InputExtensions.cs" />
-    <Compile Include=".\Mvc\Html\LabelExtensions.cs" />
-    <Compile Include=".\Mvc\Html\LinkExtensions.cs" />
-    <Compile Include=".\Mvc\Html\MvcForm.cs" />
-    <Compile Include=".\Mvc\Html\PartialExtensions.cs" />
-    <Compile Include=".\Mvc\Html\RenderPartialExtensions.cs" />
-    <Compile Include=".\Mvc\Html\SelectExtensions.cs" />
-    <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" />
-    <Compile Include=".\Mvc\HttpGetAttribute.cs" />
-    <Compile Include=".\Mvc\HttpHandlerUtil.cs" />
-    <Compile Include=".\Mvc\HttpNotFoundResult.cs" />
-    <Compile Include=".\Mvc\HttpPostAttribute.cs" />
-    <Compile Include=".\Mvc\HttpPostedFileBaseModelBinder.cs" />
-    <Compile Include=".\Mvc\HttpPutAttribute.cs" />
-    <Compile Include=".\Mvc\HttpRequestExtensions.cs" />
-    <Compile Include=".\Mvc\HttpStatusCodeResult.cs" />
-    <Compile Include=".\Mvc\HttpUnauthorizedResult.cs" />
-    <Compile Include=".\Mvc\HttpVerbs.cs" />
-    <Compile Include=".\Mvc\IActionFilter.cs" />
-    <Compile Include=".\Mvc\IActionInvoker.cs" />
-    <Compile Include=".\Mvc\IAuthorizationFilter.cs" />
-    <Compile Include=".\Mvc\IBuildManager.cs" />
-    <Compile Include=".\Mvc\IClientValidatable.cs" />
-    <Compile Include=".\Mvc\IController.cs" />
-    <Compile Include=".\Mvc\IControllerActivator.cs" />
-    <Compile Include=".\Mvc\IControllerFactory.cs" />
-    <Compile Include=".\Mvc\IDependencyResolver.cs" />
-    <Compile Include=".\Mvc\IExceptionFilter.cs" />
-    <Compile Include=".\Mvc\IFilterProvider.cs" />
-    <Compile Include=".\Mvc\IMetadataAware.cs" />
-    <Compile Include=".\Mvc\IModelBinder.cs" />
-    <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" />
-    <Compile Include=".\Mvc\ITempDataProvider.cs" />
-    <Compile Include=".\Mvc\IUniquelyIdentifiable.cs" />
-    <Compile Include=".\Mvc\IUnvalidatedRequestValues.cs" />
-    <Compile Include=".\Mvc\IUnvalidatedValueProvider.cs" />
-    <Compile Include=".\Mvc\IValueProvider.cs" />
-    <Compile Include=".\Mvc\IView.cs" />
-    <Compile Include=".\Mvc\IViewDataContainer.cs" />
-    <Compile Include=".\Mvc\IViewEngine.cs" />
-    <Compile Include=".\Mvc\IViewLocationCache.cs" />
-    <Compile Include=".\Mvc\IViewPageActivator.cs" />
-    <Compile Include=".\Mvc\IViewStartPageChild.cs" />
-    <Compile Include=".\Mvc\JavaScriptResult.cs" />
-    <Compile Include=".\Mvc\JsonRequestBehavior.cs" />
-    <Compile Include=".\Mvc\JsonResult.cs" />
-    <Compile Include=".\Mvc\JsonValueProviderFactory.cs" />
-    <Compile Include=".\Mvc\LinqBinaryModelBinder.cs" />
-    <Compile Include=".\Mvc\ModelBinderAttribute.cs" />
-    <Compile Include=".\Mvc\ModelBinderDictionary.cs" />
-    <Compile Include=".\Mvc\ModelBinderProviderCollection.cs" />
-    <Compile Include=".\Mvc\ModelBinderProviders.cs" />
-    <Compile Include=".\Mvc\ModelBinders.cs" />
-    <Compile Include=".\Mvc\ModelBindingContext.cs" />
-    <Compile Include=".\Mvc\ModelClientValidationEqualToRule.cs" />
-    <Compile Include=".\Mvc\ModelClientValidationRangeRule.cs" />
-    <Compile Include=".\Mvc\ModelClientValidationRegexRule.cs" />
-    <Compile Include=".\Mvc\ModelClientValidationRemoteRule.cs" />
-    <Compile Include=".\Mvc\ModelClientValidationRequiredRule.cs" />
-    <Compile Include=".\Mvc\ModelClientValidationRule.cs" />
-    <Compile Include=".\Mvc\ModelClientValidationStringLengthRule.cs" />
-    <Compile Include=".\Mvc\ModelError.cs" />
-    <Compile Include=".\Mvc\ModelErrorCollection.cs" />
-    <Compile Include=".\Mvc\ModelMetadata.cs" />
-    <Compile Include=".\Mvc\ModelMetadataProvider.cs" />
-    <Compile Include=".\Mvc\ModelMetadataProviders.cs" />
-    <Compile Include=".\Mvc\ModelState.cs" />
-    <Compile Include=".\Mvc\ModelStateDictionary.cs" />
-    <Compile Include=".\Mvc\ModelValidationResult.cs" />
-    <Compile Include=".\Mvc\ModelValidator.cs" />
-    <Compile Include=".\Mvc\ModelValidatorProvider.cs" />
-    <Compile Include=".\Mvc\ModelValidatorProviderCollection.cs" />
-    <Compile Include=".\Mvc\ModelValidatorProviders.cs" />
-    <Compile Include=".\Mvc\MultiSelectList.cs" />
-    <Compile Include=".\Mvc\MultiServiceResolver.cs" />
-    <Compile Include=".\Mvc\MvcFilter.cs" />
-    <Compile Include=".\Mvc\MvcHandler.cs" />
-    <Compile Include=".\Mvc\MvcHtmlString.cs" />
-    <Compile Include=".\Mvc\MvcHttpHandler.cs" />
-    <Compile Include=".\Mvc\MvcRouteHandler.cs" />
-    <Compile Include=".\Mvc\MvcWebRazorHostFactory.cs" />
-    <Compile Include=".\Mvc\NameValueCollectionExtensions.cs" />
-    <Compile Include=".\Mvc\NameValueCollectionValueProvider.cs" />
-    <Compile Include=".\Mvc\NoAsyncTimeoutAttribute.cs" />
-    <Compile Include=".\Mvc\NonActionAttribute.cs" />
-    <Compile Include=".\Mvc\NullViewLocationCache.cs" />
-    <Compile Include=".\Mvc\OutputCacheAttribute.cs" />
-    <Compile Include=".\Mvc\ParameterBindingInfo.cs" />
-    <Compile Include=".\Mvc\ParameterDescriptor.cs" />
-    <Compile Include=".\Mvc\ParameterInfoUtil.cs" />
-    <Compile Include=".\Mvc\PartialViewResult.cs" />
-    <Compile Include=".\Mvc\PathHelpers.cs" />
-    <Compile Include=".\Mvc\PreApplicationStartCode.cs" />
-    <Compile Include=".\Mvc\QueryStringValueProvider.cs" />
-    <Compile Include=".\Mvc\QueryStringValueProviderFactory.cs" />
-    <Compile Include=".\Mvc\RangeAttributeAdapter.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" />
-    <Compile Include=".\Mvc\ReflectedActionDescriptor.cs" />
-    <Compile Include=".\Mvc\ReflectedAttributeCache.cs" />
-    <Compile Include=".\Mvc\ReflectedControllerDescriptor.cs" />
-    <Compile Include=".\Mvc\ReflectedParameterBindingInfo.cs" />
-    <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\Resources\MvcResources.Designer.cs" />
-    <Compile Include=".\Mvc\ResultExecutedContext.cs" />
-    <Compile Include=".\Mvc\ResultExecutingContext.cs" />
-    <Compile Include=".\Mvc\RouteCollectionExtensions.cs" />
-    <Compile Include=".\Mvc\RouteDataValueProvider.cs" />
-    <Compile Include=".\Mvc\RouteDataValueProviderFactory.cs" />
-    <Compile Include=".\Mvc\RouteValuesHelpers.cs" />
-    <Compile Include=".\Mvc\SecurityUtil.cs" />
-    <Compile Include=".\Mvc\SelectList.cs" />
-    <Compile Include=".\Mvc\SelectListItem.cs" />
-    <Compile Include=".\Mvc\SessionStateAttribute.cs" />
-    <Compile Include=".\Mvc\SessionStateTempDataProvider.cs" />
-    <Compile Include=".\Mvc\SingleServiceResolver.cs" />
-    <Compile Include=".\Mvc\StringLengthAttributeAdapter.cs" />
-    <Compile Include=".\Mvc\TagBuilderExtensions.cs" />
-    <Compile Include=".\Mvc\TempDataDictionary.cs" />
-    <Compile Include=".\Mvc\TemplateInfo.cs" />
-    <Compile Include=".\Mvc\TryGetValueDelegate.cs" />
-    <Compile Include=".\Mvc\TypeCacheSerializer.cs" />
-    <Compile Include=".\Mvc\TypeCacheUtil.cs" />
-    <Compile Include=".\Mvc\TypeDescriptorHelper.cs" />
-    <Compile Include=".\Mvc\TypeHelpers.cs" />
-    <Compile Include=".\Mvc\UnvalidatedRequestValuesAccessor.cs" />
-    <Compile Include=".\Mvc\UnvalidatedRequestValuesWrapper.cs" />
-    <Compile Include=".\Mvc\UrlHelper.cs" />
-    <Compile Include=".\Mvc\UrlParameter.cs" />
-    <Compile Include=".\Mvc\UrlRewriterHelper.cs" />
-    <Compile Include=".\Mvc\ValidatableObjectAdapter.cs" />
-    <Compile Include=".\Mvc\ValidateAntiForgeryTokenAttribute.cs" />
-    <Compile Include=".\Mvc\ValidateInputAttribute.cs" />
-    <Compile Include=".\Mvc\ValueProviderCollection.cs" />
-    <Compile Include=".\Mvc\ValueProviderDictionary.cs" />
-    <Compile Include=".\Mvc\ValueProviderFactories.cs" />
-    <Compile Include=".\Mvc\ValueProviderFactory.cs" />
-    <Compile Include=".\Mvc\ValueProviderFactoryCollection.cs" />
-    <Compile Include=".\Mvc\ValueProviderResult.cs" />
-    <Compile Include=".\Mvc\ValueProviderUtil.cs" />
-    <Compile Include=".\Mvc\ViewContext.cs" />
-    <Compile Include=".\Mvc\ViewDataDictionary.cs" />
-    <Compile Include=".\Mvc\ViewDataDictionary`1.cs" />
-    <Compile Include=".\Mvc\ViewDataInfo.cs" />
-    <Compile Include=".\Mvc\ViewEngineCollection.cs" />
-    <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\ViewPage.cs" />
-    <Compile Include=".\Mvc\ViewPage`1.cs" />
-    <Compile Include=".\Mvc\ViewPageControlBuilder.cs" />
-    <Compile Include=".\Mvc\ViewResult.cs" />
-    <Compile Include=".\Mvc\ViewResultBase.cs" />
-    <Compile Include=".\Mvc\ViewStartPage.cs" />
-    <Compile Include=".\Mvc\ViewTemplateUserControl.cs" />
-    <Compile Include=".\Mvc\ViewTemplateUserControl`1.cs" />
-    <Compile Include=".\Mvc\ViewType.cs" />
-    <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\VirtualPathProviderViewEngine.cs" />
-    <Compile Include=".\Mvc\WebFormView.cs" />
-    <Compile Include=".\Mvc\WebFormViewEngine.cs" />
-    <Compile Include=".\Mvc\WebViewPage.cs" />
-    <Compile Include=".\Mvc\WebViewPage`1.cs" />
-    <Compile Include=".\Properties\AssemblyInfo.cs" />
+    <Compile Include="GlobalAssemblyInfo.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="Mvc\AcceptVerbsAttribute.cs" />
+    <Compile Include="Mvc\ActionDescriptor.cs" />
+    <Compile Include="Mvc\ActionExecutedContext.cs" />
+    <Compile Include="Mvc\ActionExecutingContext.cs" />
+    <Compile Include="Mvc\ActionFilterAttribute.cs" />
+    <Compile Include="Mvc\ActionMethodDispatcher.cs" />
+    <Compile Include="Mvc\ActionMethodDispatcherCache.cs" />
+    <Compile Include="Mvc\ActionMethodSelector.cs" />
+    <Compile Include="Mvc\ActionMethodSelectorAttribute.cs" />
+    <Compile Include="Mvc\ActionNameAttribute.cs" />
+    <Compile Include="Mvc\ActionNameSelectorAttribute.cs" />
+    <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\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\Async\ActionDescriptorCreator.cs" />
+    <Compile Include="Mvc\Async\AsyncActionDescriptor.cs" />
+    <Compile Include="Mvc\Async\AsyncActionMethodSelector.cs" />
+    <Compile Include="Mvc\Async\AsyncControllerActionInvoker.cs" />
+    <Compile Include="Mvc\Async\AsyncManager.cs" />
+    <Compile Include="Mvc\Async\AsyncResultWrapper.cs" />
+    <Compile Include="Mvc\Async\AsyncUtil.cs" />
+    <Compile Include="Mvc\Async\AsyncVoid.cs" />
+    <Compile Include="Mvc\Async\BeginInvokeDelegate.cs" />
+    <Compile Include="Mvc\Async\EndInvokeDelegate.cs" />
+    <Compile Include="Mvc\Async\EndInvokeDelegate`1.cs" />
+    <Compile Include="Mvc\Async\IAsyncActionInvoker.cs" />
+    <Compile Include="Mvc\Async\IAsyncController.cs" />
+    <Compile Include="Mvc\Async\IAsyncManagerContainer.cs" />
+    <Compile Include="Mvc\Async\OperationCounter.cs" />
+    <Compile Include="Mvc\Async\ReflectedAsyncActionDescriptor.cs" />
+    <Compile Include="Mvc\Async\ReflectedAsyncControllerDescriptor.cs" />
+    <Compile Include="Mvc\Async\SimpleAsyncResult.cs" />
+    <Compile Include="Mvc\Async\SingleEntryGate.cs" />
+    <Compile Include="Mvc\Async\SynchronizationContextUtil.cs" />
+    <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" />
+    <Compile Include="Mvc\BuildManagerCompiledView.cs" />
+    <Compile Include="Mvc\BuildManagerViewEngine.cs" />
+    <Compile Include="Mvc\BuildManagerWrapper.cs" />
+    <Compile Include="Mvc\ByteArrayModelBinder.cs" />
+    <Compile Include="Mvc\ChildActionOnlyAttribute.cs" />
+    <Compile Include="Mvc\ChildActionValueProvider.cs" />
+    <Compile Include="Mvc\ChildActionValueProviderFactory.cs" />
+    <Compile Include="Mvc\ClientDataTypeModelValidatorProvider.cs" />
+    <Compile Include="Mvc\CompareAttribute.cs" />
+    <Compile Include="Mvc\ContentResult.cs" />
+    <Compile Include="Mvc\Controller.cs" />
+    <Compile Include="Mvc\ControllerActionInvoker.cs" />
+    <Compile Include="Mvc\ControllerBase.cs" />
+    <Compile Include="Mvc\ControllerBuilder.cs" />
+    <Compile Include="Mvc\ControllerContext.cs" />
+    <Compile Include="Mvc\ControllerDescriptor.cs" />
+    <Compile Include="Mvc\ControllerDescriptorCache.cs" />
+    <Compile Include="Mvc\ControllerInstanceFilterProvider.cs" />
+    <Compile Include="Mvc\ControllerTypeCache.cs" />
+    <Compile Include="Mvc\CustomModelBinderAttribute.cs" />
+    <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\DataErrorInfoModelValidatorProvider.cs" />
+    <Compile Include="Mvc\DataTypeUtil.cs" />
+    <Compile Include="Mvc\DefaultControllerFactory.cs" />
+    <Compile Include="Mvc\DefaultModelBinder.cs" />
+    <Compile Include="Mvc\DefaultViewLocationCache.cs" />
+    <Compile Include="Mvc\DependencyResolver.cs" />
+    <Compile Include="Mvc\DependencyResolverExtensions.cs" />
+    <Compile Include="Mvc\DescriptorUtil.cs" />
+    <Compile Include="Mvc\DictionaryHelpers.cs" />
+    <Compile Include="Mvc\DictionaryValueProvider`1.cs" />
+    <Compile Include="Mvc\DynamicViewDataDictionary.cs" />
+    <Compile Include="Mvc\EmptyModelMetadataProvider.cs" />
+    <Compile Include="Mvc\EmptyModelValidatorProvider.cs" />
+    <Compile Include="Mvc\EmptyResult.cs" />
+    <Compile Include="Mvc\Error.cs" />
+    <Compile Include="Mvc\ExceptionContext.cs" />
+    <Compile Include="Mvc\ExpressionHelper.cs" />
+    <Compile Include="Mvc\ExpressionUtil\BinaryExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\CachedExpressionCompiler.cs" />
+    <Compile Include="Mvc\ExpressionUtil\ConditionalExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\ConstantExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\DefaultExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\ExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\ExpressionFingerprintChain.cs" />
+    <Compile Include="Mvc\ExpressionUtil\FingerprintingExpressionVisitor.cs" />
+    <Compile Include="Mvc\ExpressionUtil\HashCodeCombiner.cs" />
+    <Compile Include="Mvc\ExpressionUtil\Hoisted`2.cs" />
+    <Compile Include="Mvc\ExpressionUtil\HoistingExpressionVisitor.cs" />
+    <Compile Include="Mvc\ExpressionUtil\IndexExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\LambdaExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\MemberExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\MethodCallExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\ParameterExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\TypeBinaryExpressionFingerprint.cs" />
+    <Compile Include="Mvc\ExpressionUtil\UnaryExpressionFingerprint.cs" />
+    <Compile Include="Mvc\FieldValidationMetadata.cs" />
+    <Compile Include="Mvc\FileContentResult.cs" />
+    <Compile Include="Mvc\FilePathResult.cs" />
+    <Compile Include="Mvc\FileResult.cs" />
+    <Compile Include="Mvc\FileStreamResult.cs" />
+    <Compile Include="Mvc\Filter.cs" />
+    <Compile Include="Mvc\FilterAttribute.cs" />
+    <Compile Include="Mvc\FilterAttributeFilterProvider.cs" />
+    <Compile Include="Mvc\FilterInfo.cs" />
+    <Compile Include="Mvc\FilterProviderCollection.cs" />
+    <Compile Include="Mvc\FilterProviders.cs" />
+    <Compile Include="Mvc\FilterScope.cs" />
+    <Compile Include="Mvc\FormCollection.cs" />
+    <Compile Include="Mvc\FormContext.cs" />
+    <Compile Include="Mvc\FormMethod.cs" />
+    <Compile Include="Mvc\FormValueProvider.cs" />
+    <Compile Include="Mvc\FormValueProviderFactory.cs" />
+    <Compile Include="Mvc\GlobalFilterCollection.cs" />
+    <Compile Include="Mvc\GlobalFilters.cs" />
+    <Compile Include="Mvc\HandleErrorAttribute.cs" />
+    <Compile Include="Mvc\HandleErrorInfo.cs" />
+    <Compile Include="Mvc\HiddenInputAttribute.cs" />
+    <Compile Include="Mvc\Html\ChildActionExtensions.cs" />
+    <Compile Include="Mvc\Html\DefaultDisplayTemplates.cs" />
+    <Compile Include="Mvc\Html\DefaultEditorTemplates.cs" />
+    <Compile Include="Mvc\Html\DisplayExtensions.cs" />
+    <Compile Include="Mvc\Html\DisplayTextExtensions.cs" />
+    <Compile Include="Mvc\Html\EditorExtensions.cs" />
+    <Compile Include="Mvc\Html\FormExtensions.cs" />
+    <Compile Include="Mvc\Html\InputExtensions.cs" />
+    <Compile Include="Mvc\Html\LabelExtensions.cs" />
+    <Compile Include="Mvc\Html\LinkExtensions.cs" />
+    <Compile Include="Mvc\Html\MvcForm.cs" />
+    <Compile Include="Mvc\Html\PartialExtensions.cs" />
+    <Compile Include="Mvc\Html\RenderPartialExtensions.cs" />
+    <Compile Include="Mvc\Html\SelectExtensions.cs" />
+    <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" />
+    <Compile Include="Mvc\HttpGetAttribute.cs" />
+    <Compile Include="Mvc\HttpHandlerUtil.cs" />
+    <Compile Include="Mvc\HttpNotFoundResult.cs" />
+    <Compile Include="Mvc\HttpPostAttribute.cs" />
+    <Compile Include="Mvc\HttpPostedFileBaseModelBinder.cs" />
+    <Compile Include="Mvc\HttpPutAttribute.cs" />
+    <Compile Include="Mvc\HttpRequestExtensions.cs" />
+    <Compile Include="Mvc\HttpStatusCodeResult.cs" />
+    <Compile Include="Mvc\HttpUnauthorizedResult.cs" />
+    <Compile Include="Mvc\HttpVerbs.cs" />
+    <Compile Include="Mvc\IActionFilter.cs" />
+    <Compile Include="Mvc\IActionInvoker.cs" />
+    <Compile Include="Mvc\IAuthorizationFilter.cs" />
+    <Compile Include="Mvc\IBuildManager.cs" />
+    <Compile Include="Mvc\IClientValidatable.cs" />
+    <Compile Include="Mvc\IController.cs" />
+    <Compile Include="Mvc\IControllerActivator.cs" />
+    <Compile Include="Mvc\IControllerFactory.cs" />
+    <Compile Include="Mvc\IDependencyResolver.cs" />
+    <Compile Include="Mvc\IExceptionFilter.cs" />
+    <Compile Include="Mvc\IFilterProvider.cs" />
+    <Compile Include="Mvc\IMetadataAware.cs" />
+    <Compile Include="Mvc\IModelBinder.cs" />
+    <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" />
+    <Compile Include="Mvc\ITempDataProvider.cs" />
+    <Compile Include="Mvc\IUniquelyIdentifiable.cs" />
+    <Compile Include="Mvc\IUnvalidatedRequestValues.cs" />
+    <Compile Include="Mvc\IUnvalidatedValueProvider.cs" />
+    <Compile Include="Mvc\IValueProvider.cs" />
+    <Compile Include="Mvc\IView.cs" />
+    <Compile Include="Mvc\IViewDataContainer.cs" />
+    <Compile Include="Mvc\IViewEngine.cs" />
+    <Compile Include="Mvc\IViewLocationCache.cs" />
+    <Compile Include="Mvc\IViewPageActivator.cs" />
+    <Compile Include="Mvc\IViewStartPageChild.cs" />
+    <Compile Include="Mvc\JavaScriptResult.cs" />
+    <Compile Include="Mvc\JsonRequestBehavior.cs" />
+    <Compile Include="Mvc\JsonResult.cs" />
+    <Compile Include="Mvc\JsonValueProviderFactory.cs" />
+    <Compile Include="Mvc\LinqBinaryModelBinder.cs" />
+    <Compile Include="Mvc\ModelBinderAttribute.cs" />
+    <Compile Include="Mvc\ModelBinderDictionary.cs" />
+    <Compile Include="Mvc\ModelBinderProviderCollection.cs" />
+    <Compile Include="Mvc\ModelBinderProviders.cs" />
+    <Compile Include="Mvc\ModelBinders.cs" />
+    <Compile Include="Mvc\ModelBindingContext.cs" />
+    <Compile Include="Mvc\ModelClientValidationEqualToRule.cs" />
+    <Compile Include="Mvc\ModelClientValidationRangeRule.cs" />
+    <Compile Include="Mvc\ModelClientValidationRegexRule.cs" />
+    <Compile Include="Mvc\ModelClientValidationRemoteRule.cs" />
+    <Compile Include="Mvc\ModelClientValidationRequiredRule.cs" />
+    <Compile Include="Mvc\ModelClientValidationRule.cs" />
+    <Compile Include="Mvc\ModelClientValidationStringLengthRule.cs" />
+    <Compile Include="Mvc\ModelError.cs" />
+    <Compile Include="Mvc\ModelErrorCollection.cs" />
+    <Compile Include="Mvc\ModelMetadata.cs" />
+    <Compile Include="Mvc\ModelMetadataProvider.cs" />
+    <Compile Include="Mvc\ModelMetadataProviders.cs" />
+    <Compile Include="Mvc\ModelState.cs" />
+    <Compile Include="Mvc\ModelStateDictionary.cs" />
+    <Compile Include="Mvc\ModelValidationResult.cs" />
+    <Compile Include="Mvc\ModelValidator.cs" />
+    <Compile Include="Mvc\ModelValidatorProvider.cs" />
+    <Compile Include="Mvc\ModelValidatorProviderCollection.cs" />
+    <Compile Include="Mvc\ModelValidatorProviders.cs" />
+    <Compile Include="Mvc\MultiSelectList.cs" />
+    <Compile Include="Mvc\MultiServiceResolver.cs" />
+    <Compile Include="Mvc\MvcFilter.cs" />
+    <Compile Include="Mvc\MvcHandler.cs" />
+    <Compile Include="Mvc\MvcHtmlString.cs" />
+    <Compile Include="Mvc\MvcHttpHandler.cs" />
+    <Compile Include="Mvc\MvcRouteHandler.cs" />
+    <Compile Include="Mvc\MvcWebRazorHostFactory.cs" />
+    <Compile Include="Mvc\NameValueCollectionExtensions.cs" />
+    <Compile Include="Mvc\NameValueCollectionValueProvider.cs" />
+    <Compile Include="Mvc\NoAsyncTimeoutAttribute.cs" />
+    <Compile Include="Mvc\NonActionAttribute.cs" />
+    <Compile Include="Mvc\NullViewLocationCache.cs" />
+    <Compile Include="Mvc\OutputCacheAttribute.cs" />
+    <Compile Include="Mvc\ParameterBindingInfo.cs" />
+    <Compile Include="Mvc\ParameterDescriptor.cs" />
+    <Compile Include="Mvc\ParameterInfoUtil.cs" />
+    <Compile Include="Mvc\PartialViewResult.cs" />
+    <Compile Include="Mvc\PathHelpers.cs" />
+    <Compile Include="Mvc\PreApplicationStartCode.cs" />
+    <Compile Include="Mvc\QueryStringValueProvider.cs" />
+    <Compile Include="Mvc\QueryStringValueProviderFactory.cs" />
+    <Compile Include="Mvc\RangeAttributeAdapter.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" />
+    <Compile Include="Mvc\ReflectedActionDescriptor.cs" />
+    <Compile Include="Mvc\ReflectedAttributeCache.cs" />
+    <Compile Include="Mvc\ReflectedControllerDescriptor.cs" />
+    <Compile Include="Mvc\ReflectedParameterBindingInfo.cs" />
+    <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\Resources\MvcResources.Designer.cs" />
+    <Compile Include="Mvc\ResultExecutedContext.cs" />
+    <Compile Include="Mvc\ResultExecutingContext.cs" />
+    <Compile Include="Mvc\RouteCollectionExtensions.cs" />
+    <Compile Include="Mvc\RouteDataValueProvider.cs" />
+    <Compile Include="Mvc\RouteDataValueProviderFactory.cs" />
+    <Compile Include="Mvc\RouteValuesHelpers.cs" />
+    <Compile Include="Mvc\SecurityUtil.cs" />
+    <Compile Include="Mvc\SelectList.cs" />
+    <Compile Include="Mvc\SelectListItem.cs" />
+    <Compile Include="Mvc\SessionStateAttribute.cs" />
+    <Compile Include="Mvc\SessionStateTempDataProvider.cs" />
+    <Compile Include="Mvc\SingleServiceResolver.cs" />
+    <Compile Include="Mvc\StringLengthAttributeAdapter.cs" />
+    <Compile Include="Mvc\TagBuilderExtensions.cs" />
+    <Compile Include="Mvc\TempDataDictionary.cs" />
+    <Compile Include="Mvc\TemplateInfo.cs" />
+    <Compile Include="Mvc\TryGetValueDelegate.cs" />
+    <Compile Include="Mvc\TypeCacheSerializer.cs" />
+    <Compile Include="Mvc\TypeCacheUtil.cs" />
+    <Compile Include="Mvc\TypeDescriptorHelper.cs" />
+    <Compile Include="Mvc\TypeHelpers.cs" />
+    <Compile Include="Mvc\UnvalidatedRequestValuesAccessor.cs" />
+    <Compile Include="Mvc\UnvalidatedRequestValuesWrapper.cs" />
+    <Compile Include="Mvc\UrlHelper.cs" />
+    <Compile Include="Mvc\UrlParameter.cs" />
+    <Compile Include="Mvc\UrlRewriterHelper.cs" />
+    <Compile Include="Mvc\ValidatableObjectAdapter.cs" />
+    <Compile Include="Mvc\ValidateAntiForgeryTokenAttribute.cs" />
+    <Compile Include="Mvc\ValidateInputAttribute.cs" />
+    <Compile Include="Mvc\ValueProviderCollection.cs" />
+    <Compile Include="Mvc\ValueProviderDictionary.cs" />
+    <Compile Include="Mvc\ValueProviderFactories.cs" />
+    <Compile Include="Mvc\ValueProviderFactory.cs" />
+    <Compile Include="Mvc\ValueProviderFactoryCollection.cs" />
+    <Compile Include="Mvc\ValueProviderResult.cs" />
+    <Compile Include="Mvc\ValueProviderUtil.cs" />
+    <Compile Include="Mvc\ViewContext.cs" />
+    <Compile Include="Mvc\ViewDataDictionary.cs" />
+    <Compile Include="Mvc\ViewDataDictionary`1.cs" />
+    <Compile Include="Mvc\ViewDataInfo.cs" />
+    <Compile Include="Mvc\ViewEngineCollection.cs" />
+    <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\ViewPage.cs" />
+    <Compile Include="Mvc\ViewPage`1.cs" />
+    <Compile Include="Mvc\ViewPageControlBuilder.cs" />
+    <Compile Include="Mvc\ViewResult.cs" />
+    <Compile Include="Mvc\ViewResultBase.cs" />
+    <Compile Include="Mvc\ViewStartPage.cs" />
+    <Compile Include="Mvc\ViewTemplateUserControl.cs" />
+    <Compile Include="Mvc\ViewTemplateUserControl`1.cs" />
+    <Compile Include="Mvc\ViewType.cs" />
+    <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\VirtualPathProviderViewEngine.cs" />
+    <Compile Include="Mvc\WebFormView.cs" />
+    <Compile Include="Mvc\WebFormViewEngine.cs" />
+    <Compile Include="Mvc\WebViewPage.cs" />
+    <Compile Include="Mvc\WebViewPage`1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <!-- @ALL_SOURCES@ -->
   <!-- @COMMON_PROJECT_REFERENCES@ -->
diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj
index c05734f4a2b..f6da918057b 100644
--- a/mcs/class/corlib/corlib.csproj
+++ b/mcs/class/corlib/corlib.csproj
@@ -1866,7 +1866,6 @@
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Collections\Generic\NonRandomizedStringEqualityComparer.cs" />
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
     <Compile Include="CommonCrypto\CorlibExtras.cs" />
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
@@ -1891,7 +1890,6 @@
     <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_runtime' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Collections\Generic\NonRandomizedStringEqualityComparer.cs" />
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
     <Compile Include="CommonCrypto\CorlibExtras.cs" />
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
@@ -1916,7 +1914,6 @@
     <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Collections\Generic\NonRandomizedStringEqualityComparer.cs" />
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
     <Compile Include="CommonCrypto\CorlibExtras.cs" />
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
@@ -1941,7 +1938,6 @@
     <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_watch_runtime' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Collections\Generic\NonRandomizedStringEqualityComparer.cs" />
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
     <Compile Include="CommonCrypto\CorlibExtras.cs" />
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
@@ -1966,7 +1962,6 @@
     <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Collections\Generic\NonRandomizedStringEqualityComparer.cs" />
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
     <Compile Include="CommonCrypto\CorlibExtras.cs" />
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
@@ -1991,7 +1986,6 @@
     <Compile Include="CommonCrypto\TripleDESCryptoServiceProvider.g.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Collections\Generic\NonRandomizedStringEqualityComparer.cs" />
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
     <Compile Include="CommonCrypto\CorlibExtras.cs" />
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
@@ -2064,7 +2058,6 @@
     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Platform)' == 'xammac' ">
-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Collections\Generic\NonRandomizedStringEqualityComparer.cs" />
     <Compile Include="CommonCrypto\CommonCrypto.cs" />
     <Compile Include="CommonCrypto\CorlibExtras.cs" />
     <Compile Include="CommonCrypto\CryptorTransform.cs" />
diff --git a/msvc/scripts/Makefile b/msvc/scripts/Makefile
index c7775e9ea84..5e5cf5a9f15 100644
--- a/msvc/scripts/Makefile
+++ b/msvc/scripts/Makefile
@@ -2,7 +2,7 @@ all: genproj.exe prepare.exe
 	mono --debug genproj.exe
 
 genproj.exe: genproj.cs
-	mcs -g genproj.cs -r:System.Xml.Linq
+	mcs -debug:portable -g genproj.cs -r:System.Xml.Linq
 
 prepare.exe: prepare.cs
 	mcs prepare.cs