DYN-5944 Removed NDesk.Options Library #14106
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,65 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <ImportGroup Label="PropertySheets"> | ||
| <Import Project="$(SolutionDir)Config\CS_SDK.props" /> | ||
| </ImportGroup> | ||
| <PropertyGroup> | ||
| <ProjectGuid>{0893F745-CB1A-427A-8E87-CA927273039A}</ProjectGuid> | ||
| <OutputType>Exe</OutputType> | ||
| <RootNamespace>Md2Html</RootNamespace> | ||
| <AssemblyName>Md2Html</AssemblyName> | ||
| <SharedOutputPath>$(OutputPath)\Md2Html\</SharedOutputPath> | ||
| <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' "> | ||
| <PublishSingleFile>true</PublishSingleFile> | ||
| <SelfContained>false</SelfContained> | ||
| </PropertyGroup> | ||
| <ItemGroup Condition=" '$(TargetFramework)' == 'net48' "> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Data.DataSetExtensions" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Net.Http" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
JimmySanchezGlobant marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <ItemGroup> | ||
| <PackageReference Include="CommandLineParser"> | ||
| <Version>2.8.0</Version> | ||
| </PackageReference> | ||
| <PackageReference Include="HtmlSanitizer"> | ||
| <Version>5.0.372</Version> | ||
| </PackageReference> | ||
| <PackageReference Include="ILMerge" Condition=" '$(TargetFramework)' == 'net48'"> | ||
| <Version>3.0.41</Version> | ||
| </PackageReference> | ||
| <PackageReference Include="Markdig"> | ||
| <Version>0.22.0</Version> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
| <Target Name="Publish net6" Condition=" '$(TargetFramework)' == 'net6.0' And '$([MSBuild]::IsOSPlatform(`Windows`))' == 'True' " AfterTargets="Build"> | ||
| <CallTarget Targets="Publish" /> | ||
| <Exec Command="if not exist $(SharedOutputPath) mkdir $(SharedOutputPath)"/> | ||
| <Copy SourceFiles="$(OutputPath)win10-x64\publish\Md2Html.exe" DestinationFolder="$(SharedOutputPath)" /> | ||
| </Target> | ||
| <Target Name="AfterBuildOps" AfterTargets="Build" Condition=" '$(TargetFramework)' == 'net48' And '$([MSBuild]::IsOSPlatform(`Windows`))' == 'True'"> | ||
| <Exec Command="if not exist $(SharedOutputPath) mkdir $(SharedOutputPath)"/> | ||
| <!-- the ILMergePath property points to the location of ILMerge.exe console application --> | ||
| <Exec Command="$(ILMergeConsolePath) $(OutputPath)Md2Html.exe ^ | ||
| /allowDup ^ | ||
| /lib:$(OutputPath) ^ | ||
| /out:$(SharedOutputPath)Md2Html.exe ^ | ||
| AngleSharp.Css.dll ^ | ||
| AngleSharp.dll ^ | ||
| HtmlSanitizer.dll ^ | ||
| Markdig.dll ^ | ||
| CommandLine.dll ^ | ||
| System.Buffers.dll ^ | ||
| System.Memory.dll ^ | ||
| System.Numerics.Vectors.dll ^ | ||
| System.Runtime.CompilerServices.Unsafe.dll ^ | ||
| System.Text.Encoding.CodePages.dll " /> | ||
| <Copy SourceFiles="$(OutputPath)Md2Html.exe" DestinationFolder="$(SharedOutputPath)" /> | ||
| </Target> | ||
| </Project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,16 @@ | ||
| using System; | ||
| using System.IO; | ||
| using CommandLine; | ||
| using CommandLine.Text; | ||
|
|
||
| namespace Md2Html | ||
| { | ||
| internal class CMDLineOptions | ||
| { | ||
| [Option('h', "help", Required = false, HelpText = "Show help and exit")] | ||
| public bool ShowHelp { get; set; } | ||
|
There was a problem hiding this comment. @pinzart90 ... two thoughts - I don't see that this PR updates any of the tests. I think that ndesk options and command line parser require setting flags differently... ie Have you tried running the docs browser tests locally? Perhaps the markdown converter tool is never shutting down causing some kind of deadlock in the test runner etc. There was a problem hiding this comment. @mjkkirschner good catch, the md2html tests do seem to hang locally. Hopefully it is the same cause on the build machine |
||
| } | ||
|
|
||
| static class Program | ||
| { | ||
| static void Main(string[] args) | ||
|
|
@@ -82,15 +89,19 @@ static string GetData() | |
| static bool CheckForHelp(string[] args) | ||
| { | ||
| bool help = false; | ||
| var parser = new Parser(options => { | ||
| options.IgnoreUnknownArguments = true; options.HelpWriter = Console.Out; | ||
| options.CaseSensitive = false; | ||
| }); | ||
| var results = parser.ParseArguments<CMDLineOptions>(args); | ||
|
|
||
|
There was a problem hiding this comment. guess it's also possible that this is somehow messing with Console.Out or modifying the input argument list so it never makes its way to the rest of the Main function? |
||
| help = results.MapResult((cmdArgs) => { | ||
| return cmdArgs.ShowHelp; | ||
| }, errs => false); | ||
|
|
||
| if (help) | ||
| { | ||
| Console.WriteLine(HelpText.AutoBuild(results, null, null).ToString()); | ||
| DisplayHelp(); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pinzart90 looks like a missing
EndProjecttag maybe messing up the build somehow?