Merge pull request #13491 from MichaelSimons/remove-clicommandlineparser

Remove CliCommandLineParser from source-build

eng/Version.Details.xml

@@ -175,11 +175,6 @@
       <Sha>90bdf447e1b97605f109b34243ab8c9f215308e9</Sha>
       <SourceBuild RepoName="source-build" 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>
-      <SourceBuildTarball RepoName="clicommandlineparser" ManagedOnly="true" />
-    </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.247101">
       <Uri>https://github.com/dotnet/deployment-tools</Uri>
       <Sha>7431bf2f3c204cbbc326c8d55ce4ac5cad7661d6</Sha>

src/SourceBuild/tarball/content/repos/clicommandlineparser.proj

@@ -1,26 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup>
-    <LogVerbosityOptOut>true</LogVerbosityOptOut>
-    <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildCommandArgs>
-    <!-- Repo has netcoreapp2.1 projects: https://github.com/dotnet/CliCommandLineParser/issues/189 -->
-    <BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs>
-    <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
-
-    <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
-    <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
-    <OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <RepositoryReference Include="arcade" />
-  </ItemGroup>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>

src/SourceBuild/tarball/content/repos/installer.proj

@@ -55,7 +55,6 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="aspnetcore" />
-    <RepositoryReference Include="clicommandlineparser" />
     <RepositoryReference Include="fsharp" />
     <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="source-build" />

src/SourceBuild/tarball/content/repos/known-good.proj

@@ -31,7 +31,6 @@
         <RepositoryReference Include="arcade" />
 
         <!-- Tier 1 -->
-        <RepositoryReference Include="clicommandlineparser" />
         <RepositoryReference Include="command-line-api" />
         <RepositoryReference Include="diagnostics" />
         <RepositoryReference Include="roslyn" />

src/SourceBuild/tarball/content/repos/templating.proj

@@ -14,7 +14,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="clicommandlineparser" />
     <RepositoryReference Include="nuget-client" />
     <RepositoryReference Include="source-build" />
   </ItemGroup>

src/SourceBuild/tarball/patches/clicommandlineparser/0001-Remove-installation-of-runtime-2.1.0-from-build.sh.patch

@@ -1,44 +0,0 @@
-From 3110caf93828aad2ecfe9929e03dc4dd6dd85c5d Mon Sep 17 00:00:00 2001
-From: dseefeld <dseefeld@microsoft.com>
-Date: Wed, 28 Jul 2021 15:56:35 +0000
-Subject: [PATCH] Remove installation of runtime 2.1.0 from build.sh
-
-Installation of another runtime in build.sh doesn't work for source-build
-when building offline.  
----
- build.sh    | 3 ---
- global.json | 7 ++++++-
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/build.sh b/build.sh
-index d511e95..acc0e31 100755
---- a/build.sh
-+++ b/build.sh
-@@ -8,7 +8,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
- done
- ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
- 
--# install the 2.1.0 runtime for running tests
--"$ScriptRoot/eng/common/dotnet-install.sh"  -runtime dotnet -version 2.1.0
--
- . "$ScriptRoot/eng/common/build.sh" --build --restore $@
-diff --git a/global.json b/global.json
-index e276e30..347e455 100644
---- a/global.json
-+++ b/global.json
-@@ -1,6 +1,11 @@
- {
-   "tools": {
--    "dotnet": "5.0.201"
-+    "dotnet": "5.0.201",
-+    "runtimes": {
-+      "dotnet": [
-+        "2.1.0"
-+      ]
-+    }
-   },
-   "msbuild-sdks": {
-     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21256.3"
--- 
-2.31.1
-