Emit host outputs

NuGet.config

@@ -40,9 +40,6 @@
   -->
   <packageSourceMapping>
     <clear />
-    <packageSource key="general-testing">
-      <package pattern="microsoft.commonlanguageserverProtocol.*" />
-    </packageSource>
     <packageSource key="dotnet-core-internal-tooling">
       <package pattern="microsoft.*" />
     </packageSource>

eng/Versions.props

@@ -77,7 +77,7 @@
     <Tooling_MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</Tooling_MicrosoftCodeAnalysisTestingVersion>
     <MicrosoftVisualStudioShellPackagesVersion>17.5.0-preview-2-33117-317</MicrosoftVisualStudioShellPackagesVersion>
     <MicrosoftVisualStudioPackagesVersion>17.5.274-preview</MicrosoftVisualStudioPackagesVersion>
-    <RoslynPackageVersion>4.6.0-1.23101.17</RoslynPackageVersion>
+    <RoslynPackageVersion>4.6.0-2.23113.3</RoslynPackageVersion>
     <VisualStudioLanguageServerProtocolVersion>17.6.4-preview</VisualStudioLanguageServerProtocolVersion>
     <MicrosoftNetCompilersToolsetVersion>4.4.0</MicrosoftNetCompilersToolsetVersion>
     <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>$(RoslynPackageVersion)</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
@@ -138,6 +138,7 @@
     <Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.3.4</Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>
     <Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>7.0.0-preview1.22116.1</Tooling_MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
     <MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
+    <MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>
     <MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>
     <MicrosoftCodeAnalysisCommonPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisCommonPackageVersion>
     <MicrosoftCodeAnalysisCSharpPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisCSharpPackageVersion>

src/Compiler/Directory.Packages.props

