From 4a6444aab77a7d74a7dd1b456657ea8f397d90de Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 25 Apr 2023 16:25:21 +0000
Subject: [PATCH 1/6] Initial enablement of source-build prebuilt detection

---
 NuGet.config                        | 10 +++++++++
 eng/SourceBuildPrebuiltBaseline.xml | 31 ++++++++++++++++++++++++-
 eng/Version.Details.xml             | 35 +++++++++++++++++++++++++++--
 3 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 15dee8bebd..307961cc9a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,6 +6,8 @@
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <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" />
+    <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
+    <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
   </packageSources>
   <!-- Define mappings by adding package patterns beneath the target source. -->
   <packageSourceMapping>
@@ -18,8 +20,10 @@
     </packageSource>
     <packageSource key="dotnet-libraries">
       <package pattern="System.*" />
+      <package pattern="Microsoft.SourceBuild.Intermediate.*" />
     </packageSource>
     <packageSource key="dotnet-tools">
+      <package pattern="Microsoft.SourceBuild.Intermediate.*" />
       <package pattern="Microsoft.*" />
       <package pattern="NuGet.*" />
     </packageSource>
@@ -46,6 +50,12 @@
       <package pattern="vswhere" />
       <package pattern="xunit*" />
     </packageSource>
+    <packageSource key="dotnet-libraries-transport">
+      <package pattern="Microsoft.SourceBuild.Intermediate.*" />
+    </packageSource>
+    <packageSource key="dotnet8-transport">
+      <package pattern="Microsoft.SourceBuild.Intermediate.*" />
+    </packageSource>
   </packageSourceMapping>
   <disabledPackageSources />
 </configuration>
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index c1b6dfbf05..78c6c257e2 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -1,5 +1,34 @@
 <UsageData>
   <IgnorePatterns>
