Merge pull request #66744 from dotnet/merges/release/dev17.5-vs-deps-…

…to-release/dev17.6 Merge release/dev17.5-vs-deps to release/dev17.6
dotnet · Feb 8, 2023 · 50bd09a · 50bd09a
2 parents 8da03f9 + 33a7734
commit 50bd09a
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 78 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -186,7 +186,6 @@
     <MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
     <MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
     <MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
-    <MicrosoftVisualStudioTelemetryVersion>16.6.9</MicrosoftVisualStudioTelemetryVersion>
     <MicrosoftVisualStudioTemplateWizardInterfaceVersion>8.0.0.0-alpha</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
     <MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
     <MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>
@@ -301,6 +300,16 @@
     <SystemReflectionMetadataVersion>6.0.1</SystemReflectionMetadataVersion>
     <MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="$(OfficialBuild)">
+    <RestoreSources>
+      $(RestoreSources);
+      https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json;
+    </RestoreSources>
+    <MicrosoftVisualStudioTelemetryVersion>16.6.15</MicrosoftVisualStudioTelemetryVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="!$(OfficialBuild)">
+    <MicrosoftVisualStudioTelemetryVersion>16.6.9</MicrosoftVisualStudioTelemetryVersion>
+  </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
     <UsingToolVSSDK>true</UsingToolVSSDK>
   </PropertyGroup>

