From 25269473b64dc59448654b50db1c2cabc81d05e5 Mon Sep 17 00:00:00 2001
From: Jason Malinowski <jason.malinowski@microsoft.com>
Date: Fri, 24 Jan 2020 14:25:22 -0800
Subject: [PATCH] Null annotate TempPECompiler

---
 .../Impl/ProjectSystem/CPS/TempPECompiler.cs     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/VisualStudio/Core/Impl/ProjectSystem/CPS/TempPECompiler.cs b/src/VisualStudio/Core/Impl/ProjectSystem/CPS/TempPECompiler.cs
index 6ff4f407dd1..3b1a5f48451 100644
--- a/src/VisualStudio/Core/Impl/ProjectSystem/CPS/TempPECompiler.cs
+++ b/src/VisualStudio/Core/Impl/ProjectSystem/CPS/TempPECompiler.cs
@@ -2,14 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.VisualStudio.LanguageServices.ProjectSystem;
 using Roslyn.Utilities;
 
@@ -37,13 +40,13 @@ public async Task<bool> CompileAsync(IWorkspaceProjectContext context, string ou
                 throw new ArgumentException(nameof(outputFileName), "Must specify an output file name.");
             }
 
-            var project = _workspace.CurrentSolution.GetProject(context.Id);
+            var project = _workspace.CurrentSolution.GetRequiredProject(context.Id);
 
             // Remove all files except the ones we care about
             var documents = project.Documents;
             foreach (var document in documents)
             {
-                if (!filesToInclude.Contains(document.FilePath))
+                if (document.FilePath != null && !filesToInclude.Contains(document.FilePath))
                 {
                     project = project.RemoveDocument(document.Id);
                 }
@@ -51,8 +54,9 @@ public async Task<bool> CompileAsync(IWorkspaceProjectContext context, string ou
                 cancellationToken.ThrowIfCancellationRequested();
             }
 
+
             // We need to inherit most of the projects options, mainly for VB (RootNamespace, GlobalImports etc.), but we need to override about some specific things surrounding the output
-            var options = project.CompilationOptions
+            var options = project.CompilationOptions!
                     // copied from the old TempPE compiler used by legacy, for parity.
                     // See: https://github.com/dotnet/roslyn/blob/fab7134296816fc80019c60b0f5bef7400cf23ea/src/VisualStudio/CSharp/Impl/ProjectSystemShim/TempPECompilerService.cs#L58
                     .WithAssemblyIdentityComparer(DesktopAssemblyIdentityComparer.Default)
@@ -65,7 +69,7 @@ public async Task<bool> CompileAsync(IWorkspaceProjectContext context, string ou
                     // Turn off any warnings as errors just in case
                     .WithGeneralDiagnosticOption(ReportDiagnostic.Suppress)
                     .WithReportSuppressedDiagnostics(false)
-                    .WithSpecificDiagnosticOptions(null)
+                    .WithSpecificDiagnosticOptions(ImmutableDictionary<string, ReportDiagnostic>.Empty)
                     // Turn off any signing and strong naming
                     .WithDelaySign(false)
                     .WithCryptoKeyFile(null)
@@ -77,7 +81,7 @@ public async Task<bool> CompileAsync(IWorkspaceProjectContext context, string ou
                 // AssemblyName should be set to the filename of the output file because multiple TempPE DLLs can be created for the same project
                 .WithAssemblyName(Path.GetFileName(outputFileName));
 
-            var compilation = await project.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
+            var compilation = await project.GetRequiredCompilationAsync(cancellationToken).ConfigureAwait(false);
 
             cancellationToken.ThrowIfCancellationRequested();
 
-- 
GitLab