Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
291 changes: 0 additions & 291 deletions src/coreclr/tools/Common/CommandLineHelpers.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/ILCompiler.Compiler.Tests/DependencyGraphTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UsageBasedMetadataManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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);
}

Expand Down
21 changes: 19 additions & 2 deletions src/coreclr/tools/aot/ILCompiler/ILCompiler.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading