Add support for embedding C# source in portable pdb

build/Targets/Dependencies.props

@@ -23,6 +23,7 @@
     <SystemDynamicRuntimeVersion>4.0.11</SystemDynamicRuntimeVersion>
     <SystemGlobalizationVersion>4.0.11</SystemGlobalizationVersion>
     <SystemIOVersion>4.1.0</SystemIOVersion>
+    <SystemIOCompressionVersion>4.1.0</SystemIOCompressionVersion>
     <SystemIOFileSystemVersion>4.0.1</SystemIOFileSystemVersion>
     <SystemIOFileSystemDriveInfoVersion>4.0.0</SystemIOFileSystemDriveInfoVersion>
     <SystemIOFileSystemPrimitivesVersion>4.0.1</SystemIOFileSystemPrimitivesVersion>

src/Compilers/CSharp/Portable/CSharpResources.resx

@@ -4407,6 +4407,8 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
  /additionalfile:<file list>   Additional files that don't directly affect code
                                generation but may be used by analyzers for producing
                                errors or warnings.
+ /embed                        Embed all source files in the PDB.
+ /embed:<file list>            Embed specfic files the PDB
 
                         - RESOURCES -
  /win32res:<file>              Specify a Win32 resource file (.res)
@@ -4936,4 +4938,7 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
   <data name="ERR_SourceLinkRequiresPortablePdb" xml:space="preserve">
     <value>/sourcelink switch is only supported when emitting Portable PDB (/debug:portable or /debug:embedded must be specified).</value>
   </data>
-</root>
+  <data name="ERR_CannotEmbedWithoutPdb" xml:space="preserve">
+    <value>/embed switch is only supported when emitting Portable PDB (/debug:portable or /debug:embedded).</value>
+  </data>
+</root>

src/Compilers/CSharp/Portable/CommandLine/CSharpCommandLineParser.cs

@@ -85,7 +85,9 @@ internal sealed override CommandLineArguments CommonParse(IEnumerable<string> ar
             List<ResourceDescription> managedResources = new List<ResourceDescription>();
             List<CommandLineSourceFile> sourceFiles = new List<CommandLineSourceFile>();
             List<CommandLineSourceFile> additionalFiles = new List<CommandLineSourceFile>();
+            List<CommandLineSourceFile> embeddedFiles = new List<CommandLineSourceFile>();
             bool sourceFilesSpecified = false;
+            bool embedAllSourceFiles = false;
             bool resourcesOrModulesSpecified = false;
             Encoding codepage = null;
             var checksumAlgorithm = SourceHashAlgorithm.Sha1;
@@ -1097,7 +1099,17 @@ internal sealed override CommandLineArguments CommonParse(IEnumerable<string> ar
                                 continue;
                             }
 
-                            additionalFiles.AddRange(ParseAdditionalFileArgument(value, baseDirectory, diagnostics));
+                            additionalFiles.AddRange(ParseSeparatedFileArgument(value, baseDirectory, diagnostics));
+                            continue;
+
+                        case "embed":
+                            if (string.IsNullOrEmpty(value))
+                            {
+                                embedAllSourceFiles = true;
+                                continue;
+                            }
+
+                            embeddedFiles.AddRange(ParseSeparatedFileArgument(value, baseDirectory, diagnostics));
                             continue;
                     }
                 }
@@ -1161,11 +1173,26 @@ internal sealed override CommandLineArguments CommonParse(IEnumerable<string> ar
 
             if (sourceLink != null)
             {
-                if (!emitPdb || debugInformationFormat != DebugInformationFormat.PortablePdb && debugInformationFormat != DebugInformationFormat.Embedded)
+                if (!emitPdb || !debugInformationFormat.IsPortable())
                 {
                     AddDiagnostic(diagnostics, ErrorCode.ERR_SourceLinkRequiresPortablePdb);
                 }
             }
+
+            if (embedAllSourceFiles)
+            {
+                embeddedFiles.AddRange(sourceFiles);
+            }
+
+            if (embeddedFiles.Count > 0)
+            {
+                // Restricted to portable PDBs for now, but the IsPortable condition should be removed
+                // and the error message adjusted accordingly when native PDB support is added.
+                if (!emitPdb || !debugInformationFormat.IsPortable())
+                {
+                    AddDiagnostic(diagnostics, ErrorCode.ERR_CannotEmbedWithoutPdb);
+                }
+            }
 
             var parsedFeatures = CompilerOptionParseUtilities.ParseFeatures(features);
 
@@ -1273,7 +1300,8 @@ internal sealed override CommandLineArguments CommonParse(IEnumerable<string> ar
                 PrintFullPaths = printFullPaths,
                 ShouldIncludeErrorEndLocation = errorEndLocation,
                 PreferredUILang = preferredUILang,
-                ReportAnalyzer = reportAnalyzer
+                ReportAnalyzer = reportAnalyzer,
+                EmbeddedFiles = embeddedFiles.AsImmutable()
             };
         }
 

src/Compilers/CSharp/Portable/CommandLine/CSharpCompiler.cs

