Merge release/dev16.7 to release/dev16.7-vs-deps

eng/Versions.props

@@ -8,7 +8,7 @@
     <MajorVersion>3</MajorVersion>
     <MinorVersion>7</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <PreReleaseVersionLabel>4</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>5</PreReleaseVersionLabel>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <!--
       By default the assembly version in official builds is "$(MajorVersion).$(MinorVersion).0.0".

src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml

@@ -203,6 +203,11 @@
                     <!-- This column appears empty to sighted users, but provides an improved screenreader 
                     experience that avoids moving cell-by-cell through the DataGrid -->
                     <DataGridTextColumn x:Name="automationHeader" IsReadOnly="True" Width="0">
+                        <DataGridTextColumn.HeaderStyle>
+                            <Style TargetType="{x:Type DataGridColumnHeader}">
+                                <Setter Property="AutomationProperties.Name" Value="{Binding ElementName=dialog, Path=CurrentParameter}" />
+                            </Style>
+                        </DataGridTextColumn.HeaderStyle>
                         <DataGridTextColumn.CellStyle>
                             <Style TargetType="DataGridCell" BasedOn="{StaticResource DataGridCellStyle}">
                                 <Setter Property="AutomationProperties.Name" Value="{Binding FullAutomationText}"/>

src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml.cs

@@ -22,6 +22,7 @@ internal partial class ChangeSignatureDialog : DialogWindow
 
         // Expose localized strings for binding
         public string ChangeSignatureDialogTitle { get { return ServicesVSResources.Change_Signature; } }
+        public string CurrentParameter { get { return ServicesVSResources.Current_parameter; } }
         public string Parameters { get { return ServicesVSResources.Parameters_colon2; } }
         public string PreviewMethodSignature { get { return ServicesVSResources.Preview_method_signature_colon; } }
         public string PreviewReferenceChanges { get { return ServicesVSResources.Preview_reference_changes; } }

src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj

@@ -34,6 +34,7 @@
                                Class="Microsoft.VisualStudio.LanguageServices.Setup.RoslynPackage"
                                AllowsBackgroundLoad="true"/>
     <None Include="PackageRegistration.pkgdef" PkgDefEntry="FileContent" />
+    <None Include=".\ColorSchemes\VisualStudio2019.pkgdef" PkgDefEntry="FileContent" />
   </ItemGroup>
   <ItemGroup Label="Build Items">
     <Compile Include="..\..\..\Compilers\Shared\GlobalAssemblyCacheHelpers\GlobalAssemblyCacheLocation.cs">

src/VisualStudio/Core/Def/ServicesVSResources.resx

@@ -1529,4 +1529,7 @@ I agree to all of the foregoing:</value>
   <data name="Warning_colon_type_does_not_bind" xml:space="preserve">
     <value>Warning: type does not bind</value>
   </data>
+  <data name="Current_parameter" xml:space="preserve">
+    <value>Current parameter</value>
+  </data>
 </root>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf

@@ -157,6 +157,11 @@
         <target state="translated">Aktuální dokument</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf

@@ -157,6 +157,11 @@
         <target state="translated">Aktuelles Dokument</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf

@@ -157,6 +157,11 @@
         <target state="translated">Documento actual</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf

@@ -157,6 +157,11 @@
         <target state="translated">Document en cours</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf

@@ -157,6 +157,11 @@
         <target state="translated">Documento corrente</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf

@@ -157,6 +157,11 @@
         <target state="translated">現在のドキュメント</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf

@@ -157,6 +157,11 @@
         <target state="translated">현재 문서</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf

@@ -157,6 +157,11 @@
         <target state="translated">Bieżący dokument</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf

@@ -157,6 +157,11 @@
         <target state="translated">Documento atual</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf

@@ -157,6 +157,11 @@
         <target state="translated">Текущий документ</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf

@@ -157,6 +157,11 @@
         <target state="translated">Geçerli belge</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf

@@ -157,6 +157,11 @@
         <target state="translated">当前文档</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf

@@ -157,6 +157,11 @@
         <target state="translated">目前的文件</target>
         <note />
       </trans-unit>
