From 810abdb59ecf8082da6ca39788d843fe21315bd5 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 26 Nov 2024 17:29:29 -0800
Subject: [PATCH 1/4] Updating the Microsoft Extensions packages to 8.0
 versions as they are pulling in an old version of STJ

---
 eng/dependabot/Packages.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props
index 921ae22ea46..0017235bb06 100644
--- a/eng/dependabot/Packages.props
+++ b/eng/dependabot/Packages.props
@@ -9,9 +9,9 @@
     <PackageReference Update="Microsoft.Build.Framework" Version="17.7.2" />
     <PackageReference Update="Microsoft.Build.Utilities.Core" Version="17.7.2" />
     <PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     <PackageReference Update="NuGet.Configuration" Version="6.7.1" />
     <PackageReference Update="NuGet.Credentials" Version="6.7.1" />
     <PackageReference Update="NuGet.Protocol" Version="6.7.1" />

From 6a8b347644b43ddf3fe66c80ebd645c1bc18ec8b Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Mon, 2 Dec 2024 13:19:47 -0800
Subject: [PATCH 2/4] Add three Microsoft.Extensions projects to
 version.details.xml to fix source build

---
 eng/Package.props             |  3 +++
 eng/Version.Details.xml       | 13 +++++++++++++
 eng/Versions.props            |  3 +++
 eng/dependabot/Packages.props |  3 ---
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/eng/Package.props b/eng/Package.props
index 85f63c6f07b..ee9db5a5169 100644
--- a/eng/Package.props
+++ b/eng/Package.props
@@ -32,6 +32,9 @@
 
   <ItemGroup>
     <PackageReference Update="System.CommandLine" Version="$(SystemCommandLinePackageVersion)" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
     <!--Analyzer dependencies-->
     <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)" />
     <!--Test dependencies-->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f6fa0199260..d6c367242b2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -27,9 +27,22 @@
       <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
       <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
     </Dependency>
+    <!-- Dependencies required for source build. We'll still update manually -->
     <Dependency Name="System.Formats.Asn1" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.Extensions.Logging" Version="8.0.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.1">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 49aa182df27..7463c4d0d08 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -25,5 +25,8 @@
   <PropertyGroup>
     <!-- Non-maestro versions -->
     <SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
+    <MicrosoftExtensionsLoggingPackageVersion>8.0.1</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>8.0.2</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>8.0.1</MicrosoftExtensionsLoggingConsolePackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props
index 0017235bb06..269c26f87a4 100644
--- a/eng/dependabot/Packages.props
+++ b/eng/dependabot/Packages.props
@@ -9,9 +9,6 @@
     <PackageReference Update="Microsoft.Build.Framework" Version="17.7.2" />
     <PackageReference Update="Microsoft.Build.Utilities.Core" Version="17.7.2" />
     <PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     <PackageReference Update="NuGet.Configuration" Version="6.7.1" />
     <PackageReference Update="NuGet.Credentials" Version="6.7.1" />
     <PackageReference Update="NuGet.Protocol" Version="6.7.1" />

From eaa320ea1351fa92c6b2f6e854bee2fae424dfad Mon Sep 17 00:00:00 2001
From: Jason Zhai <v-wuzhai@microsoft.com>
Date: Tue, 3 Dec 2024 18:44:25 -0800
Subject: [PATCH 3/4] Add a package dependency for
 Microsoft.Extensions.DependencyInjection.Abstractions

---
 eng/Version.Details.xml | 4 ++++
 eng/Versions.props      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d6c367242b2..f2f9a4e7bd4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -44,5 +44,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>ef07c4f26e56f6d140938c88ba64375dfefc285f</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7463c4d0d08..14f36840b73 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,5 +28,6 @@
     <MicrosoftExtensionsLoggingPackageVersion>8.0.1</MicrosoftExtensionsLoggingPackageVersion>
     <MicrosoftExtensionsLoggingAbstractionsPackageVersion>8.0.2</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
     <MicrosoftExtensionsLoggingConsolePackageVersion>8.0.1</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>8.0.2</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
   </PropertyGroup>
 </Project>

From 9b583a9d981971119c8b95a0c01778208b0b0d11 Mon Sep 17 00:00:00 2001
From: Jason Zhai <v-wuzhai@microsoft.com>
Date: Tue, 3 Dec 2024 19:08:50 -0800
Subject: [PATCH 4/4] Update SourceBuildPrebuiltBaseLine.xml with latest
 package versions

---
 eng/SourceBuildPrebuiltBaseline.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 87fa35f9be0..2d52ed867fd 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -10,5 +10,11 @@
     <UsagePattern IdentityGlob="System.Formats.Asn1/8.0.*" />
 
     <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
+
+    <!-- These are upgraded to latest versions in product build and can be baselined for repo build -->
+    <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.Extensions.Logging.Abstractions/8.0.*" />
+    <UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/8.0.*" />
   </IgnorePatterns>
 </UsageData>