@@ -8,9 +8,11 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Collections;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.CSharp
 {
@@ -151,7 +153,7 @@ private SyntaxTree ParseFile(
             out string normalizedFilePath)
         {
             var fileReadDiagnostics = new List<DiagnosticInfo>();
-            var content = ReadFileContent(file, fileReadDiagnostics, out normalizedFilePath);
+            var content = TryReadFileContent(file, fileReadDiagnostics, out normalizedFilePath);
 
             if (content == null)
             {
@@ -277,5 +279,37 @@ protected override ImmutableArray<DiagnosticAnalyzer> ResolveAnalyzersFromArgume
         {
             return Arguments.ResolveAnalyzersFromArguments(LanguageNames.CSharp, diagnostics, messageProvider, AssemblyLoader);
         }
+
+        protected override void ResolveEmbeddedFilesFromExternalSourceDirectives(
+            SyntaxTree tree,
+            SourceReferenceResolver resolver,
+            OrderedSet<string> embeddedFiles,
+            IList<Diagnostic> diagnostics)
+        {
+            foreach (LineDirectiveTriviaSyntax directive in tree.GetRoot().GetDirectives(
+                d => d.IsActive && !d.HasErrors && d.Kind() == SyntaxKind.LineDirectiveTrivia))
+            {
+                string path = (string)directive.File.Value;
+                if (path == null)
+                {
+                    continue;
+                }
+
+                string resolvedPath = resolver.ResolveReference(path, tree.FilePath);
+                if (resolvedPath == null)
+                {
+                    diagnostics.Add(
+                        MessageProvider.CreateDiagnostic(
+                            (int)ErrorCode.ERR_NoSourceFile,
+                            directive.File.GetLocation(),
+                            path,
+                            CSharpResources.CouldNotFindFile));
+
+                    continue;
+                }
+
+                embeddedFiles.Add(resolvedPath);
+            }
+        }
     }
 }

src/Compilers/CSharp/Portable/Compilation/CSharpCompilation.cs

@@ -2222,6 +2222,7 @@ internal override CommonPEModuleBuilder CreateModuleBuilder(
             EmitOptions emitOptions,
             IMethodSymbol debugEntryPoint,
             Stream sourceLinkStream,
+            IEnumerable<EmbeddedText> embeddedTexts,
             IEnumerable<ResourceDescription> manifestResources,
             CompilationTestData testData,
             DiagnosticBag diagnostics,
@@ -2269,6 +2270,11 @@ internal override CommonPEModuleBuilder CreateModuleBuilder(
 
             moduleBeingBuilt.SourceLinkStreamOpt = sourceLinkStream;
 
+            if (embeddedTexts != null)
+            {
+                moduleBeingBuilt.EmbeddedTexts = embeddedTexts;
+            }
+
             // testData is only passed when running tests.
             if (testData != null)
             {
@@ -2314,7 +2320,8 @@ internal override bool CompileMethods(
             }
             else
             {
-                if ((emittingPdb || emitOptions.EmitDynamicAnalysisData) && !StartSourceChecksumCalculation(moduleBeingBuilt.DebugDocumentsBuilder, diagnostics))
+                if ((emittingPdb || emitOptions.EmitDynamicAnalysisData) &&
+                    !StartSourceChecksumCalculation(moduleBeingBuilt.DebugDocumentsBuilder, moduleBeingBuilt.EmbeddedTexts, diagnostics))
                 {
                     return false;
                 }
@@ -2491,11 +2498,11 @@ internal override void AddDebugSourceDocumentsForChecksumDirectives(
                         continue;
                     }
 
-                    var checksumAndAlgorithm = existingDoc.ChecksumAndAlgorithm;
-                    if (ChecksumMatches(checksumText, checksumAndAlgorithm.Item1))
+                    var sourceInfo = existingDoc.GetSourceInfo();
+                    if (ChecksumMatches(checksumText, sourceInfo.Checksum))
                     {
                         var guid = Guid.Parse(checksumDirective.Guid.ValueText);
-                        if (guid == checksumAndAlgorithm.Item2)
+                        if (guid == sourceInfo.ChecksumAlgorithmId)
                         {
                             // all parts match, nothing to do
                             continue;

src/Compilers/CSharp/Portable/Errors/ErrorCode.cs

@@ -1061,7 +1061,8 @@ internal enum ErrorCode
         ERR_InvalidDebugInformationFormat = 2042,
         ERR_LegacyObjectIdSyntax = 2043,
         ERR_SourceLinkRequiresPortablePdb = 2044,
-        // unused 2045-2999
+        ERR_CannotEmbedWithoutPdb = 2045,
+        // unused 2046-2999
         WRN_CLS_NoVarArgs = 3000,
         WRN_CLS_BadArgType = 3001, // Requires SymbolDistinguisher.
         WRN_CLS_BadReturnType = 3002,

src/Compilers/CSharp/Portable/Errors/MessageProvider.cs

@@ -95,6 +95,11 @@ public override Diagnostic CreateDiagnostic(int code, Location location, params
             return new CSDiagnostic(info, location);
         }
 
+        public override Diagnostic CreateDiagnostic(DiagnosticInfo info)
+        {
+            return new CSDiagnostic(info, Location.None);
+        }
+
         public override string GetErrorDisplayString(ISymbol symbol)
         {
             // show extra info for assembly if possible such as version, public key token etc.