[release/8.0.2xx] Update dependencies from dotnet/roslyn

Directory.Packages.props

@@ -12,7 +12,6 @@
     <PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
-    <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
@@ -30,6 +29,10 @@
     <PackageVersion Include="Microsoft.VisualBasic" Version="$(MicrosoftVisualBasicVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
     <PackageVersion Include="NETStandard.Library" Version="$(NETStandardLibraryVersion)" />
+    <!-- 
+      Pinning transitive NuGet dependencies to stop Microsoft.CodeAnalysis.Analyzer.Testing from 
+      bringing in an older NuGet which still has .NET Standard 1.3 dependencies.
+    -->
     <PackageVersion Include="NuGet.Common" Version="$(NuGetVersion)" />
     <PackageVersion Include="NuGet.Configuration" Version="$(NuGetVersion)" />
     <PackageVersion Include="NuGet.Frameworks" Version="$(NuGetVersion)" />

NuGet.config

@@ -10,4 +10,5 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
   </packageSources>
+  <disabledPackageSources />
 </configuration>

eng/Version.Details.xml

@@ -5,9 +5,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24067.24">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.9.2-3.24129.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>263571123fc3dc4a638e071234ac9fbf91913962</Sha>
+      <Sha>9934fb9e3527e1c0c51314e57d4aab30f97e8f9e</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23502.1">

eng/Versions.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <MajorVersion>8</MajorVersion>
-    <MinorVersion>0</MinorVersion>
+    <MinorVersion>2</MinorVersion>
     <!-- Build release-only package. -->
     <PreReleaseVersionLabel />
     <!--
@@ -31,7 +31,7 @@
     <!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
     <NuGetVersion>6.8.0-rc.122</NuGetVersion>
     <!-- roslyn -->
-    <MicrosoftCodeAnalysisVersion>4.8.0-7.24067.24</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisVersion>4.9.2-3.24129.6</MicrosoftCodeAnalysisVersion>
     <!-- roslyn-sdk -->
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
     <!-- runtime -->

global.json

@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "8.0.100-rtm.23506.1",
+    "version": "8.0.101",
     "allowPrerelease": true,
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "8.0.100-rtm.23506.1"
+    "dotnet": "8.0.101"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23525.4"

perf/FormattedFiles.cs

@@ -23,7 +23,6 @@ public class FormattedFiles
         public void NoFilesFormattedSetup()
         {
             SolutionPathSetter.SetCurrentDirectory();
-            MSBuildRegister.RegisterInstance(Environment.CurrentDirectory);
         }
 
         [Benchmark(Description = "Whitespace Formatting (folder)")]

perf/NoFilesFormatted.cs

@@ -23,7 +23,6 @@ public class NoFilesFormatted
         public void NoFilesFormattedSetup()
         {
             SolutionPathSetter.SetCurrentDirectory();
-            MSBuildRegister.RegisterInstance(Environment.CurrentDirectory);
         }
 
         [Benchmark(Description = "No Files are Formatted (folder)")]

perf/RealWorldSolution.cs

@@ -24,7 +24,6 @@ public class RealWorldSolution
         public void RealWorldSolutionIterationSetup()
         {
             SolutionPathSetter.SetCurrentDirectory();
-            MSBuildRegister.RegisterInstance(Environment.CurrentDirectory);
         }
 
         [Benchmark(Description = "Formatting Solution")]

src/Commands/FormatCommandCommon.cs

@@ -115,14 +115,6 @@ internal static async Task<int> FormatAsync(FormatOptions formatOptions, ILogger
                 }
 
                 logger.LogTrace(Resources.The_dotnet_CLI_version_is_0, dotnetVersion);
-
-                if (!TryLoadMSBuild(out var msBuildPath))
-                {
-                    logger.LogError(Resources.Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer);
-                    return UnableToLocateMSBuildExitCode;
-                }
-
-                logger.LogTrace(Resources.Using_msbuildexe_located_in_0, msBuildPath);
             }
 
             var formatResult = await CodeFormatter.FormatWorkspaceAsync(
@@ -377,34 +369,6 @@ internal static bool TryGetDotNetCliVersion([NotNullWhen(returnValue: true)] out
             }
         }
 