+      <trans-unit id="Current_parameter">
+        <source>Current parameter</source>
+        <target state="new">Current parameter</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="new">_Edit</target>

src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs

@@ -3,27 +3,22 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.IO;
-using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
-using Microsoft.CodeAnalysis.Execution;
-using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Api;
-using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.CSharp.Execution;
+using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
+using Microsoft.CodeAnalysis.Editor.UnitTests;
 using Microsoft.CodeAnalysis.Remote;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
-using Microsoft.CodeAnalysis.SolutionCrawler;
 using Microsoft.CodeAnalysis.SymbolSearch;
 using Microsoft.CodeAnalysis.Test.Utilities;
+using Microsoft.CodeAnalysis.Test.Utilities.RemoteHost;
+using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServices.Remote;
 using Roslyn.Test.Utilities.Remote;
-using Roslyn.Utilities;
 using Roslyn.VisualStudio.Next.UnitTests.Mocks;
 using Xunit;
 
@@ -35,11 +30,15 @@ public class RemoteHostClientServiceFactoryTests
         [Fact, Trait(Traits.Feature, Traits.Features.RemoteHost)]
         public async Task UpdaterService()
         {
-            var exportProvider = TestHostServices.CreateMinimalExportProvider();
+            var exportProvider = ExportProviderCache
+                .GetOrCreateExportProviderFactory(ServiceTestExportProvider.CreateAssemblyCatalog()
+                    .WithParts(typeof(InProcRemoteHostClientProvider.Factory), typeof(CSharpOptionsSerializationService)))
+                .CreateExportProvider();
+
             using var workspace = new AdhocWorkspace(TestHostServices.CreateHostServices(exportProvider));
 
             var options = workspace.CurrentSolution.Options
-                .WithChangedOption(RemoteHostOptions.SolutionChecksumMonitorBackOffTimeSpanInMS, 1)
+                .WithChangedOption(Microsoft.VisualStudio.LanguageServices.Remote.RemoteHostOptions.SolutionChecksumMonitorBackOffTimeSpanInMS, 1)
                 .WithChangedOption(Microsoft.CodeAnalysis.Test.Utilities.RemoteHost.RemoteHostOptions.RemoteHostTest, true);
 
             workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(options));
@@ -52,8 +51,11 @@ public async Task UpdaterService()
             // make sure client is ready
             using var client = await service.TryGetRemoteHostClientAsync(CancellationToken.None);
 
-            // add solution
+            // add solution, change document
             workspace.AddSolution(SolutionInfo.Create(SolutionId.CreateNewId(), VersionStamp.Default));
+            var project = workspace.AddProject("proj", LanguageNames.CSharp);
+            var document = workspace.AddDocument(project.Id, "doc.cs", SourceText.From("code"));
+            workspace.ApplyTextChanges(document.Id, new[] { new TextChange(new TextSpan(0, 1), "abc") }, CancellationToken.None);
 
             // wait for listener
             var workspaceListener = listenerProvider.GetWaiter(FeatureAttribute.Workspace);

src/Workspaces/Remote/Razor/ServiceHubServiceBase.cs

@@ -44,12 +44,6 @@ protected Task<Solution> GetSolutionAsync(CancellationToken cancellationToken)
         }
 
         public Task<Solution> GetSolutionAsync(JObject solutionInfo, CancellationToken cancellationToken)
-        {
-            var reader = solutionInfo.CreateReader();
-            var serializer = JsonSerializer.Create(new JsonSerializerSettings() { Converters = new[] { AggregateJsonConverter.Instance } });
-            var pinnedSolutionInfo = serializer.Deserialize<PinnedSolutionInfo>(reader);
-
-            return CreateSolutionService(pinnedSolutionInfo).GetSolutionAsync(pinnedSolutionInfo, cancellationToken);
-        }
+            => GetSolutionImplAsync(solutionInfo, cancellationToken);
     }
 }

src/Workspaces/Remote/ServiceHub/ExternalAccess/Pythia/Api/PythiaServiceBase.cs

