diff --git a/Directory.Packages.props b/Directory.Packages.props
index 7fba711663b..798cb4352a1 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -56,10 +56,10 @@
-
-
+
+
-
+
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs
index df956fc8a8e..a1529143bae 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs
@@ -137,7 +137,7 @@ protected override async Task InitializeCoreAsync(CancellationToken cancellation
ITargetBlock> actionBlock
= DataflowBlockFactory.CreateActionBlock>(
- 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/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Query/LaunchProfiles/LaunchProfileActionBase.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Query/LaunchProfiles/LaunchProfileActionBase.cs
index 62749aae942..e0f74b1d48d 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Query/LaunchProfiles/LaunchProfileActionBase.cs
+++ b/src/Microsoft.VisualStudio.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 valueEntities)
+ static async Task PopulateSupportedValuesAndConfigurationsAsync(ImmutableArray valueEntities)
{
foreach (IEntityValue valueEntity in valueEntities)
{
@@ -197,7 +197,7 @@ static void PopulateEditorMetadata(ImmutableArray editors)
}
}
- async Task PopulateEditorsAndValues(ImmutableArray properties)
+ async Task PopulateEditorsAndValuesAsync(ImmutableArray properties)
{
foreach (IEntityValue propertyEntity in properties)
{
@@ -215,7 +215,7 @@ async Task PopulateEditorsAndValues(ImmutableArray 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/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Query/PropertyPages/PropertyPageDataProducer.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Query/PropertyPages/PropertyPageDataProducer.cs
index 1187b929084..e4b127c7671 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Query/PropertyPages/PropertyPageDataProducer.cs
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Query/PropertyPages/PropertyPageDataProducer.cs
@@ -104,12 +104,12 @@ public static async Task> CreatePropertyPageValuesAsyn
{
if (await project.GetProjectLevelPropertyPagesCatalogAsync() is IPropertyPagesCatalog projectCatalog)
{
- return createPropertyPageValuesAsync();
+ return createPropertyPageValues();
}
return Enumerable.Empty();
- IEnumerable createPropertyPageValuesAsync()
+ IEnumerable 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
index b7b57a15cec..174c059fdb3 100644
--- 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 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