From 504b154a3836cc3138be55595b22571cb1edb92f Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Wed, 3 May 2023 22:20:59 +0000
Subject: [PATCH 1/2] Enable source-build prebuilts detection

---
 eng/SourceBuildPrebuiltBaseline.xml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index c1b6dfbf0..a72fd1ad8 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -1,5 +1,29 @@
 <UsageData>
   <IgnorePatterns>
-    <UsagePattern IdentityGlob="*/*" />
+    <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
+
+    <!--
+      Temporary exclusion for NuGet packages, since NuGet is not producing source-build intermediate package,
+      see: https://github.com/NuGet/Home/issues/11059
+
+      Once that's fixed, NuGet package version should be updated to newest, and intermediate product dependency
+      added to Version.Details.xml
+    -->
+    <UsagePattern IdentityGlob="NuGet.Common/*5.8.0*" />
+    <UsagePattern IdentityGlob="NuGet.Configuration/*5.8.0*" />
+    <UsagePattern IdentityGlob="NuGet.Frameworks/*5.8.0*" />
+    <UsagePattern IdentityGlob="NuGet.Packaging/*5.8.0*" />
+    <UsagePattern IdentityGlob="NuGet.Versioning/*5.8.0*" />
+
+    <!-- Referenced by NuGet.Packaging.5.8.0 - could be resolved when version of NuGet packages gets updated. -->
+    <UsagePattern IdentityGlob="System.Security.Cryptography.Cng/5.0.0-preview.3.20214.6" />
+    <UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0-preview.3.20214.6" />
+
+    <!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
+    <UsagePattern IdentityGlob="Microsoft.NET.Workload.Mono.ToolChain*/*8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/*8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/*8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.NETCore.Platforms/*8.0.*" />
   </IgnorePatterns>
 </UsageData>

From cd7f23a556129ec469a70bcac37b6b297d819df1 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 4 May 2023 16:23:00 +0000
Subject: [PATCH 2/2] Update runtime dependency tag

---
 eng/SourceBuildPrebuiltBaseline.xml | 4 ----
 eng/Version.Details.xml             | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index a72fd1ad8..3c67bed75 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -20,10 +20,6 @@
     <UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0-preview.3.20214.6" />
 
     <!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
-    <UsagePattern IdentityGlob="Microsoft.NET.Workload.Mono.ToolChain*/*8.0.*" />
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/*8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/*8.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.Platforms/*8.0.*" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2490108f0..4eea30afe 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -20,7 +20,7 @@
     <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>bc9dad2351827fdbbde7b10ff97f253a065d49e5</Sha>
-      <SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
+      <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/runtime</Uri>