@@ -10,6 +10,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" Version="$(MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.CSharp" Version="$(MicrosoftCSharpVersion)" />
     <PackageVersion Include="Microsoft.Css.Parser" Version="$(MicrosoftCssParserVersion)" />

src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj

@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+    <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" />
   </ItemGroup>
 
   <ItemGroup>

src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/RazorSourceGenerationOptions.cs

@@ -25,7 +25,7 @@ internal sealed class RazorSourceGenerationOptions : IEquatable<RazorSourceGener
         public LanguageVersion CSharpLanguageVersion { get; set; } = LanguageVersion.CSharp10;
 
         /// <summary>
-        /// Gets a flag that determines if localized component names should be supported.</c>.
+        /// Gets a flag that determines if localized component names should be supported.
         /// </summary>
         public bool SupportLocalizedComponentNames { get; set; } = false;
 

src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/RazorSourceGenerator.cs

@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler;
 
 namespace Microsoft.NET.Sdk.Razor.SourceGenerators
 {
@@ -24,11 +25,11 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             var compilation = context.CompilationProvider;
 
             // determine if we should suppress this run and filter out all the additional files if so
-            var isGeneratorSuppressed = context.AnalyzerConfigOptionsProvider.Select(GetSuppressionStatus);
+            var isGeneratorSuppressed = analyzerConfigOptions.Select(GetSuppressionStatus);
             var additionalTexts = context.AdditionalTextsProvider
-                 .Combine(isGeneratorSuppressed)
-                 .Where(pair => !pair.Right)
-                 .Select((pair, _) => pair.Left);
+                .Combine(isGeneratorSuppressed)
+                .Where(pair => !pair.Right)
+                .Select((pair, _) => pair.Left);
 
             var razorSourceGeneratorOptions = analyzerConfigOptions
                 .Combine(parseOptions)
@@ -68,7 +69,6 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                 .Combine(razorSourceGeneratorOptions)
                 .Select(static (pair, _) =>
                 {
-
                     var ((sourceItem, importFiles), razorSourceGeneratorOptions) = pair;
                     RazorSourceGeneratorEventSource.Log.GenerateDeclarationCodeStart(sourceItem.FilePath);
 
@@ -204,25 +204,38 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                     return allTagHelpers;
                 });
 
-            var generatedOutput = sourceItems
+
+            IncrementalValuesProvider<(string hintName, RazorCodeDocument codeDocument)> codeDocuments(bool designTime) => sourceItems
                 .Combine(importFiles.Collect())
                 .Combine(allTagHelpers)
                 .Combine(razorSourceGeneratorOptions)
-                .Select(static (pair, _) =>
+                .Select((pair, _) =>
                 {
                     var (((sourceItem, imports), allTagHelpers), razorSourceGeneratorOptions) = pair;
 
-                    RazorSourceGeneratorEventSource.Log.RazorCodeGenerateStart(sourceItem.FilePath);
+                    var kind = designTime ? "DesignTime" : "Runtime";
+                    RazorSourceGeneratorEventSource.Log.RazorCodeGenerateStart(sourceItem.FilePath, kind);
 
                     // Add a generated suffix so tools, such as coverlet, consider the file to be generated
                     var hintName = GetIdentifierFromPath(sourceItem.RelativePhysicalPath) + ".g.cs";
 
                     var projectEngine = GetGenerationProjectEngine(allTagHelpers, sourceItem, imports, razorSourceGeneratorOptions);
 
-                    var codeDocument = projectEngine.Process(sourceItem);
+                    var codeDocument = designTime
+                        ? projectEngine.ProcessDesignTime(sourceItem)
+                        : projectEngine.Process(sourceItem);
+
+                    RazorSourceGeneratorEventSource.Log.RazorCodeGenerateStop(sourceItem.FilePath, kind);
+                    return (hintName, codeDocument);
+                });
+
+            var csharpDocuments = codeDocuments(designTime: false)
+                .Select(static (tuple, _) =>
+                {
+                    var (hintName, codeDocument) = tuple;
+
                     var csharpDocument = codeDocument.GetCSharpDocument();
 
-                    RazorSourceGeneratorEventSource.Log.RazorCodeGenerateStop(sourceItem.FilePath);
                     return (hintName, csharpDocument);
                 })
                 .WithLambdaComparer(static (a, b) =>
@@ -236,7 +249,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                     return string.Equals(a.csharpDocument.GeneratedCode, b.csharpDocument.GeneratedCode, StringComparison.Ordinal);
                 }, static a => StringComparer.Ordinal.GetHashCode(a.csharpDocument));
 
-            context.RegisterSourceOutput(generatedOutput, static (context, pair) =>
+            context.RegisterImplementationSourceOutput(csharpDocuments, static (context, pair) =>
             {
                 var (hintName, csharpDocument) = pair;
                 RazorSourceGeneratorEventSource.Log.AddSyntaxTrees(hintName);
@@ -249,6 +262,14 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
                 context.AddSource(hintName, csharpDocument.GeneratedCode);
             });
+
+            var hostOutput = codeDocuments(designTime: true);
+            context.RegisterHostOutput(hostOutput, static (context, tuple, _) =>
+            {
+                var (hintName, codeDocument) = tuple;
+                context.AddOutput(hintName + ".rsg-cs", codeDocument.GetCSharpDocument().GeneratedCode);
+                context.AddOutput(hintName + ".rsg-html", codeDocument.GetHtmlDocument().GeneratedCode);
+            });
         }
     }
 }

src/Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators/RazorSourceGeneratorEventSource.cs

@@ -42,11 +42,11 @@ private RazorSourceGeneratorEventSource() { }
 
         private const int RazorCodeGenerateStartId = 10;
         [Event(RazorCodeGenerateStartId, Level = EventLevel.Informational)]
-        public void RazorCodeGenerateStart(string file) => WriteEvent(RazorCodeGenerateStartId, file);
+        public void RazorCodeGenerateStart(string file, string kind) => WriteEvent(RazorCodeGenerateStartId, file, kind);
 
         private const int RazorCodeGenerateStopId = 11;
         [Event(RazorCodeGenerateStopId, Level = EventLevel.Informational)]
-        public void RazorCodeGenerateStop(string file) => WriteEvent(RazorCodeGenerateStopId, file);
+        public void RazorCodeGenerateStop(string file, string kind) => WriteEvent(RazorCodeGenerateStopId, file, kind);
 
         private const int AddSyntaxTreesId = 12;
         [Event(AddSyntaxTreesId, Level = EventLevel.Informational)]