diff --git a/src/Analyzers/VisualBasic/Tests/UnsealClass/UnsealClassTests.vb b/src/Analyzers/VisualBasic/Tests/UnsealClass/UnsealClassTests.vb
@@ -143,7 +143,7 @@ end class")
         Public Async Function RemovedFromAllPartialClassDeclarationsAcrossFiles() As Task
             Await TestInRegularAndScriptAsync(
 <Workspace>
-    <Project Language="Visual Basic">
+    <Project Language="Visual Basic" CommonReferences="true">
         <Document>
 partial public notinheritable class C
 end class
@@ -162,7 +162,7 @@ end class
     </Project>
 </Workspace>.ToString(),
 <Workspace>
-    <Project Language="Visual Basic">
+    <Project Language="Visual Basic" CommonReferences="true">
         <Document>
 partial public class C
 end class

diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/GenerateType/GenerateTypeTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/GenerateType/GenerateTypeTests.cs
@@ -5414,7 +5414,7 @@ public async Task TestMethodGroupWithMissingSystemActionAndFunc(string returnTyp
             await TestInRegularAndScriptAsync(
     $@"
 <Workspace>
-    <Project Language=""C#"" CommonReferences=""false"">
+    <Project Language=""C#"" CommonReferencesMinCorlib=""true"">
         <Document><![CDATA[
 class C
 {{
@@ -5446,9 +5446,9 @@ void M()
 
 internal class Class
 {{
-    private global::System.Object method;
+    private object method;
 
-    public Class(global::System.Object method)
+    public Class(object method)
     {{
         this.method = method;
     }}

diff --git a/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs b/src/EditorFeatures/CSharpTest/Diagnostics/UpgradeProject/UpgradeProjectTests.cs
@@ -362,7 +362,7 @@ public async Task UpgradeAllProjectsToCSharp7()
         {
             await TestLanguageVersionUpgradedAsync(
 @"<Workspace>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
         <Document>
 class C
 {
@@ -373,9 +373,9 @@ void A()
 }
         </Document>
     </Project>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
     </Project>
-    <Project Language=""C#"" LanguageVersion=""7"">
+    <Project Language=""C#"" LanguageVersion=""7"" CommonReferences=""true"">
     </Project>
     <Project Language=""Visual Basic"">
     </Project>
@@ -390,19 +390,19 @@ public async Task UpgradeAllProjectsToCSharp8()
         {
             await TestLanguageVersionUpgradedAsync(
 @"<Workspace>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
         <Document>
 class C
 {
     object F = [|null!|];
 }
         </Document>
     </Project>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
     </Project>
-    <Project Language=""C#"" LanguageVersion=""7"">
+    <Project Language=""C#"" LanguageVersion=""7"" CommonReferences=""true"">
     </Project>
-    <Project Language=""Visual Basic"">
+    <Project Language=""Visual Basic"" CommonReferences=""true"">
     </Project>
 </Workspace>",
                 LanguageVersion.CSharp8,
@@ -444,18 +444,18 @@ public async Task UpgradeAllProjectsToCSharp9()
         {
             await TestLanguageVersionUpgradedAsync(
 @"<Workspace>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
         <Document>
 [|System.Console.WriteLine();|]
         </Document>
     </Project>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
     </Project>
-    <Project Language=""C#"" LanguageVersion=""7"">
+    <Project Language=""C#"" LanguageVersion=""7"" CommonReferences=""true"">
     </Project>
-    <Project Language=""C#"" LanguageVersion=""8"">
+    <Project Language=""C#"" LanguageVersion=""8"" CommonReferences=""true"">
     </Project>
-    <Project Language=""Visual Basic"">
+    <Project Language=""Visual Basic"" CommonReferences=""true"">
     </Project>
 </Workspace>",
                 LanguageVersion.CSharp9,
@@ -469,7 +469,7 @@ public async Task ListAllSuggestions()
             await TestExactActionSetOfferedAsync(
 
 @"<Workspace>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
         <Document>
 class C
 {
@@ -480,9 +480,9 @@ void A()
 }
         </Document>
     </Project>
-    <Project Language=""C#"" LanguageVersion=""7"">
+    <Project Language=""C#"" LanguageVersion=""7"" CommonReferences=""true"">
     </Project>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
     </Project>
 </Workspace>",
                 new[] {
@@ -527,7 +527,7 @@ public async Task FixAllProjectsNotOffered()
             await TestExactActionSetOfferedAsync(
 
 @"<Workspace>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
         <Document>
 class C
 {
@@ -538,7 +538,7 @@ void A()
 }
         </Document>
     </Project>
-    <Project Language=""Visual Basic"">
+    <Project Language=""Visual Basic"" CommonReferences=""true"">
     </Project>
 </Workspace>",
                 new[] {
@@ -552,7 +552,7 @@ public async Task OnlyOfferFixAllProjectsFromCSharp6ToCSharp7WhenApplicable()
             await TestExactActionSetOfferedAsync(
 
 @"<Workspace>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
         <Document>
 class C
 {
@@ -563,9 +563,9 @@ void A()
 }
         </Document>
     </Project>
-    <Project Language=""C#"" LanguageVersion=""7"">
+    <Project Language=""C#"" LanguageVersion=""7"" CommonReferences=""true"">
     </Project>
-    <Project Language=""Visual Basic"">
+    <Project Language=""Visual Basic"" CommonReferences=""true"">
     </Project>
 </Workspace>",
                 new[] {
@@ -608,17 +608,17 @@ public async Task OnlyOfferFixAllProjectsToCSharp8WhenApplicable()
             await TestExactActionSetOfferedAsync(
 
 @"<Workspace>
-    <Project Language=""C#"" LanguageVersion=""6"">
+    <Project Language=""C#"" LanguageVersion=""6"" CommonReferences=""true"">
         <Document>
 class C
 {
     object F = [|null!|];
 }
         </Document>
     </Project>
-    <Project Language=""C#"" LanguageVersion=""8"">
+    <Project Language=""C#"" LanguageVersion=""8"" CommonReferences=""true"">
     </Project>
-    <Project Language=""Visual Basic"">
+    <Project Language=""Visual Basic"" CommonReferences=""true"">
     </Project>
 </Workspace>",
             new[] {

diff --git a/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs b/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs
@@ -3639,7 +3639,7 @@ public async Task TestMethodGroupWithMissingSystemActionAndFunc(string returnTyp
             await TestInRegularAndScriptAsync(
     $@"
 <Workspace>
-    <Project Language=""C#"" CommonReferences=""false"">
+    <Project Language=""C#"" CommonReferencesMinCorlib=""true"">
         <Document><![CDATA[
 class C
 {{
@@ -3675,9 +3675,9 @@ void M()
 
 internal class Class
 {{
-    private global::System.Object method;
+    private object method;
 
-    public Class(global::System.Object method)
+    public Class(object method)
     {{
         this.method = method;
     }}

diff --git a/...ics/AbstractPushOrPullDiagnosticsTaggerProvider.SingleDiagnosticKindPullTaggerProvider.cs b/...ics/AbstractPushOrPullDiagnosticsTaggerProvider.SingleDiagnosticKindPullTaggerProvider.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
@@ -17,7 +16,6 @@
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Options;
-using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.CodeAnalysis.Text;
@@ -113,21 +111,6 @@ private async Task ProduceTagsAsync(
 
             try
             {
-                // If this is not the tagger for compiler-syntax, then suppress diagnostics until the project has fully
-                // loaded.  This prevents the user from seeing spurious diagnostics while the project is in the process
-                // of loading.  We do keep compiler-syntax as that's based purely on the parse tree, and doesn't need
-                // correct project info to get reasonable results.
-                if (_diagnosticKind != DiagnosticKind.CompilerSyntax)
-                {
-                    var service = project.Solution.Services.GetRequiredService<IWorkspaceStatusService>();
-                    if (!await service.IsFullyLoadedAsync(cancellationToken).ConfigureAwait(false))
-                        return;
-
-                    using var _ = PooledHashSet<Project>.GetInstance(out var seenProjects);
-                    if (!HasSuccessfullyLoaded(document.Project, seenProjects))
-                        return;
-                }
-
                 var requestedSpan = documentSpanToTag.SnapshotSpan;
 
                 var diagnostics = await _analyzerService.GetDiagnosticsForSpanAsync(
@@ -163,25 +146,6 @@ private async Task ProduceTagsAsync(
             }
         }
 
-        private bool HasSuccessfullyLoaded(Project? project, HashSet<Project> seenProjects)
-        {
-            if (project != null && seenProjects.Add(project))
-            {
-                if (!project.State.HasAllInformation)
-                    return false;
-
-                // Ensure our dependencies have all information as well.  That's necessary so we can properly get
-                // compilations for them.
-                foreach (var reference in project.ProjectReferences)
-                {
-                    if (!HasSuccessfullyLoaded(project.Solution.GetProject(reference.ProjectId), seenProjects))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
         private static bool IsSuppressed(NormalizedSnapshotSpanCollection? suppressedSpans, SnapshotSpan span)
             => suppressedSpans != null && suppressedSpans.IntersectsWith(span);
     }

diff --git a/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_Create.cs b/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_Create.cs
@@ -54,6 +54,7 @@ public partial class TestWorkspace
         private const string CommonReferencesNetCoreAppName = "CommonReferencesNetCoreApp";
         private const string CommonReferencesNet6Name = "CommonReferencesNet6";
         private const string CommonReferencesNetStandard20Name = "CommonReferencesNetStandard20";
+        private const string CommonReferencesMinCorlibName = "CommonReferencesMinCorlib";
         private const string ReferencesOnDiskAttributeName = "ReferencesOnDisk";
         private const string FilePathAttributeName = "FilePath";
         private const string FoldersAttributeName = "Folders";

diff --git a/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_XmlConsumption.cs b/src/EditorFeatures/TestUtilities/Workspaces/TestWorkspace_XmlConsumption.cs
@@ -1117,6 +1117,14 @@ private static IList<MetadataReference> CreateCommonReferences(TestWorkspace wor
                 references = TargetFrameworkUtil.GetReferences(TargetFramework.Net60).ToList();
             }
 
+            var mincorlib = element.Attribute(CommonReferencesMinCorlibName);
+            if (mincorlib != null &&
+                ((bool?)mincorlib).HasValue &&
+                ((bool?)mincorlib).Value)
+            {
+                references = new List<MetadataReference> { TestBase.MinCorlibRef };
+            }
+
             return references;
         }
 

diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateMethod/GenerateMethodTests.vb
@@ -4408,7 +4408,7 @@ End Namespace")
         Public Async Function TestAcrossFiles() As Task
             Await TestInRegularAndScriptAsync(
 "<Workspace>
-    <Project Language=""Visual Basic"">
+    <Project Language=""Visual Basic"" CommonReferences=""true"">
         <Document>
 Public Class DataContainer
     Property PossibleInProcessTests As string
@@ -4462,6 +4462,7 @@ Public Class DataContainer
     End Sub
 
     Friend Sub ArbitraryPositionMethod()
+        Throw New NotImplementedException()
     End Sub
 
     Function Bazz() As Object

diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.cs b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.cs
@@ -704,8 +704,13 @@ private async Task<CompilationInfo> FinalizeCompilationAsync(
             {
                 try
                 {
-                    // if HasAllInformation is false, then this project is always not completed.
-                    var hasSuccessfullyLoaded = this.ProjectState.HasAllInformation;
+                    // Project is complete only if the following are all true:
+                    //  1. HasAllInformation flag is set for the project
+                    //  2. Either the project has non-zero metadata references OR this is the corlib project.
+                    //     For the latter, we use a heuristic if the underlying compilation defines "System.Object" type.
+                    var hasSuccessfullyLoaded = this.ProjectState.HasAllInformation &&
+                        (this.ProjectState.MetadataReferences.Count > 0 ||
+                         compilationWithoutGenerators.GetTypeByMetadataName("System.Object") != null);
 
                     var newReferences = new List<MetadataReference>();
                     var metadataReferenceToProjectId = new Dictionary<MetadataReference, ProjectId>();