huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rel/vs15.8' into dev

This commit is contained in:
N. Taylor Mullen 2018-05-21 10:39:34 -07:00
parent 4ac8b21978 e8c8396298
commit 59baad17da
6 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/VSIX.targets
View File

@ -102,6 +102,8 @@
/p:TargetVSIXContainer=$(VSIXOutputPath); /p:TargetVSIXContainer=$(VSIXOutputPath);
/p:SymbolsPublishDir=$(BuildDir); /p:SymbolsPublishDir=$(BuildDir);
/p:Configuration=$(Configuration); /p:Configuration=$(Configuration);
/p:FeatureBranchVersionSuffix=$(FeatureBranchVersionSuffix);
/p:BuildNumber=$(BuildNumber);
/p:LangVersion=7.1" /> /p:LangVersion=7.1" />
</ItemGroup> </ItemGroup>

20
build/dependencies.props
View File

@ -47,16 +47,16 @@
<SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion> <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
<SystemValueTuplePackageVersion>4.6.0-preview1-26508-04</SystemValueTuplePackageVersion> <SystemValueTuplePackageVersion>4.6.0-preview1-26508-04</SystemValueTuplePackageVersion>
<VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion> <VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
<VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.8.0</VSIX_MicrosoftCodeAnalysisCommonPackageVersion> <VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCommonPackageVersion>
<VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>2.8.0</VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion> <VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0</VSIX_MicrosoftCodeAnalysisCSharpPackageVersion> <VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCSharpPackageVersion>
<VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.8.0</VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> <VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.8.0</VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion> <VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>2.8.0-beta2-62721-09</VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion> <VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>
<VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.8.0</VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion> <VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.8.0</VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion> <VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>2.8.0</VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion> <VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion>
<VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>2.8.0-beta2-62721-09</VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion> <VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>
<XunitAnalyzersPackageVersion>0.8.0</XunitAnalyzersPackageVersion> <XunitAnalyzersPackageVersion>0.8.0</XunitAnalyzersPackageVersion>
<XunitPackageVersion>2.3.1</XunitPackageVersion> <XunitPackageVersion>2.3.1</XunitPackageVersion>
<XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion> <XunitRunnerVisualStudioPackageVersion>2.4.0-beta.1.build3945</XunitRunnerVisualStudioPackageVersion>

2
korebuild.json
View File

@ -5,7 +5,7 @@
"visualstudio": { "visualstudio": {
"required": false, "required": false,
"includePrerelease": true, "includePrerelease": true,
"versionRange": "[15.0.26730.03, 15.9)", "versionRange": "[15.0.26730.03, 15.8)",
"requiredWorkloads": [ "requiredWorkloads": [
"Microsoft.VisualStudio.Component.VSSDK" "Microsoft.VisualStudio.Component.VSSDK"
] ]

3
src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs
View File

@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Razor.Language.Legacy;
using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Completion; using Microsoft.CodeAnalysis.Completion;
using Microsoft.CodeAnalysis.Razor; using Microsoft.CodeAnalysis.Razor;
using Microsoft.CodeAnalysis.Tags;
using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Text;
using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Projection; using Microsoft.VisualStudio.Text.Projection;
@ -139,7 +140,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
// This groups all Razor directives together // This groups all Razor directives together
sortText: "_RazorDirective_", sortText: "_RazorDirective_",
rules: CompletionItemRules.Create(formatOnCommit: false), rules: CompletionItemRules.Create(formatOnCommit: false),
tags: ImmutableArray.Create(CompletionTags.Intrinsic), tags: ImmutableArray.Create(WellKnownTags.Intrinsic),
properties: propertyDictionary.ToImmutableDictionary()); properties: propertyDictionary.ToImmutableDictionary());
completionItems.Add(completionItem); completionItems.Add(completionItem);
} }

26
src/Microsoft.VisualStudio.LanguageServices.Razor/OOPTagHelperResolverFactory.cs
View File

@ -16,36 +16,10 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
{ {
public ILanguageService CreateLanguageService(HostLanguageServices languageServices) public ILanguageService CreateLanguageService(HostLanguageServices languageServices)
{ {
if (!IsRemoteClientWorking())
{
return new DefaultTagHelperResolver();
}
return new OOPTagHelperResolver( return new OOPTagHelperResolver(
languageServices.WorkspaceServices.GetRequiredService<ProjectSnapshotProjectEngineFactory>(), languageServices.WorkspaceServices.GetRequiredService<ProjectSnapshotProjectEngineFactory>(),
languageServices.WorkspaceServices.GetRequiredService<ErrorReporter>(), languageServices.WorkspaceServices.GetRequiredService<ErrorReporter>(),
languageServices.WorkspaceServices.Workspace); languageServices.WorkspaceServices.Workspace);
} }
[MethodImpl(MethodImplOptions.NoInlining)]
private bool IsRemoteClientWorking()
{
try
{
LoadType();
return true;
}
catch (Exception)
{
return false;
}
}
[MethodImpl(MethodImplOptions.NoInlining)]
private void LoadType()
{
// During 15.8 Roslyn renamed our OOP client from RazorLangaugeServiceClient to RazorLanguageServiceClient.
GC.KeepAlive(typeof(RazorLangaugeServiceClient));
}
} }
} }

3
test/Microsoft.VisualStudio.Editor.Razor.Test/RazorDirectiveCompletionProviderTest.cs
View File

@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Razor.Language.Legacy;
using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Completion; using Microsoft.CodeAnalysis.Completion;
using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Options;
using Microsoft.CodeAnalysis.Tags;
using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.Text;
using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text;
using Moq; using Moq;
@ -289,7 +290,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
Assert.Equal("_RazorDirective_", item.SortText); Assert.Equal("_RazorDirective_", item.SortText);
Assert.False(item.Rules.FormatOnCommit); Assert.False(item.Rules.FormatOnCommit);
var tag = Assert.Single(item.Tags); var tag = Assert.Single(item.Tags);
Assert.Equal(CompletionTags.Intrinsic, tag); Assert.Equal(WellKnownTags.Intrinsic, tag);
} }
private static Lazy<RazorCodeDocumentProvider> CreateCodeDocumentProvider(string text, IEnumerable<DirectiveDescriptor> directives) private static Lazy<RazorCodeDocumentProvider> CreateCodeDocumentProvider(string text, IEnumerable<DirectiveDescriptor> directives)