Skip to content

Commit d09cc3f

Browse files
committed
Merge remote-tracking branch 'upstream/main' into FixComponentPropertiesWithSuffixes
2 parents 72281e7 + 3f8828c commit d09cc3f

File tree

571 files changed

+2069
-5063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

571 files changed

+2069
-5063
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
]
1010
}
1111
}
12-
}
12+
}

Razor.sln

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
172172
EndProject
173173
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.ExternalAccess.OmniSharp", "src\Razor\src\Microsoft.AspNetCore.Razor.ExternalAccess.OmniSharp\Microsoft.AspNetCore.Razor.ExternalAccess.OmniSharp.csproj", "{3E2B6DF5-524F-4909-8A66-7F8C6383620A}"
174174
EndProject
175+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace", "src\Razor\src\Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace\Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj", "{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}"
176+
EndProject
177+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.ProjectEngineHost", "src\Razor\src\Microsoft.AspNetCore.Razor.ProjectEngineHost\Microsoft.AspNetCore.Razor.ProjectEngineHost.csproj", "{2FB4801C-A083-4F08-A4FB-C4910985DE31}"
178+
EndProject
175179
Global
176180
GlobalSection(SolutionConfigurationPlatforms) = preSolution
177181
Debug|Any CPU = Debug|Any CPU
@@ -716,6 +720,22 @@ Global
716720
{3E2B6DF5-524F-4909-8A66-7F8C6383620A}.Release|Any CPU.Build.0 = Release|Any CPU
717721
{3E2B6DF5-524F-4909-8A66-7F8C6383620A}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
718722
{3E2B6DF5-524F-4909-8A66-7F8C6383620A}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
723+
{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
724+
{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
725+
{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
726+
{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
727+
{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
728+
{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}.Release|Any CPU.Build.0 = Release|Any CPU
729+
{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
730+
{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
731+
{2FB4801C-A083-4F08-A4FB-C4910985DE31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
732+
{2FB4801C-A083-4F08-A4FB-C4910985DE31}.Debug|Any CPU.Build.0 = Debug|Any CPU
733+
{2FB4801C-A083-4F08-A4FB-C4910985DE31}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
734+
{2FB4801C-A083-4F08-A4FB-C4910985DE31}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
735+
{2FB4801C-A083-4F08-A4FB-C4910985DE31}.Release|Any CPU.ActiveCfg = Release|Any CPU
736+
{2FB4801C-A083-4F08-A4FB-C4910985DE31}.Release|Any CPU.Build.0 = Release|Any CPU
737+
{2FB4801C-A083-4F08-A4FB-C4910985DE31}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
738+
{2FB4801C-A083-4F08-A4FB-C4910985DE31}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
719739
EndGlobalSection
720740
GlobalSection(SolutionProperties) = preSolution
721741
HideSolutionNode = FALSE
@@ -795,6 +815,8 @@ Global
795815
{A9F9B5E5-C5C2-4860-BE56-038C70ADBAC9} = {FB7C870E-A173-4F75-BE63-4EF39C79A759}
796816
{7400A168-2552-49C7-93E3-D4DAA90C216F} = {C2C98051-0F39-47F2-80B6-E72B29159F2C}
797817
{3E2B6DF5-524F-4909-8A66-7F8C6383620A} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
818+
{2223B8FD-D98A-47BE-94A9-6A3A6B8557B8} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
819+
{2FB4801C-A083-4F08-A4FB-C4910985DE31} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
798820
EndGlobalSection
799821
GlobalSection(ExtensibilityGlobals) = postSolution
800822
SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26}

docs/ProjectsAndLayering.md

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,49 @@
1-
# Layers
2-
3-
## Product Layers
1+
# Product Layers
2+
3+
## High Level Overview
4+
5+
![Layers](./overview.svg)
6+
7+
<details>
8+
Created with https://www.sankeymatic.com/build/
9+
10+
Input:
11+
```
12+
OmniSharp [1] MS.AspNetCore.Razor.LanguageServer.Common
13+
RoslynWorkspace [1] ProjectEngineHost
14+
MS.AspNetCore.Razor.LanguageServer [1] MS.AspNetCore.Razor.LanguageServer.Common
15+
MS.AspNetCore.Razor.LanguageServer.Common [1] Compiler
16+
MS.AspNetCore.Razor.LanguageServer.Common [1] Workspaces
17+
ProjectEngineHost [1] Compiler
18+
Workspaces [1] Compiler
19+
Workspaces [1] ProjectEngineHost
20+
OOP Tag Helper Discovery [1] Workspaces
21+
MS.VS.Editor.Razor [1] Workspaces
22+
MS.VS.LanguageServerClient.Razor [1] MS.AspNetCore.Razor.LanguageServer
23+
MS.VS.LanguageServerClient.Razor [1] MS.AspNetCore.Razor.LanguageServer.Common
24+
MS.VS.LanguageServerClient.Razor [1] Workspaces
25+
MS.VS.LanguageServerClient.Razor [1] MS.VS.Editor.Razor
26+
MS.VS.LanguageServerClient.Razor [1] ContainedLanguage
27+
LanguageServices.VS [1] MS.VS.Editor.Razor
28+
LiveShare [1] MS.VS.Editor.Razor
29+
Mac.LanguageServices [1] MS.VS.Editor.Razor
30+
VS Mac [1] Compiler
31+
VS Mac [1] MS.VS.LanguageServerClient.Razor
32+
VS Mac [1] Mac.LanguageServices
33+
VS [1] MS.AspNetCore.Razor.LanguageServer
34+
VS [1] MS.AspNetCore.Razor.LanguageServer.Common
35+
VS [1] Workspaces
36+
VS [1] OOP Tag Helper Discovery
37+
VS [1] MS.VS.Editor.Razor
38+
VS [1] ContainedLanguage
39+
VS [1] MS.VS.LanguageServerClient.Razor
40+
VS [1] LanguageServices.VS
41+
VS [1] LiveShare
42+
rzls [1] MS.AspNetCore.Razor.LanguageServer
43+
```
44+
</details>
45+
46+
## Details
447

548
### Shared
649

@@ -28,6 +71,7 @@ target the broadest set of frameworks.
2871

2972
- Target Framework: `net8.0;netstandard2.0;net472`
3073
- Projects:
74+
- Microsoft.AspNetCore.Razor.ProjectEngineHost
3175
- Microsoft.CodeAnalysis.Razor.Workspaces
3276

3377
### Razor Language Server
@@ -77,6 +121,12 @@ target the broadest set of frameworks.
77121
- Microsoft.AspNetCore.Razor.OmniSharpPlugin
78122
- Microsoft.AspNetCore.Razor.ExternalAccess.OmniSharp
79123

124+
### Miscellaneous / Test hosting
125+
126+
- Target Framework: net7.0
127+
- Projects:
128+
- Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace
129+
80130
## Testing Layers
81131

82132
### Shared test infra

0 commit comments

Comments
 (0)