Unify app and view assembly for Razor #16168
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label. |
captainsafia
added
the
Area-AspNetCore
captainsafia
force-pushed
the
safia/one-assembly
branch
2 times, most recently
from
cc09a68
to
e3dbd15
Compare
captainsafia
force-pushed
the
safia/one-assembly
branch
from
7827f7c
to
68c5bd1
Compare
pranavkm
reviewed
Mar 5, 2021
src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Compilation.targets
Outdated
Show resolved
Hide resolved
|
|
||
| RazorCoreCompile and any other targets that are needed for two-step compilation should be defined there. | ||
| --> | ||
| <Import Project="Microsoft.NET.Sdk.Razor.Compilation.targets" Condition="'$(_UseRazorSourceGenerator)' != 'true'"/> |
There was a problem hiding this comment.
Is there any fun stuff in here (properties or items) that requires it to be imported where it was previously imported? For .e.g
<!-- <Import Project="X.target" /> -->
<PropertyGroup>
<Foo>X</Foo>
</PropertyGroup>
<!-- <Import Project="Y.targets" /> -->
<PropertyGroup>
<Foo>$(Foo);X</Foo>
</PropertyGroup>
Would behave differently if you change the order in which X and Y are imported.
src/Tests/Microsoft.NET.Sdk.Razor.Tests/BuildIncrementalismTest.cs
Outdated
Show resolved
Hide resolved
src/Tests/Microsoft.NET.Sdk.Razor.Tests/BuildIncrementalismTest.cs
Outdated
Show resolved
Hide resolved
| @@ -78,9 +86,18 @@ private void GenerateViews(GeneratorExecutionContext context, RazorSourceGenerat | |||
| context.ReportDiagnostic(csharpDiagnostic); | |||
| } | |||
|
|
|||
| Directory.CreateDirectory(Path.GetDirectoryName(file.GeneratedOutputPath)); | |||
| File.WriteAllText(file.GeneratedOutputPath, csharpDocument.GeneratedCode); | |||
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
pranavkm
approved these changes
Mar 9, 2021
| @@ -221,6 +240,13 @@ private static IReadOnlyList<TagHelperDescriptor> GetTagHelperDescriptorsFromRef | |||
| return tagHelperDescriptors; | |||
| } | |||
|
|
|||
| private static void PopulateAssemblyInfo(GeneratorExecutionContext context) | |||
| { | |||
| var typeInfo = "typeof(global::Microsoft.AspNetCore.Mvc.ApplicationParts.ConsolidatedAssemblyApplicationPartFactory), global::Microsoft.AspNetCore.Mvc.Razor"; | |||
There was a problem hiding this comment.
You shouldn't need this: , global::Microsoft.AspNetCore.Mvc.Razor
pranavkm
reviewed
Mar 9, 2021
| { | ||
| var typeInfo = "typeof(global::Microsoft.AspNetCore.Mvc.ApplicationParts.ConsolidatedAssemblyApplicationPartFactory), global::Microsoft.AspNetCore.Mvc.Razor"; | ||
| var assemblyInfo = $@"[assembly: global::Microsoft.AspNetCore.Mvc.ApplicationParts.ProvideApplicationPartFactoryAttribute(""{typeInfo}"")]"; | ||
| context.AddSource($"{context.Compilation.AssemblyName}.UnifiedAssembly.Info", SourceText.From(assemblyInfo, Encoding.UTF8)); |
There was a problem hiding this comment.
Btw, this one is ripe for being statically cached
captainsafia
force-pushed
the
safia/one-assembly
branch
from
486a71a
to
33a5d18
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.