Revert "Adapt System.CommandLine (v2) in more places (#72082)"

This reverts commit d0559e6.

Author: jkotas

src/coreclr/tools/Common/CommandLineHelpers.cs

@@ -73,7 +73,7 @@ public void TestDependencyGraphInvariants(EcmaMethod method)
                 new FullyBlockedMetadataBlockingPolicy(), new FullyBlockedManifestResourceBlockingPolicy(),
                 null, new NoStackTraceEmissionPolicy(), new NoDynamicInvokeThunkGenerationPolicy(),
                 new ILLink.Shared.TrimAnalysis.FlowAnnotations(Logger.Null, ilProvider, compilerGeneratedState), UsageBasedMetadataGenerationOptions.None,
-                Logger.Null, Array.Empty<KeyValuePair<string, bool>>(), Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>());
+                Logger.Null, Array.Empty<KeyValuePair<string, bool>>(), Array.Empty<string>(), Array.Empty<string>());
 
             CompilationBuilder builder = new RyuJitCompilationBuilder(context, compilationGroup)
                 .UseILProvider(ilProvider);

src/coreclr/tools/aot/ILCompiler.Compiler.Tests/DependencyGraphTests.cs

@@ -79,7 +79,6 @@ public UsageBasedMetadataManager(
             Logger logger,
             IEnumerable<KeyValuePair<string, bool>> featureSwitchValues,
             IEnumerable<string> rootEntireAssembliesModules,
-            IEnumerable<string> additionalRootedAssemblies,
             IEnumerable<string> trimmedAssemblies)
             : base(typeSystemContext, blockingPolicy, resourceBlockingPolicy, logFile, stackTracePolicy, invokeThunkGenerationPolicy)
         {
@@ -93,7 +92,6 @@ public UsageBasedMetadataManager(
             FeatureSwitches = new Dictionary<string, bool>(featureSwitchValues);
 
             _rootEntireAssembliesModules = new HashSet<string>(rootEntireAssembliesModules);
-            _rootEntireAssembliesModules.UnionWith(additionalRootedAssemblies);
             _trimmedAssemblies = new HashSet<string>(trimmedAssemblies);
         }
 

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedMetadataManager.cs

@@ -82,11 +82,28 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Common\CommandLineHelpers.cs" />
+    <Compile Include="..\..\Common\CommandLine\Argument.cs" />
+    <Compile Include="..\..\Common\CommandLine\Argument_1.cs" />
+    <Compile Include="..\..\Common\CommandLine\ArgumentCommand.cs" />
+    <Compile Include="..\..\Common\CommandLine\ArgumentCommand_1.cs" />
+    <Compile Include="..\..\Common\CommandLine\ArgumentLexer.cs" />
+    <Compile Include="..\..\Common\CommandLine\ArgumentList_1.cs" />
+    <Compile Include="..\..\Common\CommandLine\ArgumentParser.cs" />
+    <Compile Include="..\..\Common\CommandLine\ArgumentSyntax.cs" />
+    <Compile Include="..\..\Common\CommandLine\ArgumentSyntax_Definers.cs" />
+    <Compile Include="..\..\Common\CommandLine\ArgumentSyntaxException.cs" />
+    <Compile Include="..\..\Common\CommandLine\ArgumentToken.cs" />
+    <Compile Include="..\..\Common\CommandLine\CommandLineException.cs" />
+    <Compile Include="..\..\Common\CommandLine\CommandLineHelpers.cs" />
+    <Compile Include="..\..\Common\CommandLine\Enumerable.cs" />
+    <Compile Include="..\..\Common\CommandLine\HelpTextGenerator.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
+    <EmbeddedResource Include="..\..\Common\CommandLine\Resources\Strings.resx">
+      <GenerateSource>true</GenerateSource>
+      <ClassName>Internal.CommandLine.Strings</ClassName>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>