diff --git a/eng/SourceBuild.Version.Details.xml b/eng/SourceBuild.Version.Details.xml
index c2a377b07..641734b15 100644
--- a/eng/SourceBuild.Version.Details.xml
+++ b/eng/SourceBuild.Version.Details.xml
@@ -17,6 +17,11 @@
       <Sha>6a46e7c886cdf499ba3433f665ab417be814135e</Sha>
       <SourceBuild RepoName="xdt" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.21310.2">
+      <Uri>https://github.com/dotnet/clicommandlineparser</Uri>
+      <Sha>3198bf5660cad3dab85f5475bf1fda9688146e3f</Sha>
+      <SourceBuild RepoName="clicommandlineparser" ManagedOnly="true" />
+    </Dependency>
     <Dependency Name="System.CommandLine" Version="0.1.230801">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>5e855e911de7c56fe28400c4500e888fe2a3da8e</Sha>
diff --git a/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj b/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj
index abd476804..e31100ea8 100644
--- a/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj
+++ b/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj
@@ -1,31 +1,14 @@
 <Project>
-
-  <PropertyGroup>
-    <SourceDirectory>CliCommandLineParser</SourceDirectory>
-  </PropertyGroup>
-
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <!-- In Windows -restore is already passed by default by build.cmd to build.ps1 -->
-    <BuildCommandArgs>$(FlagParameterPrefix)pack $(FlagParameterPrefix)configuration $(Configuration)</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) --projects $(ProjectDirectory)CommandLine.sln</BuildCommandArgs>
-    <BuildCommandArgs Condition="'$(OS)' != 'Windows_NT'">$(BuildCommandArgs) $(FlagParameterPrefix)restore</BuildCommandArgs>
-
-    <!-- CliCommandLineParser takes -v instead of /v -->
     <LogVerbosityOptOut>true</LogVerbosityOptOut>
-    <BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) -bl</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) -ci</BuildCommandArgs>
+    <BuildCommandArgs>$(StandardSourceBuildArgs) -v $(LogVerbosity)</BuildCommandArgs>
+    <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
 
-    <BuildCommandArgs>$(BuildCommandArgs) /p:DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)</BuildCommandArgs>
-
-    <BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
-    <DependencyVersionInputRepoApiImplemented>false</DependencyVersionInputRepoApiImplemented>
     <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
-
-    <OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
     <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
+    <OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj
index f81f8d67c..3d236f902 100644
--- a/src/SourceBuild/tarball/content/repos/known-good.proj
+++ b/src/SourceBuild/tarball/content/repos/known-good.proj
@@ -31,6 +31,7 @@
         <RepositoryReference Include="arcade" />
 
         <!-- Tier 1 -->
+        <RepositoryReference Include="clicommandlineparser" />
         <RepositoryReference Include="command-line-api" />
         <RepositoryReference Include="source-build" />
         <RepositoryReference Include="symreader" />