From d5be62eb80513cfa10aa362655867ce28508fd82 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Fri, 22 Apr 2022 15:31:54 +0200
Subject: [PATCH] Fix #2675

---
 .../ICSharpCode.ILSpyCmd.csproj               |  7 ++++-
 ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs       | 14 +++++++++
 ICSharpCode.ILSpyCmd/README.md                | 30 ++++++++++++++-----
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj b/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj
index 3348cf770..23c06798e 100644
--- a/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj
+++ b/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj
@@ -8,7 +8,7 @@
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
     <InvariantGlobalization>true</InvariantGlobalization>
-    
+
     <NeutralLanguage>en-US</NeutralLanguage>
     <GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>False</GenerateAssemblyFileVersionAttribute>
@@ -16,6 +16,7 @@
     <AssemblyName>ilspycmd</AssemblyName>
     <ToolCommandName>ilspycmd</ToolCommandName>
     <Description>Command-line decompiler using the ILSpy decompilation engine</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageVersion>8.0.0.0-noversion</PackageVersion>
     <Copyright>Copyright 2011-$([System.DateTime]::Now.Year) AlphaSierraPapa</Copyright>
     <PackageProjectUrl>https://github.com/icsharpcode/ILSpy/</PackageProjectUrl>
@@ -27,6 +28,10 @@
     <Authors>ILSpy Team</Authors>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <WarningsAsErrors>NU1605</WarningsAsErrors>
diff --git a/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs b/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs
index 8debddd13..ff971a6f3 100644
--- a/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs
+++ b/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs
@@ -27,6 +27,20 @@ namespace ICSharpCode.ILSpyCmd
 		ExtendedHelpText = @"
 Remarks:
   -o is valid with every option and required when using -p.
+
+Examples:
+    Decompile assembly to console out.
+        ilspycmd sample.dll
+
+    Decompile assembly to destination directory (single C# file).
+        ilspycmd -o c:\decompiled sample.dll
+
+    Decompile assembly to destination directory, create a project file, one source file per type.
+        ilspycmd -p -o c:\decompiled sample.dll
+
+    Decompile assembly to destination directory, create a project file, one source file per type, 
+    into nicely nested directories.
+        ilspycmd --nested-directories -p -o c:\decompiled sample.dll
 ")]
 	[HelpOption("-h|--help")]
 	[ProjectOptionRequiresOutputDirectoryValidation]
diff --git a/ICSharpCode.ILSpyCmd/README.md b/ICSharpCode.ILSpyCmd/README.md
index bda653536..5d9671b8f 100644
--- a/ICSharpCode.ILSpyCmd/README.md
+++ b/ICSharpCode.ILSpyCmd/README.md
@@ -1,22 +1,23 @@
-# ilspycmd
+# ilspycmd .NET 6.0 Tool 
+
+To install:
 
 ```
 dotnet tool install ilspycmd -g
 ```
 
-.NET Core 3.1 and .NET 6.0 Tool 
+Help output (`ilspycmd ---help`):
 
 ```
-ilspycmd -h
-ilspycmd: 7.2.0.0
-ICSharpCode.Decompiler: 7.2.0.6768
+ilspycmd: 8.0.0.7007
+ICSharpCode.Decompiler: 8.0.0.7007
 
 dotnet tool for decompiling .NET assemblies and generating portable PDBs
 
-Usage: ilspycmd [options] <Assembly file name>
+Usage: ilspycmd [options] <Assembly file name(s)>
 
 Arguments:
-  Assembly file name               The assembly that is being decompiled. This argument is mandatory.
+  Assembly file name(s)            The list of assemblies that is being decompiled. This argument is mandatory.
 
 Options:
   -v|--version                     Show version information.
@@ -36,7 +37,22 @@ Options:
   --no-dead-code                   Remove dead code.
   --no-dead-stores                 Remove dead stores.
   -d|--dump-package                Dump package assembiles into a folder. This requires the output directory option.
+  --nested-directories             Use nested directories for namespaces.
 
 Remarks:
   -o is valid with every option and required when using -p.
+
+Examples:
+    Decompile assembly to console out.
+        ilspycmd sample.dll
+
+    Decompile assembly to destination directory (single C# file).
+        ilspycmd -o c:\decompiled sample.dll
+
+    Decompile assembly to destination directory, create a project file, one source file per type.
+        ilspycmd -p -o c:\decompiled sample.dll
+
+    Decompile assembly to destination directory, create a project file, one source file per type,
+    into nicely nested directories.
+        ilspycmd --nested-directories -p -o c:\decompiled sample.dll
 ```