Setup branch for test insertions

azure-pipelines-integration-scouting.yml

@@ -9,6 +9,7 @@ schedules:
   branches:
     include:
     - main
+    exclude:
     - main-vs-deps
 
 variables:

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

eng/Versions.props

@@ -6,9 +6,9 @@
   -->
   <PropertyGroup>
     <MajorVersion>4</MajorVersion>
-    <MinorVersion>14</MinorVersion>
+    <MinorVersion>15</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <PreReleaseVersionLabel>3</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>1</PreReleaseVersionLabel>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <!--
       By default the assembly version in official builds is "$(MajorVersion).$(MinorVersion).0.0".

eng/pipelines/test-integration-helix.yml

@@ -33,6 +33,7 @@ stages:
       buildArguments: -msbuildEngine vs /p:Projects='"$(Build.Repository.LocalPath)\src\VisualStudio\IntegrationTest\IntegrationTestBuildProject.csproj"'
 
 - stage: ${{ parameters.configuration }}_Integration
+  condition: and(succeeded(), notIn(variables['System.PullRequest.TargetBranchName'], 'main-vs-deps', 'release/dev18.0'))
   dependsOn: Windows_${{ parameters.configuration }}_Build
   variables:
   - name: XUNIT_LOGS

src/VisualStudio/CSharp/Impl/CSharpPackage.cs

@@ -58,13 +58,17 @@ internal sealed class CSharpPackage : AbstractPackage<CSharpPackage, CSharpLangu
         private ObjectBrowserLibraryManager? _libraryManager;
         private uint _libraryManagerCookie;
 
