From 5b138901abdfe8f971b6df0f0593e0dc84b96879 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Wed, 7 Sep 2022 16:04:49 -0700
Subject: [PATCH] Remove direct dependency on diagnostics repo (#14465)

---
 eng/Version.Details.xml                       |  5 --
 ...t.Extensions.Logging-version-so-that.patch | 68 -------------------
 2 files changed, 73 deletions(-)
 delete mode 100644 src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ced8ba92c..05f91a68a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -181,11 +181,6 @@
       <Sha>c3ad00ae84489071080a606f6a8e43c9a91a5cc2</Sha>
       <SourceBuildTarball RepoName="deployment-tools" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.diagnostics" Version="5.0.0-preview.21506.1">
-      <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>ab3eb7a525e31dc6fb4d9cc0b7154fa2be58dac1</Sha>
-      <SourceBuild RepoName="diagnostics" ManagedOnly="true" />
-    </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22425.2">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
       <Sha>e53b62ccc6a887987efdb820334594b674f6071d</Sha>
diff --git a/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch b/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch
deleted file mode 100644
index df105b15d..000000000
--- a/src/SourceBuild/tarball/patches/diagnostics/0001-Pin-the-Microsoft.Extensions.Logging-version-so-that.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons <msimons@microsoft.com>
-Date: Thu, 2 Jun 2022 19:27:41 +0000
-Subject: [PATCH] Pin the Microsoft.Extensions.Logging version so that
- source-build does not pick up latest
-
-Backport: https://github.com/dotnet/diagnostics/pull/3121
----
- eng/Versions.props                                            | 2 +-
- .../Microsoft.Diagnostics.Monitoring.EventPipe.csproj         | 2 +-
- .../Microsoft.Diagnostics.NETCore.Client.csproj               | 2 +-
- src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj              | 4 ++--
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/eng/Versions.props b/eng/Versions.props
-index b4edc421..17c6f9d3 100644
---- a/eng/Versions.props
-+++ b/eng/Versions.props
-@@ -48,7 +48,7 @@
-     <MicrosoftDiagnosticsRuntimeUtilitiesVersion>2.0.250401</MicrosoftDiagnosticsRuntimeUtilitiesVersion>
-     <MicrosoftDiaSymReaderNativePackageVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativePackageVersion>
-     <MicrosoftDiagnosticsTracingTraceEventVersion>2.0.64</MicrosoftDiagnosticsTracingTraceEventVersion>
--    <MicrosoftExtensionsLoggingVersion>2.1.1</MicrosoftExtensionsLoggingVersion>
-+    <MicrosoftExtensionsLoggingPinnedVersion>2.1.1</MicrosoftExtensionsLoggingPinnedVersion>
-     <!-- Need version that understands UseAppFilters sentinel. -->
-     <MicrosoftExtensionsLoggingEventSourceVersion>5.0.1</MicrosoftExtensionsLoggingEventSourceVersion>
-     <SystemCommandLineVersion>2.0.0-beta1.20468.1</SystemCommandLineVersion>
-diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj
-index 733d18da..db90173d 100644
---- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj
-+++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj
-@@ -29,7 +29,7 @@
-   <ItemGroup>
-     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" />
-     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
--    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
-+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
-     <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsVersion)" />
-     <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
-     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
-diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
-index 929f82d0..5cb2d582 100644
---- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
-+++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj
-@@ -20,7 +20,7 @@
- 
-   <ItemGroup>
-     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
--    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
-+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
-   </ItemGroup>
- 
-   <ItemGroup>
-diff --git a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
-index 73fd6f82..3afa7132 100644
---- a/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
-+++ b/src/Tools/dotnet-dsrouter/dotnet-dsrouter.csproj
-@@ -22,8 +22,8 @@
-   <ItemGroup>
-     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" GeneratePathProperty="true" />
-     <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
--    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
--    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingVersion)" />
-+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
-+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingPinnedVersion)" />
-   </ItemGroup>
- 
- </Project>