@@ -27,13 +27,7 @@ protected PythiaServiceBase(IServiceProvider serviceProvider, Stream stream, IEn
             => base.StartService();
 
         public Task<Solution> GetSolutionAsync(JObject solutionInfo, CancellationToken cancellationToken)
-        {
-            var reader = solutionInfo.CreateReader();
-            var serializer = JsonSerializer.Create(new JsonSerializerSettings() { Converters = new[] { AggregateJsonConverter.Instance } });
-            var pinnedSolutionInfo = serializer.Deserialize<PinnedSolutionInfo>(reader);
-
-            return CreateSolutionService(pinnedSolutionInfo).GetSolutionAsync(pinnedSolutionInfo, cancellationToken);
-        }
+            => GetSolutionImplAsync(solutionInfo, cancellationToken);
 
 #pragma warning disable IDE0060 // Remove unused parameter - Avoiding breaking change in External access API
         protected Task<T> RunServiceAsync<T>(Func<Task<T>> callAsync, CancellationToken cancellationToken, [CallerMemberName] string? callerName = null)

src/Workspaces/Remote/ServiceHub/ExternalAccess/UnitTesting/Api/UnitTestingServiceBase.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 #nullable enable
@@ -27,13 +27,7 @@ protected UnitTestingServiceBase(
             => base.StartService();
 
         protected Task<Solution> GetSolutionAsync(JObject solutionInfo, CancellationToken cancellationToken)
-        {
-            var reader = solutionInfo.CreateReader();
-            var serializer = JsonSerializer.Create(new JsonSerializerSettings() { Converters = new[] { AggregateJsonConverter.Instance } });
-            var pinnedSolutionInfo = serializer.Deserialize<PinnedSolutionInfo>(reader);
-
-            return CreateSolutionService(pinnedSolutionInfo).GetSolutionAsync(pinnedSolutionInfo, cancellationToken);
-        }
+            => GetSolutionImplAsync(solutionInfo, cancellationToken);
 
         protected new Task<T> RunServiceAsync<T>(Func<Task<T>> callAsync, CancellationToken cancellationToken)
             => base.RunServiceAsync(callAsync, cancellationToken);

src/Workspaces/Remote/ServiceHub/Shared/RemoteEndPoint.cs

@@ -58,6 +58,9 @@ public RemoteEndPoint(Stream stream, TraceSource logger, object? incomingCallTar
 
             var jsonFormatter = new JsonMessageFormatter();
 
+            // disable interpreting of strings as DateTime during deserialization:
+            jsonFormatter.JsonSerializer.DateParseHandling = DateParseHandling.None;
+
             if (jsonConverters != null)
             {
                 jsonFormatter.JsonSerializer.Converters.AddRange(jsonConverters);

src/Workspaces/Remote/ServiceHub/Shared/ServiceBase.cs

@@ -12,6 +12,7 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Remote
@@ -87,6 +88,15 @@ protected SolutionService CreateSolutionService(PinnedSolutionInfo solutionInfo)
         protected Task<Solution> GetSolutionAsync(PinnedSolutionInfo solutionInfo, CancellationToken cancellationToken)
             => CreateSolutionService(solutionInfo).GetSolutionAsync(solutionInfo, cancellationToken);
 
+        internal Task<Solution> GetSolutionImplAsync(JObject solutionInfo, CancellationToken cancellationToken)
+        {
+            var reader = solutionInfo.CreateReader();
+            var serializer = JsonSerializer.Create(new JsonSerializerSettings() { Converters = new[] { AggregateJsonConverter.Instance }, DateParseHandling = DateParseHandling.None });
+            var pinnedSolutionInfo = serializer.Deserialize<PinnedSolutionInfo>(reader);
+
+            return CreateSolutionService(pinnedSolutionInfo).GetSolutionAsync(pinnedSolutionInfo, cancellationToken);
+        }
+
         protected async Task<T> RunServiceAsync<T>(Func<Task<T>> callAsync, CancellationToken cancellationToken)
         {
             AssetStorage.UpdateLastActivityTime();