From 28f9b0b962a5ba2dba7d6fec63c0fe4c0ded133b Mon Sep 17 00:00:00 2001
From: "Oleksandr.Didyk" <odidyk@microsoft.com>
Date: Wed, 4 Jan 2023 12:53:13 +0100
Subject: [PATCH 1/2] add souce-build pre-built detection

---
 eng/SourceBuildPrebuiltBaseline.xml |  2 +-
 eng/Version.Details.xml             | 20 +++++++++++++++-----
 eng/Versions.props                  |  3 +++
 eng/build.sh                        |  4 ++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index c1b6dfbf05..941c37c4be 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -1,5 +1,5 @@
 <UsageData>
   <IgnorePatterns>
-    <UsagePattern IdentityGlob="*/*" />
+    <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />
   </IgnorePatterns>
 </UsageData>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7e3f26d8d5..66f2c21b99 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -12,11 +12,6 @@
       <Uri>https://github.com/microsoft/clrmd</Uri>
       <Sha>846c1610f2320380941d64bdfdf1dca942a77a78</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23053.1">
-      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>9e4ae1f23e429bd64744dc71b202a5f1f4d822ce</Sha>
-      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
-    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22630.1">
@@ -48,5 +43,20 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23053.1">
+      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
+      <Sha>31f422237eabbd5c89ecbd0f4a6f53e2c495422f</Sha>
+      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
+    </Dependency>
+    <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22518-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+      <Uri>https://github.com/dotnet/sourcelink</Uri>
+      <Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
+      <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22631.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
+      <Sha>ca611a68bb48cedf72a782d41622453cb2dab100</Sha>
+      <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 0f06e1b50d..71e414b5a2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -65,5 +65,8 @@
     <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
     <cdbsosversion>10.0.18362</cdbsosversion>
     <NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
+    <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>8.0.0-alpha.1.23053.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
+    <MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22518-02</MicrosoftSourceLinkGitHubVersion>
+    <MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22631.1</MicrosoftDotNetXliffTasksVersion>
   </PropertyGroup>
 </Project>
diff --git a/eng/build.sh b/eng/build.sh
index c8c8805dab..2b15f23fb9 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -48,7 +48,7 @@ handle_arguments() {
             __ShiftArgs=1
             ;;
 
-        -binarylog|-bl|-clean|-integrationtest|-pack|-performancetest|-pipelineslog|-pl|-preparemachine|-publish|-r|-rebuild|-restore|-sign)
+        -binarylog|-bl|-clean|-integrationtest|-pack|-performancetest|-pipelineslog|-pl|-preparemachine|-publish|-r|-rebuild|-restore|-sign|-sb)
             __ManagedBuildArgs="$__ManagedBuildArgs $1"
             ;;
 
@@ -63,7 +63,7 @@ handle_arguments() {
             __ShiftArgs=1
             ;;
 
-        -clean|-binarylog|-bl|-pipelineslog|-pl|-restore|-r|-rebuild|-pack|-integrationtest|-performancetest|-sign|-publish|-preparemachine)
+        -clean|-binarylog|-bl|-pipelineslog|-pl|-restore|-r|-rebuild|-pack|-integrationtest|-performancetest|-sign|-publish|-preparemachine|-sb)
             __ManagedBuildArgs="$__ManagedBuildArgs $1"
             ;;
 

From 9d4701e59bd461654e73cf41d5357cbaa32c47ed Mon Sep 17 00:00:00 2001
From: "Oleksandr.Didyk" <odidyk@microsoft.com>
Date: Thu, 5 Jan 2023 15:05:07 +0100
Subject: [PATCH 2/2] remove xliff dependency

---
 eng/Version.Details.xml | 5 -----
 eng/Versions.props      | 1 -
 2 files changed, 6 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 66f2c21b99..d21b33e69e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -53,10 +53,5 @@
       <Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
       <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22631.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
-      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>ca611a68bb48cedf72a782d41622453cb2dab100</Sha>
-      <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
-    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 71e414b5a2..b5e360c617 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -67,6 +67,5 @@
     <NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
     <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>8.0.0-alpha.1.23053.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
     <MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22518-02</MicrosoftSourceLinkGitHubVersion>
-    <MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22631.1</MicrosoftDotNetXliffTasksVersion>
   </PropertyGroup>
 </Project>