Skip to content

Commit e204f30

Browse files
DustinCampbellDustinCampbell
authored
Merge pull request #8838 from DustinCampbell/web-tools-shim
Add ExternalAccess package for the legacy ASP .NET Core editor
2 parents 5687c3f + fe05138 commit e204f30

File tree

7 files changed

+84
-1
lines changed

7 files changed

+84
-1
lines changed

‎Directory.Build.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,10 @@
106106
-->
107107
<NoWarn>$(NoWarn);MSB3277</NoWarn>
108108
</PropertyGroup>
109+
110+
<!-- For InternalsVisibleTo items-->
111+
<PropertyGroup Label="Public Keys">
112+
<RazorKey>0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb</RazorKey>
113+
<VisualStudioKey>002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293</VisualStudioKey>
114+
</PropertyGroup>
109115
</Project>

‎Razor.sln‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
179179
EndProject
180180
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.Test", "src\Razor\test\Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.Test\Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.Test.csproj", "{70C6EAF1-202B-481B-ADD4-D30DF1396BDE}"
181181
EndProject
182-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Net.Compilers.Razor.Toolset", "src\Compiler\Microsoft.Net.Compilers.Razor.Toolset\Microsoft.Net.Compilers.Razor.Toolset.csproj", "{6117D32B-DDAE-4654-8260-783B27153E0B}"
182+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Compilers.Razor.Toolset", "src\Compiler\Microsoft.Net.Compilers.Razor.Toolset\Microsoft.Net.Compilers.Razor.Toolset.csproj", "{6117D32B-DDAE-4654-8260-783B27153E0B}"
183+
EndProject
184+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor", "src\Razor\src\Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor\Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj", "{53977089-1A87-4521-8368-0D50DFDA1279}"
185+
EndProject
186+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.Test", "src\Razor\test\Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.Test\Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.Test.csproj", "{C0C2AD17-5F5B-4B11-956D-203D91C377FB}"
183187
EndProject
184188
Global
185189
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -757,6 +761,22 @@ Global
757761
{6117D32B-DDAE-4654-8260-783B27153E0B}.Release|Any CPU.Build.0 = Release|Any CPU
758762
{6117D32B-DDAE-4654-8260-783B27153E0B}.ReleaseNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
759763
{6117D32B-DDAE-4654-8260-783B27153E0B}.ReleaseNoVSIX|Any CPU.Build.0 = Debug|Any CPU
764+
{53977089-1A87-4521-8368-0D50DFDA1279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
765+
{53977089-1A87-4521-8368-0D50DFDA1279}.Debug|Any CPU.Build.0 = Debug|Any CPU
766+
{53977089-1A87-4521-8368-0D50DFDA1279}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
767+
{53977089-1A87-4521-8368-0D50DFDA1279}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
768+
{53977089-1A87-4521-8368-0D50DFDA1279}.Release|Any CPU.ActiveCfg = Release|Any CPU
769+
{53977089-1A87-4521-8368-0D50DFDA1279}.Release|Any CPU.Build.0 = Release|Any CPU
770+
{53977089-1A87-4521-8368-0D50DFDA1279}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
771+
{53977089-1A87-4521-8368-0D50DFDA1279}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
772+
{C0C2AD17-5F5B-4B11-956D-203D91C377FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
773+
{C0C2AD17-5F5B-4B11-956D-203D91C377FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
774+
{C0C2AD17-5F5B-4B11-956D-203D91C377FB}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
775+
{C0C2AD17-5F5B-4B11-956D-203D91C377FB}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
776+
{C0C2AD17-5F5B-4B11-956D-203D91C377FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
777+
{C0C2AD17-5F5B-4B11-956D-203D91C377FB}.Release|Any CPU.Build.0 = Release|Any CPU
778+
{C0C2AD17-5F5B-4B11-956D-203D91C377FB}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
779+
{C0C2AD17-5F5B-4B11-956D-203D91C377FB}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
760780
EndGlobalSection
761781
GlobalSection(SolutionProperties) = preSolution
762782
HideSolutionNode = FALSE
@@ -840,6 +860,8 @@ Global
840860
{2FB4801C-A083-4F08-A4FB-C4910985DE31} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
841861
{70C6EAF1-202B-481B-ADD4-D30DF1396BDE} = {92463391-81BE-462B-AC3C-78C6C760741F}
842862
{6117D32B-DDAE-4654-8260-783B27153E0B} = {AA4EE974-E765-4B97-AF35-F734BF9830F6}
863+
{53977089-1A87-4521-8368-0D50DFDA1279} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
864+
{C0C2AD17-5F5B-4B11-956D-203D91C377FB} = {92463391-81BE-462B-AC3C-78C6C760741F}
843865
EndGlobalSection
844866
GlobalSection(ExtensibilityGlobals) = postSolution
845867
SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26}

‎src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>$(DefaultNetFxTargetFramework)</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<NonShipping>true</NonShipping>
8+
9+
<!-- Ensure we run our custom target, below, to copy project references into the NuGet package.
10+
Note: This is a temporary measure to aid in development. Once the Web Tools is no longer
11+
using types from any of the references of this ExternalAccess package, this will be removed. -->
12+
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj" PrivateAssets="All" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.Test" Key="$(RazorKey)" />
21+
<InternalsVisibleTo Include="Microsoft.WebTools.Languages.Razor.Core" Key="$(VisualStudioKey)" />
22+
</ItemGroup>
23+
24+
<Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
25+
<ItemGroup>
26+
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
27+
</ItemGroup>
28+
</Target>
29+
30+
</Project>

‎src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@
193193
<ProjectReference Include="$(SharedSourceRoot)\Microsoft.AspNetCore.Razor.Utilities.Shared\Microsoft.AspNetCore.Razor.Utilities.Shared.csproj">
194194
<AdditionalProperties>TargetFramework=$(DefaultNetFxTargetFramework)</AdditionalProperties>
195195
</ProjectReference>
196+
<ProjectReference Include="..\Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor\Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj" />
196197

197198
<ProjectReference Include="..\Microsoft.AspNetCore.Razor.LanguageServer\Microsoft.AspNetCore.Razor.LanguageServer.csproj">
198199
<AdditionalProperties>TargetFramework=$(DefaultNetFxTargetFramework)</AdditionalProperties>

‎src/Razor/src/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@
7878
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.VisualStudio.LanguageServer.ContainedLanguage.dll" />
7979
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.VisualStudio.LanguageServer.ContainedLanguage.dll" />
8080
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Razor.ProjectEngineHost.dll" />
81+
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.dll" />
82+
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.dll" />
8183
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.NET.Sdk.Razor.SourceGenerators.dll" />
8284
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.CodeAnalysis.Razor.dll" />
8385
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />

‎src/Razor/test/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.Test/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.Test.csproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>$(DefaultNetFxTargetFramework)</TargetFrameworks>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
9+
<Compile Include="..\OSSkipConditionFactAttribute.cs" LinkBase="Shared" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor\Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.csproj" />
14+
<ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" />
15+
</ItemGroup>
16+
17+
</Project>

‎src/Razor/test/Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.Test/xunit.runner.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"methodDisplay": "method",
3+
"shadowCopy": false,
4+
"parallelizeTestCollections": false
5+
}

0 commit comments

Comments
 (0)