-        protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
+        protected override void RegisterInitializationWork(PackageRegistrationTasks packageRegistrationTasks)
+        {
+            base.RegisterInitializationWork(packageRegistrationTasks);
+
+            packageRegistrationTasks.AddTask(isMainThreadTask: false, task: PackageInitializationBackgroundThreadAsync);
+        }
+
+        private Task PackageInitializationBackgroundThreadAsync(IProgress<ServiceProgressData> progress, PackageRegistrationTasks packageRegistrationTasks, CancellationToken cancellationToken)
         {
             try
             {
-                await base.InitializeAsync(cancellationToken, progress).ConfigureAwait(true);
-                await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
-
                 this.RegisterService<ICSharpTempPECompilerService>(async ct =>
                 {
                     var workspace = this.ComponentModel.GetService<VisualStudioWorkspace>();
@@ -75,6 +79,8 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
             catch (Exception e) when (FatalError.ReportAndPropagateUnlessCanceled(e, ErrorSeverity.General))
             {
             }
+
+            return Task.CompletedTask;
         }
 
         protected override void RegisterObjectBrowserLibraryManager()

src/VisualStudio/Core/Def/ColorSchemes/ColorSchemeApplier.cs

@@ -14,11 +14,9 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.CodeAnalysis.Threading;
-using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService;
 using Microsoft.VisualStudio.Settings;
 using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Threading;
 using Task = System.Threading.Tasks.Task;
 
 namespace Microsoft.CodeAnalysis.ColorSchemes;
@@ -42,7 +40,6 @@ internal sealed partial class ColorSchemeApplier
     [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
     public ColorSchemeApplier(
         IThreadingContext threadingContext,
-        IVsService<SVsFontAndColorStorage, IVsFontAndColorStorage> fontAndColorStorage,
         IGlobalOptionService globalOptions,
         SVsServiceProvider serviceProvider,
         IAsynchronousOperationListenerProvider listenerProvider)
@@ -60,7 +57,7 @@ public ColorSchemeApplier(
             threadingContext.DisposalToken);
     }
 
-    public async Task InitializeAsync(CancellationToken cancellationToken)
+    public void RegisterInitializationWork(PackageRegistrationTasks packageRegistrationTasks)
     {
         lock (_gate)
         {
@@ -70,15 +67,16 @@ public async Task InitializeAsync(CancellationToken cancellationToken)
             _isInitialized = true;
         }
 
-        // We need to update the theme whenever the Editor Color Scheme setting changes.
-        await TaskScheduler.Default;
+        packageRegistrationTasks.AddTask(isMainThreadTask: false, task: PackageInitializationBackgroundThreadAsync);
+    }
+
+    private async Task PackageInitializationBackgroundThreadAsync(IProgress<ServiceProgressData> progress, PackageRegistrationTasks packageRegistrationTasks, CancellationToken cancellationToken)
+    {
         var settingsManager = await _asyncServiceProvider.GetServiceAsync<SVsSettingsPersistenceManager, ISettingsManager>(_threadingContext.JoinableTaskFactory).ConfigureAwait(false);
 
-        await _threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+        // We need to update the theme whenever the Editor Color Scheme setting changes.
         settingsManager.GetSubset(ColorSchemeOptionsStorage.ColorSchemeSettingKey).SettingChangedAsync += ColorSchemeChangedAsync;
 
-        await TaskScheduler.Default;
-
         // Try to migrate the `useEnhancedColorsSetting` to the new `ColorSchemeName` setting.
         _settings.MigrateToColorSchemeSetting();
 

src/VisualStudio/Core/Def/Implementation/AbstractOleCommandTarget.Execute.cs

@@ -35,10 +35,6 @@ public virtual int Exec(ref Guid pguidCmdGroup, uint commandId, uint executeInfo
             {
                 return ExecuteVisualStudio2000(ref pguidCmdGroup, commandId, executeInformation, pvaIn, pvaOut);
             }
-            else if (pguidCmdGroup == VSConstants.GUID_VSStandardCommandSet97)
-            {
-                return ExecuteVisualStudio97(ref pguidCmdGroup, commandId, executeInformation, pvaIn, pvaOut);
-            }
             else
             {
                 return NextCommandTarget.Exec(ref pguidCmdGroup, commandId, executeInformation, pvaIn, pvaOut);
@@ -50,61 +46,8 @@ public virtual int Exec(ref Guid pguidCmdGroup, uint commandId, uint executeInfo
         }
     }
 
-    private int ExecuteVisualStudio97(ref Guid pguidCmdGroup, uint commandId, uint executeInformation, IntPtr pvaIn, IntPtr pvaOut)
-    {
-        switch ((VSConstants.VSStd97CmdID)commandId)
-        {
-            case VSConstants.VSStd97CmdID.Paste:
-            case VSConstants.VSStd97CmdID.Delete:
-            case VSConstants.VSStd97CmdID.SelectAll:
-            case VSConstants.VSStd97CmdID.Undo:
-            case VSConstants.VSStd97CmdID.Redo:
-            case VSConstants.VSStd97CmdID.MultiLevelUndo:
-            case VSConstants.VSStd97CmdID.MultiLevelRedo:
-                GCManager.UseLowLatencyModeForProcessingUserInput();
-                return NextCommandTarget.Exec(ref pguidCmdGroup, commandId, executeInformation, pvaIn, pvaOut);
-
-            default:
-                return NextCommandTarget.Exec(ref pguidCmdGroup, commandId, executeInformation, pvaIn, pvaOut);
-        }
-    }
-
     protected virtual int ExecuteVisualStudio2000(ref Guid pguidCmdGroup, uint commandId, uint executeInformation, IntPtr pvaIn, IntPtr pvaOut)
     {
-        switch ((VSConstants.VSStd2KCmdID)commandId)
-        {
-            case VSConstants.VSStd2KCmdID.TYPECHAR:
-            case VSConstants.VSStd2KCmdID.RETURN:
-            case VSConstants.VSStd2KCmdID.TAB:
-            case VSConstants.VSStd2KCmdID.BACKTAB:
-            case VSConstants.VSStd2KCmdID.HOME:
-            case VSConstants.VSStd2KCmdID.END:
-            case VSConstants.VSStd2KCmdID.BOL:
-            case VSConstants.VSStd2KCmdID.BOL_EXT:
-            case VSConstants.VSStd2KCmdID.EOL:
-            case VSConstants.VSStd2KCmdID.EOL_EXT:
-            case VSConstants.VSStd2KCmdID.SELECTALL:
-            case VSConstants.VSStd2KCmdID.OPENLINEABOVE:
-            case VSConstants.VSStd2KCmdID.OPENLINEBELOW:
-            case VSConstants.VSStd2KCmdID.UP:
-            case VSConstants.VSStd2KCmdID.DOWN:
-            case VSConstants.VSStd2KCmdID.BACKSPACE:
-            case VSConstants.VSStd2KCmdID.DELETE:
-            case VSConstants.VSStd2KCmdID.ECMD_INSERTCOMMENT:
-            case VSConstants.VSStd2KCmdID.COMPLETEWORD:
-            case VSConstants.VSStd2KCmdID.SHOWMEMBERLIST:
-            case VSConstants.VSStd2KCmdID.PARAMINFO:
-            case VSConstants.VSStd2KCmdID.RENAME:
-            case VSConstants.VSStd2KCmdID.EXTRACTINTERFACE:
-            case VSConstants.VSStd2KCmdID.EXTRACTMETHOD:
-            case VSConstants.VSStd2KCmdID.PASTE:
-            case VSConstants.VSStd2KCmdID.INSERTSNIPPET:
-            case VSConstants.VSStd2KCmdID.SURROUNDWITH:
-                GCManager.UseLowLatencyModeForProcessingUserInput();
-                return NextCommandTarget.Exec(ref pguidCmdGroup, commandId, executeInformation, pvaIn, pvaOut);
-
-            default:
-                return NextCommandTarget.Exec(ref pguidCmdGroup, commandId, executeInformation, pvaIn, pvaOut);
-        }
+        return NextCommandTarget.Exec(ref pguidCmdGroup, commandId, executeInformation, pvaIn, pvaOut);
     }
 }