[main] Source code updates from dotnet/dotnet

eng/Version.Details.props

@@ -12,8 +12,8 @@ This file should be imported by eng/Versions.props
     <MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25625.1</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- dotnet/dotnet dependencies -->
     <MicrosoftDotNetFileBasedProgramsPackageVersion>10.0.200-preview.0.25556.104</MicrosoftDotNetFileBasedProgramsPackageVersion>
-    <RoslynDiagnosticsAnalyzersPackageVersion>5.3.0-2.26055.102</RoslynDiagnosticsAnalyzersPackageVersion>
-    <SystemCommandLinePackageVersion>3.0.0-alpha.1.26055.102</SystemCommandLinePackageVersion>
+    <RoslynDiagnosticsAnalyzersPackageVersion>5.3.0-2.26055.114</RoslynDiagnosticsAnalyzersPackageVersion>
+    <SystemCommandLinePackageVersion>3.0.0-alpha.1.26055.114</SystemCommandLinePackageVersion>
     <!-- dotnet/runtime dependencies -->
     <MicrosoftBclAsyncInterfacesPackageVersion>9.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsConfigurationPackageVersion>9.0.0</MicrosoftExtensionsConfigurationPackageVersion>

eng/Version.Details.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="fb2e783fa530d337a56ef5c528a2807b7d63e46d" BarId="296040" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="67ecf9e85940271afc2728753b09789c64bfecf2" BarId="296137" />
   <ProductDependencies>
     <!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
     <Dependency Name="Microsoft.CodeAnalysis" Version="5.3.0-2.25625.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>5dd606bb21208dfc6fd3d9b07ae963a93248483b</Sha>
     </Dependency>
-    <Dependency Name="System.CommandLine" Version="3.0.0-alpha.1.26055.102">
+    <Dependency Name="System.CommandLine" Version="3.0.0-alpha.1.26055.114">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>fb2e783fa530d337a56ef5c528a2807b7d63e46d</Sha>
+      <Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
     </Dependency>
     <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
     <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0">
@@ -161,9 +161,9 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>5dd606bb21208dfc6fd3d9b07ae963a93248483b</Sha>
     </Dependency>
-    <Dependency Name="Roslyn.Diagnostics.Analyzers" Version="5.3.0-2.26055.102">
+    <Dependency Name="Roslyn.Diagnostics.Analyzers" Version="5.3.0-2.26055.114">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>fb2e783fa530d337a56ef5c528a2807b7d63e46d</Sha>
+      <Sha>67ecf9e85940271afc2728753b09789c64bfecf2</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/targets/TargetFrameworks.props

@@ -22,35 +22,13 @@
   </PropertyGroup>
 
   <!--
-    There are effectively three modes that are needed for our source build TFMs and this is where
-    we calculate them
+    These are the modes that are needed for our source build TFMs and this is where we calculate them
   -->
   <Choose>
     <!--
-      1. CI source build leg: this needs to build the current and previous source build TFM. Both are
-         necessary as the output of this leg is used in other CI source build legs. Those could be
-         targeting NetCurrent or NetPrevious hence we must produce both.
-
-        However the toolset package we produce must target NetPrevious. This package gets used as the
-        bootstrap toolset in other repos doing (1). Those can be using a NetPrevious runtime hence
-        the toolset must support that.
-    -->
-    <When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' != 'true'">
-      <PropertyGroup>
-        <!-- TODO until we figure out what is up with NetPrevious -->
-        <NetPrevious>$(NetMinimum)</NetPrevious>
-        <NetRoslyn>$(NetPrevious)</NetRoslyn>
-        <NetRoslynSourceBuild>$(NetCurrent);$(NetPrevious)</NetRoslynSourceBuild>
-        <NetRoslynAll>$(NetCurrent);$(NetPrevious)</NetRoslynAll>
-        <NetRoslynBuildHostNetCoreVersion>$(NetPrevious)</NetRoslynBuildHostNetCoreVersion>
-        <NetRoslynNext>$(NetPrevious)</NetRoslynNext>
-      </PropertyGroup>
-    </When>
-
-    <!--
-      2. Source build the product: this is the all up build of the product which needs only NetCurrent
+      Source build the product: this is the all up build of the product which needs only NetCurrent
     -->
-    <When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' == 'true'">
+    <When Condition="'$(DotNetBuildSourceOnly)' == 'true'">
       <PropertyGroup>
         <NetRoslyn>$(NetCurrent)</NetRoslyn>
         <NetRoslynSourceBuild>$(NetCurrent)</NetRoslynSourceBuild>
@@ -61,9 +39,9 @@
     </When>
 
     <!--
-      3. Everything else including normal CI, developer machines and official builds. This brings in enough
-         TFM that source build will go smoothly but doesn't bring in all source build TFMs to avoid adding
-         too many extra compiles to our builds
+      Everything else including normal CI, developer machines and official builds. This brings in enough
+      TFM that source build will go smoothly but doesn't bring in all source build TFMs to avoid adding
+      too many extra compiles to our builds
     -->
     <Otherwise>
       <PropertyGroup>