Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ExternalAccess package for the legacy ASP .NET Core editor #8838

Merged
merged 3 commits into from
Jun 21, 2023
Merged

Add ExternalAccess package for the legacy ASP .NET Core editor #8838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b82d9a1
Add ExternalAccess package for the legacy ASP .NET Core editor
DustinCampbell Jun 6, 2023
c89e27c
Rename external access from 'WebTools' to 'LegacyEditor'
DustinCampbell Jun 20, 2023
fe05138
Add test project for ExternalAccess.LegacyEditor
DustinCampbell Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,9 @@
-->
<NoWarn>$(NoWarn);MSB3277</NoWarn>
</PropertyGroup>

<!-- For InternalsVisibleTo items-->
<PropertyGroup Label="Public Keys">
<VisualStudioKey>002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293</VisualStudioKey>
</PropertyGroup>
</Project>
11 changes: 11 additions & 0 deletions Razor.sln
View file
Open in desktop
DustinCampbell marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
EndProject
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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Razor.ExternalAccess.WebTools", "src\Razor\src\Microsoft.AspNetCore.Razor.ExternalAccess.WebTools\Microsoft.AspNetCore.Razor.ExternalAccess.WebTools.csproj", "{53977089-1A87-4521-8368-0D50DFDA1279}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -757,6 +759,14 @@ Global
{6117D32B-DDAE-4654-8260-783B27153E0B}.Release|Any CPU.Build.0 = Release|Any CPU
{6117D32B-DDAE-4654-8260-783B27153E0B}.ReleaseNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
{6117D32B-DDAE-4654-8260-783B27153E0B}.ReleaseNoVSIX|Any CPU.Build.0 = Debug|Any CPU
{53977089-1A87-4521-8368-0D50DFDA1279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53977089-1A87-4521-8368-0D50DFDA1279}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53977089-1A87-4521-8368-0D50DFDA1279}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
{53977089-1A87-4521-8368-0D50DFDA1279}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
{53977089-1A87-4521-8368-0D50DFDA1279}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53977089-1A87-4521-8368-0D50DFDA1279}.Release|Any CPU.Build.0 = Release|Any CPU
{53977089-1A87-4521-8368-0D50DFDA1279}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
{53977089-1A87-4521-8368-0D50DFDA1279}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -840,6 +850,7 @@ Global
{2FB4801C-A083-4F08-A4FB-C4910985DE31} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
{70C6EAF1-202B-481B-ADD4-D30DF1396BDE} = {92463391-81BE-462B-AC3C-78C6C760741F}
{6117D32B-DDAE-4654-8260-783B27153E0B} = {AA4EE974-E765-4B97-AF35-F734BF9830F6}
{53977089-1A87-4521-8368-0D50DFDA1279} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26}
Expand Down
29 changes: 29 additions & 0 deletions ...e.Razor.ExternalAccess.WebTools/Microsoft.AspNetCore.Razor.ExternalAccess.WebTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(DefaultNetFxTargetFramework)</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<NonShipping>true</NonShipping>

<!-- Ensure we run our custom target, below, to copy project references into the NuGet package.
Note: This is a temporary measure to aid in development. Once the Web Tools is no longer
using types from any of the references of this ExternalAccess package, this will be removed. -->
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Editor.Razor\Microsoft.VisualStudio.Editor.Razor.csproj" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="Microsoft.WebTools.Languages.Razor.Core" Key="$(VisualStudioKey)" />
</ItemGroup>

<Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
<ItemGroup>
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
</ItemGroup>
</Target>

</Project>
1 change: 1 addition & 0 deletions ...or/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
<ProjectReference Include="$(SharedSourceRoot)\Microsoft.AspNetCore.Razor.Utilities.Shared\Microsoft.AspNetCore.Razor.Utilities.Shared.csproj">
<AdditionalProperties>TargetFramework=$(DefaultNetFxTargetFramework)</AdditionalProperties>
</ProjectReference>
<ProjectReference Include="..\Microsoft.AspNetCore.Razor.ExternalAccess.WebTools\Microsoft.AspNetCore.Razor.ExternalAccess.WebTools.csproj" />

<ProjectReference Include="..\Microsoft.AspNetCore.Razor.LanguageServer\Microsoft.AspNetCore.Razor.LanguageServer.csproj">
<AdditionalProperties>TargetFramework=$(DefaultNetFxTargetFramework)</AdditionalProperties>
Expand Down
2 changes: 2 additions & 0 deletions src/Razor/src/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.VisualStudio.LanguageServer.ContainedLanguage.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.VisualStudio.LanguageServer.ContainedLanguage.dll" />
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Razor.ProjectEngineHost.dll" />
<Asset Type="Microsoft.VisualStudio.Assembly" Path="Microsoft.AspNetCore.Razor.ExternalAccess.WebTools.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.AspNetCore.Razor.ExternalAccess.WebTools.dll" />
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.NET.Sdk.Razor.SourceGenerators.dll" />
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.CodeAnalysis.Razor.dll" />
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
Expand Down