Merge pull request #9427 from ToddGrun/UpdateVSThreadingPackages

Update VSThreading packages in anticipation of future Roslyn packages upgrade
dotnet · Mar 27, 2024 · 6c46276 · 6c46276
2 parents 1682939 + e46a724
commit 6c46276
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -56,10 +56,10 @@
     <PackageVersion Include="Microsoft.VisualStudio.Shell.Framework"                                 Version="17.3.32804.24" />
     <PackageVersion Include="Microsoft.VisualStudio.Telemetry"                                       Version="17.8.9" />
     <PackageVersion Include="Microsoft.VisualStudio.TemplateWizardInterface"                         Version="17.3.32804.24" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading"                                       Version="17.7.30" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers"                             Version="17.7.30" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading"                                       Version="17.9.28" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers"                             Version="17.9.28" />
     <PackageVersion Include="Microsoft.VisualStudio.Utilities"                                       Version="17.7.36307-preview.2" />
-    <PackageVersion Include="Microsoft.VisualStudio.Validation"                                      Version="17.6.11" />
+    <PackageVersion Include="Microsoft.VisualStudio.Validation"                                      Version="17.8.8" />
     <PackageVersion Include="Microsoft.VisualStudio.XmlEditor"                                       Version="17.3.32804.24" />
     <PackageVersion Include="Microsoft.VSSDK.BuildTools"                                             Version="17.5.18-preview1" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow"                                        Version="7.0.0" />

diff --git a/...lStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs b/...lStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs
@@ -137,7 +137,7 @@ protected override async Task InitializeCoreAsync(CancellationToken cancellation
 
         ITargetBlock<IProjectVersionedValue<(ConfiguredProject ActiveConfiguredProject, ConfigurationSubscriptionSources Sources)>> actionBlock
             = DataflowBlockFactory.CreateActionBlock<IProjectVersionedValue<(ConfiguredProject ActiveConfiguredProject, ConfigurationSubscriptionSources Sources)>>(
-                update => OnSlicesChanged(update, cancellationToken),
+                update => OnSlicesChangedAsync(update, cancellationToken),
                 _unconfiguredProject,
                 ProjectFaultSeverity.LimitedFunctionality,
                 nameFormat: "LanguageServiceHostSlices {1}");
@@ -190,7 +190,7 @@ protected override async Task InitializeCoreAsync(CancellationToken cancellation
 
         return;
 
-        async Task OnSlicesChanged(IProjectVersionedValue<(ConfiguredProject ActiveConfiguredProject, ConfigurationSubscriptionSources Sources)> update, CancellationToken cancellationToken)
+        async Task OnSlicesChangedAsync(IProjectVersionedValue<(ConfiguredProject ActiveConfiguredProject, ConfigurationSubscriptionSources Sources)> update, CancellationToken cancellationToken)
         {
             ProjectConfiguration activeProjectConfiguration = update.Value.ActiveConfiguredProject.ProjectConfiguration;
             ConfigurationSubscriptionSources sources = update.Value.Sources;

diff --git a/...ProjectSystem.Managed.VS/ProjectSystem/VS/Query/LaunchProfiles/LaunchProfileActionBase.cs b/...ProjectSystem.Managed.VS/ProjectSystem/VS/Query/LaunchProfiles/LaunchProfileActionBase.cs
@@ -130,7 +130,7 @@ public async Task OnRequestProcessFinishedAsync(IQueryProcessRequest request)
                                     UIPropertyDataProducer.CreateUIPropertyValues(request.QueryExecutionContext, launchProfileEntity, state.ProjectState, state.PropertiesContext, state.Rule, s_requestedPropertyProperties));
                                 launchProfileEntity.SetRelatedEntities(LaunchProfileType.PropertiesPropertyName, properties);
 
-                                await PopulateEditorsAndValues(properties);
+                                await PopulateEditorsAndValuesAsync(properties);
                             }
 
                             returnedLaunchProfiles.Add(launchProfileEntity);
@@ -165,7 +165,7 @@ public async Task OnRequestProcessFinishedAsync(IQueryProcessRequest request)
 
             await ResultReceiver.OnRequestProcessFinishedAsync(request);
 
-            static async Task PopulateSupportedValuesAndConfigurations(ImmutableArray<IEntityValue> valueEntities)
+            static async Task PopulateSupportedValuesAndConfigurationsAsync(ImmutableArray<IEntityValue> valueEntities)
             {
                 foreach (IEntityValue valueEntity in valueEntities)
                 {
@@ -197,7 +197,7 @@ static void PopulateEditorMetadata(ImmutableArray<IEntityValue> editors)
                 }
             }
 
-            async Task PopulateEditorsAndValues(ImmutableArray<IEntityValue> properties)
+            async Task PopulateEditorsAndValuesAsync(ImmutableArray<IEntityValue> properties)
             {
                 foreach (IEntityValue propertyEntity in properties)
                 {
@@ -215,7 +215,7 @@ async Task PopulateEditorsAndValues(ImmutableArray<IEntityValue> properties)
                             await UIPropertyValueDataProducer.CreateUIPropertyValueValuesAsync(request.QueryExecutionContext, propertyEntity, propertyProviderState.ProjectState, propertyProviderState.ContainingRule, propertyProviderState.PropertiesContext, propertyProviderState.PropertyName, s_requestedValueProperties));
                         propertyEntity.SetRelatedEntities(UIPropertyType.ValuesPropertyName, values);
 
-                        await PopulateSupportedValuesAndConfigurations(values);
+                        await PopulateSupportedValuesAndConfigurationsAsync(values);
                     }
                 }
             }

diff --git a/...ProjectSystem.Managed.VS/ProjectSystem/VS/Query/PropertyPages/PropertyPageDataProducer.cs b/...ProjectSystem.Managed.VS/ProjectSystem/VS/Query/PropertyPages/PropertyPageDataProducer.cs
@@ -104,12 +104,12 @@ public static async Task<IEnumerable<IEntityValue>> CreatePropertyPageValuesAsyn
         {
             if (await project.GetProjectLevelPropertyPagesCatalogAsync() is IPropertyPagesCatalog projectCatalog)
             {
-                return createPropertyPageValuesAsync();
+                return createPropertyPageValues();
             }
 
             return Enumerable.Empty<IEntityValue>();
 
-            IEnumerable<IEntityValue> createPropertyPageValuesAsync()
+            IEnumerable<IEntityValue> createPropertyPageValues()
             {
                 IProjectState projectState = new PropertyPageProjectState(project);
                 QueryProjectPropertiesContext propertiesContext = new QueryProjectPropertiesContext(isProjectFile: true, project.FullPath, itemType: null, itemName: null);

diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Debug/LaunchProfile.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Debug/LaunchProfile.cs
@@ -77,11 +77,11 @@ internal static async Task<LaunchProfile> ReplaceTokensAsync(ILaunchProfile prof
             {
                 return profile switch
                 {
-                    ILaunchProfile2 profile2 => ReplaceValuesAsync(profile2.OtherSettings, ReplaceIfString),
-                    _ => ReplaceValuesAsync(profile.FlattenOtherSettings(), ReplaceIfString)
+                    ILaunchProfile2 profile2 => ReplaceValuesAsync(profile2.OtherSettings, ReplaceIfStringAsync),
+                    _ => ReplaceValuesAsync(profile.FlattenOtherSettings(), ReplaceIfStringAsync)
                 };
 
-                async Task<object> ReplaceIfString(object o)
+                async Task<object> ReplaceIfStringAsync(object o)
                 {
                     return o switch
                     {