diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
index fcac02fbd..2866b7f1e 100644
--- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
+++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
@@ -59,9 +59,6 @@
   <File Path="dotnet-sdk-x.y.z-banana-rid.tar/sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.TypedParts.dll">
     <Type>AssemblyAttribute</Type>
   </File>
-  <File Path="dotnet-sdk-x.y.z-banana-rid.tar/sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.IO.Pipelines.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
   <File Path="dotnet-sdk-x.y.z-banana-rid.tar/sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll">
     <Type>AssemblyAttribute</Type>
   </File>
@@ -242,6 +239,12 @@
   <File Path="Microsoft.DotNet.Arcade.Sdk.x.y.z/tools/netx.y/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll">
     <Type>AssemblyAttribute</Type>
   </File>
+  <File Path="Microsoft.DotNet.Arcade.Sdk.x.y.z/tools/netx.y/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll">
+    <Type>AssemblyAttribute</Type>
+  </File>
+  <File Path="Microsoft.DotNet.Arcade.Sdk.x.y.z/tools/netx.y/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll">
+    <Type>AssemblyAttribute</Type>
+  </File>
   <File Path="Microsoft.DotNet.Arcade.Sdk.x.y.z/tools/netx.y/runtimes/win/lib/netx.y/System.Drawing.Common.dll">
     <Type>AssemblyAttribute</Type>
   </File>
@@ -254,6 +257,9 @@
   <File Path="Microsoft.DotNet.Arcade.Sdk.x.y.z/tools/netx.y/System.Configuration.ConfigurationManager.dll">
     <Type>AssemblyAttribute</Type>
   </File>
+  <File Path="Microsoft.DotNet.Arcade.Sdk.x.y.z/tools/netx.y/System.Diagnostics.EventLog.dll">
+    <Type>AssemblyAttribute</Type>
+  </File>
   <File Path="Microsoft.DotNet.Arcade.Sdk.x.y.z/tools/netx.y/System.Drawing.Common.dll">
     <Type>AssemblyAttribute</Type>
   </File>
@@ -404,6 +410,12 @@
   <File Path="Microsoft.DotNet.Build.Tasks.Packaging.x.y.z/tools/netx.y/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll">
     <Type>AssemblyAttribute</Type>
   </File>
+  <File Path="Microsoft.DotNet.Build.Tasks.Packaging.x.y.z/tools/netx.y/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll">
+    <Type>AssemblyAttribute</Type>
+  </File>
+  <File Path="Microsoft.DotNet.Build.Tasks.Packaging.x.y.z/tools/netx.y/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll">
+    <Type>AssemblyAttribute</Type>
+  </File>
   <File Path="Microsoft.DotNet.Build.Tasks.Packaging.x.y.z/tools/netx.y/runtimes/win/lib/netx.y/System.Drawing.Common.dll">
     <Type>AssemblyAttribute</Type>
   </File>
@@ -419,6 +431,9 @@
   <File Path="Microsoft.DotNet.Build.Tasks.Packaging.x.y.z/tools/netx.y/System.Configuration.ConfigurationManager.dll">
     <Type>AssemblyAttribute</Type>
   </File>
+  <File Path="Microsoft.DotNet.Build.Tasks.Packaging.x.y.z/tools/netx.y/System.Diagnostics.EventLog.dll">
+    <Type>AssemblyAttribute</Type>
+  </File>
   <File Path="Microsoft.DotNet.Build.Tasks.Packaging.x.y.z/tools/netx.y/System.Drawing.Common.dll">
     <Type>AssemblyAttribute</Type>
   </File>
@@ -1160,250 +1175,10 @@
   <File Path="Microsoft.NET.ILLink.Tasks.x.y.z/tools/net472/System.Reflection.Metadata.dll">
     <Type>AssemblyAttribute</Type>
   </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/Microsoft.VisualBasic.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/Microsoft.Win32.Primitives.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/mscorlib.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/netstandard.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
   <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/netstandard/System.Collections.Immutable.dll">
     <Type>AssemblyAttribute</Type>
   </File>
   <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/netstandard/System.Reflection.Metadata.dll">
     <Type>AssemblyAttribute</Type>
   </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.AppContext.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Buffers.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.ComponentModel.DataAnnotations.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Configuration.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Core.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Data.DataSetExtensions.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Data.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Diagnostics.Contracts.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Diagnostics.Debug.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Diagnostics.Tools.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Diagnostics.Tracing.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Drawing.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Dynamic.Runtime.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Globalization.Calendars.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Globalization.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Globalization.Extensions.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.IO.Compression.FileSystem.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.IO.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.IO.FileSystem.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.IO.FileSystem.Primitives.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.IO.UnmanagedMemoryStream.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Net.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Numerics.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Numerics.Vectors.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Reflection.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Reflection.Emit.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Reflection.Emit.ILGeneration.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Reflection.Emit.Lightweight.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Reflection.Extensions.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Reflection.Primitives.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Resources.Reader.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Resources.ResourceManager.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.CompilerServices.Unsafe.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.Extensions.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.Handles.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.InteropServices.RuntimeInformation.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.Intrinsics.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.Loader.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.Serialization.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.Serialization.Json.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Runtime.Serialization.Xml.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.Cryptography.Algorithms.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.Cryptography.Cng.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.Cryptography.Csp.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.Cryptography.Encoding.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.Cryptography.OpenSsl.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.Cryptography.Primitives.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.Cryptography.X509Certificates.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.Principal.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Security.SecureString.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.ServiceModel.Web.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.ServiceProcess.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Text.Encoding.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Text.Encoding.Extensions.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Threading.Overlapped.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Threading.Tasks.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Threading.Tasks.Extensions.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Threading.Thread.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Threading.ThreadPool.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Threading.Timer.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Transactions.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.ValueTuple.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Web.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Windows.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Xml.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Xml.Linq.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Xml.ReaderWriter.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Xml.Serialization.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Xml.XDocument.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Xml.XmlDocument.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Xml.XmlSerializer.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/System.Xml.XPath.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-  <File Path="runtime.portable-rid.Microsoft.DotNet.ILCompiler.x.y.z/tools/WindowsBase.dll">
-    <Type>AssemblyAttribute</Type>
-  </File>
-</PrebuiltLeakReport>
+</PrebuiltLeakReport>
\ No newline at end of file