diff --git a/azure-pipelines-integration-scouting.yml b/azure-pipelines-integration-scouting.yml index 346f4dbfe0d38..2c95d62c434db 100644 --- a/azure-pipelines-integration-scouting.yml +++ b/azure-pipelines-integration-scouting.yml @@ -9,6 +9,7 @@ schedules: branches: include: - main + exclude: - main-vs-deps variables: diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml index afddf6a20c094..c3d9607fa8cca 100644 --- a/azure-pipelines-integration.yml +++ b/azure-pipelines-integration.yml @@ -3,11 +3,12 @@ trigger: branches: include: - main - - main-vs-deps - release/* - features/* - demos/* exclude: + - main-vs-deps + - release/dev18.0 # Since the version of VS on the integration VM images are a moving target, # we are unable to reliably run integration tests on servicing branches. - release/dev17.8 @@ -19,11 +20,11 @@ pr: branches: include: - main - - main-vs-deps - release/* - features/* - demos/* exclude: + - main-vs-deps # Since the version of VS on the integration VM images are a moving target, # we are unable to reliably run integration tests on servicing branches. - release/dev17.8 diff --git a/eng/Versions.props b/eng/Versions.props index 1b9a360b33402..4e753f3df38a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,9 +6,9 @@ --> 4 - 14 + 15 0 - 3 + 1 $(MajorVersion).$(MinorVersion).$(PatchVersion) + + + + + + @@ -42,7 +54,6 @@ - diff --git a/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/TestEnvironment.vb b/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/TestEnvironment.vb index bde25c3691429..882c0cb290ff9 100644 --- a/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/TestEnvironment.vb +++ b/src/VisualStudio/TestUtilities2/ProjectSystemShim/Framework/TestEnvironment.vb @@ -63,7 +63,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests.ProjectSystemShim.Fr GetType(CPSProjectFactory), GetType(VisualStudioRuleSetManagerFactory), GetType(VisualStudioMetadataServiceFactory), - GetType(VisualStudioMetadataReferenceManagerFactory), + GetType(VisualStudioMetadataReferenceManager), GetType(MockWorkspaceEventListenerProvider), GetType(HierarchyItemToProjectIdMap), GetType(DiagnosticAnalyzerService)) diff --git a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicPackage.vb b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicPackage.vb index 3df609cae372b..ed4859ac01a77 100644 --- a/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicPackage.vb +++ b/src/VisualStudio/VisualBasic/Impl/LanguageService/VisualBasicPackage.vb @@ -3,7 +3,6 @@ ' See the LICENSE file in the project root for more information. Imports System.Runtime.InteropServices -Imports System.Threading Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.ErrorReporting Imports Microsoft.CodeAnalysis.Options @@ -64,23 +63,29 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic _comAggregate = Implementation.Interop.ComAggregate.CreateAggregatedObject(Me) End Sub - Protected Overrides Async Function InitializeAsync(cancellationToken As CancellationToken, progress As IProgress(Of ServiceProgressData)) As Task - Try - Await MyBase.InitializeAsync(cancellationToken, progress).ConfigureAwait(True) - Await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken) - - RegisterLanguageService(GetType(IVbCompilerService), Function() Task.FromResult(_comAggregate)) - - RegisterService(Of IVbTempPECompilerFactory)( - Async Function(ct) - Dim workspace = Me.ComponentModel.GetService(Of VisualStudioWorkspace)() - Await JoinableTaskFactory.SwitchToMainThreadAsync(ct) - Return New TempPECompilerFactory(workspace) - End Function) - Catch ex As Exception When FatalError.ReportAndPropagateUnlessCanceled(ex) - Throw ExceptionUtilities.Unreachable - End Try - End Function + Protected Overrides Sub RegisterInitializationWork(packageRegistrationTasks As PackageRegistrationTasks) + + MyBase.RegisterInitializationWork(packageRegistrationTasks) + + packageRegistrationTasks.AddTask( + isMainThreadTask:=False, + task:=Function(progress, packageRegistrationTasks2, cancellationToken) As Task + Try + RegisterLanguageService(GetType(IVbCompilerService), Function() Task.FromResult(_comAggregate)) + + RegisterService(Of IVbTempPECompilerFactory)( + Async Function(ct) + Dim workspace = Me.ComponentModel.GetService(Of VisualStudioWorkspace)() + Await JoinableTaskFactory.SwitchToMainThreadAsync(ct) + Return New TempPECompilerFactory(workspace) + End Function) + Catch ex As Exception When FatalError.ReportAndPropagateUnlessCanceled(ex) + Throw ExceptionUtilities.Unreachable + End Try + + Return Task.CompletedTask + End Function) + End Sub Protected Overrides Sub RegisterObjectBrowserLibraryManager() Dim workspace As VisualStudioWorkspace = ComponentModel.GetService(Of VisualStudioWorkspace)()