-        internal static bool TryLoadMSBuild([NotNullWhen(returnValue: true)] out string? msBuildPath)
-        {
-            try
-            {
-                // Get the global.json pinned SDK or latest instance.
-                var msBuildInstance = Build.Locator.MSBuildLocator.QueryVisualStudioInstances()
-                    .Where(instance => instance.Version.Major >= 6)
-                    .FirstOrDefault();
-                if (msBuildInstance is null)
-                {
-                    msBuildPath = null;
-                    return false;
-                }
-
-                msBuildPath = Path.EndsInDirectorySeparator(msBuildInstance.MSBuildPath)
-                    ? msBuildInstance.MSBuildPath
-                    : msBuildInstance.MSBuildPath + Path.DirectorySeparatorChar;
-
-                Build.Locator.MSBuildLocator.RegisterMSBuildPath(msBuildPath);
-                return true;
-            }
-            catch
-            {
-                msBuildPath = null;
-                return false;
-            }
-        }
-
         internal static string GetRuntimeVersion()
         {
             var pathParts = typeof(string).Assembly.Location.Split('\\', '/');

src/Resources.resx

@@ -216,9 +216,6 @@
   <data name="Using_msbuildexe_located_in_0" xml:space="preserve">
     <value>Using MSBuild.exe located in '{0}'.</value>
   </data>
-  <data name="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer" xml:space="preserve">
-    <value>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</value>
-  </data>
   <data name="Include_generated_code_files_in_formatting_operations" xml:space="preserve">
     <value>Include generated code files in formatting operations.</value>
   </data>

src/dotnet-format.csproj

@@ -28,7 +28,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Build" ExcludeAssets="Runtime" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Build.Locator" />
 
     <PackageReference Include="Microsoft.CodeAnalysis" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />

src/xlf/Resources.cs.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">Nepovedlo se najít MSBuild. Ujistěte se, že se sada .NET SDK nainstalovala pomocí oficiálního instalačního programu.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">Nepovedlo se najít .NET CLI. Ujistěte se, že se nachází v proměnné PATH.</target>

src/xlf/Resources.de.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">MSBuild wurde nicht gefunden. Stellen Sie sicher, dass das .NET SDK mit dem offiziellen Installationsprogramm installiert wurde.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">Die dotnet-CLI wurde nicht gefunden. Stellen Sie sicher, dass sie sich im Pfad befindet.</target>

src/xlf/Resources.es.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">No se encuentra MSBuild. Asegúrese de que el SDK de .NET se haya instalado con el instalador oficial.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">No se encuentra la CLI de dotnet. Asegúrese de que esté en la ruta de acceso (PATH).</target>

src/xlf/Resources.fr.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">Impossible de localiser MSBuild. Vérifiez que le SDK .NET a été installé avec le programme d'installation officiel.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">Impossible de localiser l'interface CLI dotnet. Vérifiez qu'elle est dans le chemin.</target>

src/xlf/Resources.it.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">Non è possibile individuare MSBuild. Assicurarsi che .NET SDK sia stato installato con il programma di installazione ufficiale.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">Non è possibile individuare l'interfaccia della riga di comando di dotnet. Assicurarsi che sia indicata in PATH.</target>

src/xlf/Resources.ja.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">MSBuild が見つかりません。.NET SDK が正式なインストーラーでインストールされたことを確認してください。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">dotnet CLI が見つかりません。PATH 上にあることを確認してください。</target>

src/xlf/Resources.ko.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">MSBuild를 찾을 수 없습니다. 공식 설치 관리자를 사용하여 .NET SDK를 설치했는지 확인하세요.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">dotnet CLI를 찾을 수 없습니다. PATH에 있는지 확인하세요.</target>

src/xlf/Resources.pl.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">Nie można zlokalizować programu MSBuild. Upewnij się, że zestaw .NET SDK został zainstalowany przy użyciu oficjalnego instalatora.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">Nie można zlokalizować wiersza polecenia dotnet. Upewnij się, że znajduje się on w ścieżce.</target>

src/xlf/Resources.pt-BR.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">Não é possível localizar o MSBuild. Verifique se o SDK do .NET foi instalado com o instalador oficial.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">Não é possível localizar a CLI do dotnet. Verifique se está no CAMINHO.</target>

src/xlf/Resources.ru.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">Не удается найти MSBuild. Убедитесь, что пакет SDK для .NET был установлен с официальным установщиком.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">Не удалось найти CLI dotnet. Убедитесь, что путь к нему добавлен в переменную среды PATH.</target>

src/xlf/Resources.tr.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">MSBuild bulunamıyor. .NET SDK'nın resmi yükleyici kullanılarak yüklendiğinden emin olun.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">dotnet CLI bulunamıyor. dotnet CLI'nin PATH üzerinde olduğundan emin olun.</target>

src/xlf/Resources.zh-Hans.xlf

@@ -372,11 +372,6 @@
         <target state="new">Unable to fix {0}. No associated code fix found.</target>
         <note />
       </trans-unit>
-      <trans-unit id="Unable_to_locate_MSBuild_Ensure_the_NET_SDK_was_installed_with_the_official_installer">
-        <source>Unable to locate MSBuild. Ensure the .NET SDK was installed with the official installer.</source>
-        <target state="translated">无法找到 MSBuild。请确保 .NET SDK 是与官方安装程序一起安装的。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Unable_to_locate_dotnet_CLI_Ensure_that_it_is_on_the_PATH">
         <source>Unable to locate dotnet CLI. Ensure that it is on the PATH.</source>
         <target state="translated">找不到 dotnet CLI。请确保它在路径上。</target>