-    <UsagePattern IdentityGlob="*/*" />
+    <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
+
+    <!-- TODO: Address these prebuilts as part of https://github.com/dotnet/format/issues/1809 -->
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*3.3.4*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Common/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp.Features/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp.Workspaces/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Elfie/*1.0.0*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Features/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Scripting.Common/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.VisualBasic/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.VisualBasic.Features/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.VisualBasic.Workspaces/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Workspaces.Common/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Workspaces.MSBuild/*4.6.0-2.23177.13*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/*7.0.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/*7.0.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.FileSystemGlobbing/*7.0.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.Logging/*7.0.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.Options/*7.0.0*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/*7.0.0*" />
+    <UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*4.5.0*" />
+    <UsagePattern IdentityGlob="System.Data.DataSetExtensions/*4.5.0*" />
+    <UsagePattern IdentityGlob="System.Security.AccessControl/*4.5.0*" />
+    <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*4.5.0*" />
+    <UsagePattern IdentityGlob="System.Security.Permissions/*4.5.0*" />
+    <UsagePattern IdentityGlob="System.Security.Principal.Windows/*4.5.0*" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e8d4a5f736..40cf209a9f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,19 +5,50 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23221.1">
+      <Uri>https://github.com/dotnet/source-build-externals</Uri>
+      <Sha>834923aef31d157aec19a2b99d5494cea29dcc9e</Sha>
+      <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
+    </Dependency>
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23224.2">
+      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
+      <Sha>13c96423adba681296bda86bdbe24631a9b5e9bc</Sha>
+      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
+    </Dependency>
+    <Dependency Name="Microsoft.DiaSymReader" Version="2.0.0-beta-22503-02">
+      <Uri>https://github.com/dotnet/symreader</Uri>
+      <Sha>0c29b7109c054bdc578e917515ae7e8635b9cb9d</Sha>
+      <SourceBuild RepoName="symreader" ManagedOnly="true" />
+    </Dependency>
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.356401">
+      <Uri>https://github.com/dotnet/command-line-api</Uri>
+      <Sha>8374d5fca634a93458c84414b1604c12f765d1ab</Sha>
+      <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
+    </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.22564.1">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>350a618ab44932c568ae2392d7a571281baed59a</Sha>
+      <Sha>8374d5fca634a93458c84414b1604c12f765d1ab</Sha>
     </Dependency>
     <Dependency Name="System.CommandLine.Rendering" Version="0.4.0-alpha.22564.1">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>350a618ab44932c568ae2392d7a571281baed59a</Sha>
+      <Sha>8374d5fca634a93458c84414b1604c12f765d1ab</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23255.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>94d40fc8f3d17444772d90db73469d795a68a421</Sha>
+      <SourceBuild RepoName="arcade" ManagedOnly="true" />
+    </Dependency>
+    <Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+      <Uri>https://github.com/dotnet/sourcelink</Uri>
+      <Sha>47c52dd2ebf9edfd40abdcff999c13eb461f6ce2</Sha>
+      <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23253.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
+      <Sha>513000e77df5ec1f9b86397d8df6e3254703c636</Sha>
+      <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

From cf55af0f5b146a306b38665956257733dfffbb93 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 1 May 2023 21:27:57 +0000
Subject: [PATCH 2/6] Update nuget.config

---
 NuGet.config | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 307961cc9a..fa59c09a37 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,10 +4,10 @@
     <clear />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
-    <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" />
     <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
+    <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>
   <!-- Define mappings by adding package patterns beneath the target source. -->
   <packageSourceMapping>
@@ -20,10 +20,15 @@
     </packageSource>
     <packageSource key="dotnet-libraries">
       <package pattern="System.*" />
-      <package pattern="Microsoft.SourceBuild.Intermediate.*" />
+      <package pattern="Microsoft.*" />
+    </packageSource>
+    <packageSource key="dotnet-libraries-transport">
+      <package pattern="Microsoft.*" />
+    </packageSource>
+    <packageSource key="dotnet8-transport">
+      <package pattern="Microsoft.*" />
     </packageSource>
     <packageSource key="dotnet-tools">
-      <package pattern="Microsoft.SourceBuild.Intermediate.*" />
       <package pattern="Microsoft.*" />
       <package pattern="NuGet.*" />
     </packageSource>
@@ -50,12 +55,6 @@
       <package pattern="vswhere" />
       <package pattern="xunit*" />
     </packageSource>
-    <packageSource key="dotnet-libraries-transport">
-      <package pattern="Microsoft.SourceBuild.Intermediate.*" />
-    </packageSource>
-    <packageSource key="dotnet8-transport">
-      <package pattern="Microsoft.SourceBuild.Intermediate.*" />
-    </packageSource>
   </packageSourceMapping>
   <disabledPackageSources />
 </configuration>

From 7488313524e000961e5f65e41479431175bd9b6f Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 2 May 2023 21:52:25 +0000
Subject: [PATCH 3/6] workaround
 https://github.com/dotnet/source-build/issues/3392

---
 Directory.Packages.props            | 16 ++++++++--------
 eng/SourceBuildPrebuiltBaseline.xml | 20 --------------------
 eng/Version.Details.xml             |  1 +
 eng/Versions.props                  |  2 +-
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 86401f6856..227c4ca964 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -11,14 +11,14 @@
     <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalzerTestingVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNetCompilersToolsetPackageVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNetCompilersToolsetVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftNetCompilersToolsetVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftNetCompilersToolsetVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNetCompilersToolsetVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNetCompilersToolsetVersion)" />
     <PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 78c6c257e2..8020ad52be 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -3,32 +3,12 @@
     <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
 
     <!-- TODO: Address these prebuilts as part of https://github.com/dotnet/format/issues/1809 -->
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*3.3.4*" />
     <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Common/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp.Features/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp.Workspaces/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Elfie/*1.0.0*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Features/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Scripting.Common/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.VisualBasic/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.VisualBasic.Features/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.VisualBasic.Workspaces/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Workspaces.Common/*4.6.0-2.23177.13*" />
-    <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Workspaces.MSBuild/*4.6.0-2.23177.13*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/*7.0.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/*7.0.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.FileSystemGlobbing/*7.0.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Logging/*7.0.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Options/*7.0.0*" />
     <UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/*7.0.0*" />
-    <UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*4.5.0*" />
-    <UsagePattern IdentityGlob="System.Data.DataSetExtensions/*4.5.0*" />
-    <UsagePattern IdentityGlob="System.Security.AccessControl/*4.5.0*" />
-    <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*4.5.0*" />
-    <UsagePattern IdentityGlob="System.Security.Permissions/*4.5.0*" />
-    <UsagePattern IdentityGlob="System.Security.Principal.Windows/*4.5.0*" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 40cf209a9f..3069cb6c15 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,6 +4,7 @@
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-1.23226.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
+      <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23221.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index af52c71b00..444e233a34 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,7 +29,7 @@
     <!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
     <NuGetVersion>6.6.0-preview.3.61</NuGetVersion>
     <!-- roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>4.7.0-1.23226.15</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftNetCompilersToolsetVersion>4.7.0-1.23226.15</MicrosoftNetCompilersToolsetVersion>
     <!-- roslyn-sdk -->
     <MicrosoftCodeAnalysisAnalzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalzerTestingVersion>
     <!-- runtime -->

From 0e41535379487d47f6b523be853460f9c7bff38e Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 3 May 2023 22:08:46 +0000
Subject: [PATCH 4/6] Update dependencies

---
 Directory.Packages.props            | 16 +++++++--------
 eng/SourceBuildPrebuiltBaseline.xml | 10 +++-------
 eng/Version.Details.xml             | 30 ++++++++++++++++++++++++++---
 eng/Versions.props                  |  9 ++++++++-
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 227c4ca964..5e419edc47 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -11,14 +11,14 @@
     <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalzerTestingVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNetCompilersToolsetVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNetCompilersToolsetVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpFeaturesVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftCodeAnalysisFeaturesVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftCodeAnalysisVisualBasicFeaturesVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVisualBasicWorkspacesVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVisualBasicVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 8020ad52be..33f3aea13d 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -2,13 +2,9 @@
   <IgnorePatterns>
     <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
 
-    <!-- TODO: Address these prebuilts as part of https://github.com/dotnet/format/issues/1809 -->
+    <!-- This is a transitive dependency from Microsoft.CodeAnalysis.
+         This version does not have source build intermediate.
+         When a newer version is picked up, an intermediate should be utilized. -->
     <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/*7.0.0*" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/*7.0.0*" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.FileSystemGlobbing/*7.0.0*" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.Logging/*7.0.0*" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.Options/*7.0.0*" />
-    <UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/*7.0.0*" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3069cb6c15..cd11f3fb57 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-1.23226.15">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0-1.23226.153">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-1.23226.15">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.7.0-1.23226.15">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.7.0-1.23226.15">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic" Version="4.7.0-1.23226.15">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0-1.23226.15">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.7.0-1.23226.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
@@ -11,9 +35,9 @@
       <Sha>834923aef31d157aec19a2b99d5494cea29dcc9e</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23224.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23253.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>13c96423adba681296bda86bdbe24631a9b5e9bc</Sha>
+      <Sha>c65b02aef21850de618d37a5304d3bbd829c2733</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DiaSymReader" Version="2.0.0-beta-22503-02">
diff --git a/eng/Versions.props b/eng/Versions.props
index 444e233a34..cae9d92d84 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,7 +29,14 @@
     <!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
     <NuGetVersion>6.6.0-preview.3.61</NuGetVersion>
     <!-- roslyn -->
-    <MicrosoftNetCompilersToolsetVersion>4.7.0-1.23226.15</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisCSharpFeaturesVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisFeaturesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisFeaturesVersion>
+    <MicrosoftCodeAnalysisVisualBasicFeaturesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVisualBasicFeaturesVersion>
+    <MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>
+    <MicrosoftCodeAnalysisVisualBasicVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVisualBasicVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
+    <MicrosoftCodeAnalysisVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVersion>
     <!-- roslyn-sdk -->
     <MicrosoftCodeAnalysisAnalzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalzerTestingVersion>
     <!-- runtime -->

From ef3b3b9f2c91d3feb87978a6346a0df73c7683d3 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 3 May 2023 22:10:13 +0000
Subject: [PATCH 5/6] Fixups

---
 eng/SourceBuildPrebuiltBaseline.xml | 2 +-
 eng/Version.Details.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 33f3aea13d..5431e909d1 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -4,7 +4,7 @@
 
     <!-- This is a transitive dependency from Microsoft.CodeAnalysis.
          This version does not have source build intermediate.
-         When a newer version is picked up, an intermediate should be utilized. -->
+         When a newer version is picked up, the intermediate should be utilized. -->
     <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cd11f3fb57..3277269dff 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0-1.23226.153">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0-1.23226.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
     </Dependency>

From ef303cf2ecac6a2d746cee04e557fe6fc150c91a Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 9 May 2023 15:44:31 +0000
Subject: [PATCH 6/6] Revert to a single roslyn version property

---
 Directory.Packages.props | 14 +++++++-------
 eng/Version.Details.xml  | 24 ------------------------
 eng/Versions.props       |  7 -------
 3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 5e419edc47..60bffbfec9 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -11,13 +11,13 @@
     <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalzerTestingVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpFeaturesVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftCodeAnalysisFeaturesVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftCodeAnalysisVisualBasicFeaturesVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVisualBasicWorkspacesVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVisualBasicVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3277269dff..732ad4f888 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0-1.23226.15">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-1.23226.15">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.7.0-1.23226.15">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.7.0-1.23226.15">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic" Version="4.7.0-1.23226.15">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0-1.23226.15">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
-    </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis" Version="4.7.0-1.23226.15">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>56393223b78d294bccec3101e79dc03e1b3cb683</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index cae9d92d84..6ef0b5eaf2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,13 +29,6 @@
     <!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
     <NuGetVersion>6.6.0-preview.3.61</NuGetVersion>
     <!-- roslyn -->
-    <MicrosoftCodeAnalysisCSharpFeaturesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisCSharpFeaturesVersion>
-    <MicrosoftCodeAnalysisCSharpVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisFeaturesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisFeaturesVersion>
-    <MicrosoftCodeAnalysisVisualBasicFeaturesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVisualBasicFeaturesVersion>
-    <MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>
-    <MicrosoftCodeAnalysisVisualBasicVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVisualBasicVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
     <MicrosoftCodeAnalysisVersion>4.7.0-1.23226.15</MicrosoftCodeAnalysisVersion>
     <!-- roslyn-sdk -->
     <MicrosoftCodeAnalysisAnalzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalzerTestingVersion>