未验证 提交 f9f177c8 编写于 作者: S Srivatsn Narayanan 提交者: GitHub

Merge pull request #22899 from dotnet/features/remotels2

Port changes from features/remotels to post-dev15.5.-contrib
......@@ -34,6 +34,9 @@
<InternalsVisibleToRazor>
<Visible>false</Visible>
</InternalsVisibleToRazor>
<InternalsVisibleToRemoteLS>
<Visible>false</Visible>
</InternalsVisibleToRemoteLS>
</ItemDefinitionGroup>
<PropertyGroup Condition="'$(PublicKey)' != '' AND '$(SignAssembly)' == 'True'">
......@@ -49,7 +52,7 @@
Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFile)"
Outputs="$(GeneratedInternalsVisibleToFile)"
DependsOnTargets="PrepareForBuild"
Condition="'@(InternalsVisibleTo)' != '' OR '@(InternalsVisibleToTest)' != '' OR '@(InternalsVisibleToTypeScript)' != '' OR '@(InternalsVisibleToVisualStudio)' != '' OR '@(InternalsVisibleToFSharp)' != '' OR '@(InternalsVisibleToMoq)' != '' OR '@(InternalsVisibleToRazor)' != '' OR '@(InternalsVisibleToMonodevelop)' != ''">
Condition="'@(InternalsVisibleTo)' != '' OR '@(InternalsVisibleToTest)' != '' OR '@(InternalsVisibleToTypeScript)' != '' OR '@(InternalsVisibleToRemoteLS)' != '' OR '@(InternalsVisibleToVisualStudio)' != '' OR '@(InternalsVisibleToFSharp)' != '' OR '@(InternalsVisibleToMoq)' != '' OR '@(InternalsVisibleToRazor)' != '' OR '@(InternalsVisibleToMonodevelop)' != ''">
<!--
This is a slightly evil trick. What we have is a group of InternalsVisibleTo items which
......@@ -82,6 +85,11 @@
Condition="'@(InternalsVisibleToTypeScript)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleToRemoteLS.Identity), PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293"
Condition="'@(InternalsVisibleToRemoteLS)' != ''">
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
</CreateItem>
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
AdditionalMetadata="_Parameter1=%(InternalsVisibleToVisualStudio.Identity), PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293"
Condition="'@(InternalsVisibleToVisualStudio)' != ''">
......
......@@ -106,6 +106,8 @@
<InternalsVisibleToTypeScript Include="Microsoft.VisualStudio.LanguageServices.TypeScript" />
<InternalsVisibleToTypeScript Include="Microsoft.Test.Apex.VisualStudio" />
<InternalsVisibleToTypeScript Include="Roslyn.Services.Editor.TypeScript.UnitTests" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp" />
<InternalsVisibleToFSharp Include="FSharp.Editor" />
<InternalsVisibleToMoq Include="DynamicProxyGenAssembly2" />
</ItemGroup>
......
......@@ -42,6 +42,8 @@
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures" />
<InternalsVisibleToTypeScript Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" />
<InternalsVisibleToTypeScript Include="Microsoft.VisualStudio.LanguageServices.TypeScript" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp" />
<InternalsVisibleToFSharp Include="FSharp.Editor" />
<InternalsVisibleToFSharp Include="FSharp.LanguageService" />
<!-- The rest are for test purposes only. -->
......
......@@ -79,7 +79,8 @@ public async Task AnalyzeSyntaxAsync(Document document, InvocationReasons reason
{
// right now, there is no way to observe diagnostics for closed file.
if (!_workspace.IsDocumentOpen(document.Id) ||
!_workspace.Options.GetOption(InternalRuntimeDiagnosticOptions.Syntax))
!_workspace.Options.GetOption(InternalRuntimeDiagnosticOptions.Syntax) ||
!document.SupportsSyntaxTree)
{
return;
}
......
......@@ -77,6 +77,8 @@
<InternalsVisibleToTypeScript Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" />
<InternalsVisibleToTypeScript Include="Microsoft.VisualStudio.LanguageServices.TypeScript" />
<InternalsVisibleToTypeScript Include="Roslyn.Services.Editor.TypeScript.UnitTests" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp" />
<InternalsVisibleToFSharp Include="FSharp.Editor" />
<InternalsVisibleToMoq Include="DynamicProxyGenAssembly2" />
<InternalsVisibleToVisualStudio Include="Microsoft.Test.Apex.VisualStudio" />
......
......@@ -132,6 +132,8 @@
<InternalsVisibleToTypeScript Include="ManagedSourceCodeAnalysis" />
<InternalsVisibleToTypeScript Include="CodeAnalysis" />
<InternalsVisibleToTypeScript Include="StanCore" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp" />
<InternalsVisibleToFSharp Include="FSharp.Editor" />
<InternalsVisibleToFSharp Include="FSharp.LanguageService" />
</ItemGroup>
......
......@@ -40,6 +40,8 @@
<InternalsVisibleToTest Include="Roslyn.VisualStudio.Test.Utilities2" />
<InternalsVisibleToTypeScript Include="Microsoft.VisualStudio.LanguageServices.TypeScript" />
<InternalsVisibleToTypeScript Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp" />
<InternalsVisibleToFSharp Include="FSharp.Editor" />
<InternalsVisibleToFSharp Include="FSharp.LanguageService" />
</ItemGroup>
......
......@@ -284,6 +284,8 @@
<InternalsVisibleToTypeScript Include="Microsoft.CodeAnalysis.TypeScript.EditorFeatures" />
<InternalsVisibleToTypeScript Include="Microsoft.VisualStudio.LanguageServices.TypeScript" />
<InternalsVisibleToTypeScript Include="Roslyn.Services.Editor.TypeScript.UnitTests" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote" />
<InternalsVisibleToRemoteLS Include="Microsoft.VisualStudio.LanguageServices.Remote.CSharp" />
<InternalsVisibleToMoq Include="DynamicProxyGenAssembly2" />
</ItemGroup>
<ItemGroup>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册