N. Taylor Mullen 5c456fbd04 Merge branch 'rel/vs15.7' into dev ... # Conflicts: # build/dependencies.props # src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshot.cs # src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotManager.cs # src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotWorker.cs # src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectSnapshotWorkerFactory.cs # src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs # src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshotUpdateContext.cs # src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioDocumentTracker.cs # src/Microsoft.VisualStudio.LanguageServices.Razor/Legacy/LegacyTagHelperResolver.cs # src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj # src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorConfiguration.cs # src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorExtension.cs # src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorGeneral.cs # src/Microsoft.VisualStudio.LanguageServices.Razor/ProjectSystem/Rules/RazorProjectProperties.cs # test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultProjectSnapshotTest.cs # test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj		2018-03-05 22:58:07 -08:00
..
Infrastructure	…
BraceSmartIndenterIntegrationTest.cs	…
BraceSmartIndenterTest.cs	…
BraceSmartIndenterTestBase.cs	…
DefaultCodeDocumentProviderTest.cs	…
DefaultEditorSettingsManagerTest.cs	…
DefaultImportDocumentManagerIntegrationTest.cs	Merge branch 'rel/vs15.7' into dev	2018-03-05 22:58:07 -08:00
DefaultImportDocumentManagerTest.cs	Merge branch 'rel/vs15.7' into dev	2018-03-05 22:58:07 -08:00
DefaultProjectEngineFactoryServiceTest.cs	Merge branch 'rel/vs15.7' into dev	2018-03-05 22:58:07 -08:00
DefaultRazorDocumentManagerTest.cs	…
DefaultRazorEditorFactoryServiceTest.cs	…
DefaultRazorIndentationFactsServiceTest.cs	…
DefaultRazorSyntaxFactsServiceTest.cs	…
DefaultTagHelperCompletionServiceTest.cs	…
DefaultTagHelperFactsServiceTest.cs	…
DefaultTextBufferCodeDocumentProviderTest.cs	…
DefaultTextBufferProviderTest.cs	…
DefaultVisualStudioDocumentTrackerTest.cs	Merge branch 'rel/vs15.7' into dev	2018-03-05 22:58:07 -08:00
DefaultVisualStudioRazorParserIntegrationTest.cs	Changed AddDefaultImports to take strings instead of project items.	2018-02-21 09:42:40 -08:00
DefaultVisualStudioRazorParserTest.cs	…
DefaultWorkspaceEditorSettingsTest.cs	…
Microsoft.VisualStudio.Editor.Razor.Test.csproj	Merge branch 'rel/vs15.7' into dev	2018-03-05 22:58:07 -08:00
RazorDirectiveCompletionProviderTest.cs	…
RazorSyntaxFactsServiceExtensionsTest.cs	…
RazorSyntaxTreePartialParserTest.cs	Changed AddDefaultImports to take strings instead of project items.	2018-02-21 09:42:40 -08:00
RazorTextViewConnectionListenerTest.cs	…
TextContentChangedEventArgsExtensionsTest.cs	…
xunit.runner.json	…