From afff9c325d9ff7daf603b474df3e1c3e752704e4 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Thu, 7 Apr 2022 15:49:47 +0200 Subject: [PATCH] Rename ics.d.Console to ics.ILSpyCmd --- .github/workflows/build-frontends.yml | 2 +- .github/workflows/build-ilspy.yml | 2 +- .../ICSharpCode.ILSpyCmd.csproj | 0 .../ILSpyCmdNuGetPackageIcon.png | Bin .../IlspyCmdProgram.cs | 3 ++- .../ProgramExitCodes.cs | 2 +- .../Properties/AssemblyInfo.cs | 0 .../README.md | 0 .../TypesParser.cs | 2 +- .../ValidationAttributes.cs | 2 +- ILSpy.XPlat.slnf | 2 +- ILSpy.sln | 2 +- README.md | 2 +- doc/third-party-notices.txt | 2 +- 14 files changed, 11 insertions(+), 10 deletions(-) rename ICSharpCode.Decompiler.Console/ICSharpCode.Decompiler.Console.csproj => ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj (100%) rename {ICSharpCode.Decompiler.Console => ICSharpCode.ILSpyCmd}/ILSpyCmdNuGetPackageIcon.png (100%) rename {ICSharpCode.Decompiler.Console => ICSharpCode.ILSpyCmd}/IlspyCmdProgram.cs (99%) rename {ICSharpCode.Decompiler.Console => ICSharpCode.ILSpyCmd}/ProgramExitCodes.cs (87%) rename {ICSharpCode.Decompiler.Console => ICSharpCode.ILSpyCmd}/Properties/AssemblyInfo.cs (100%) rename {ICSharpCode.Decompiler.Console => ICSharpCode.ILSpyCmd}/README.md (100%) rename {ICSharpCode.Decompiler.Console => ICSharpCode.ILSpyCmd}/TypesParser.cs (97%) rename {ICSharpCode.Decompiler.Console => ICSharpCode.ILSpyCmd}/ValidationAttributes.cs (96%) diff --git a/.github/workflows/build-frontends.yml b/.github/workflows/build-frontends.yml index 5ae72b3ccb..b9b92fefdc 100644 --- a/.github/workflows/build-frontends.yml +++ b/.github/workflows/build-frontends.yml @@ -40,7 +40,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: ilspycmd NuGet Package - path: ICSharpCode.Decompiler.Console/bin/Release/ilspycmd*.nupkg + path: ICSharpCode.ILSpyCmd/bin/Release/ilspycmd*.nupkg if-no-files-found: error - name: Upload binlog diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml index f294dad8b8..ede4eb7d0a 100644 --- a/.github/workflows/build-ilspy.yml +++ b/.github/workflows/build-ilspy.yml @@ -143,5 +143,5 @@ jobs: uses: actions/upload-artifact@v2 with: name: ilspycmd dotnet tool (${{ matrix.configuration }}) - path: ICSharpCode.Decompiler.Console\bin\Release\ilspycmd*.nupkg + path: ICSharpCode.ILSpyCmd\bin\Release\ilspycmd*.nupkg if-no-files-found: error diff --git a/ICSharpCode.Decompiler.Console/ICSharpCode.Decompiler.Console.csproj b/ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj similarity index 100% rename from ICSharpCode.Decompiler.Console/ICSharpCode.Decompiler.Console.csproj rename to ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj diff --git a/ICSharpCode.Decompiler.Console/ILSpyCmdNuGetPackageIcon.png b/ICSharpCode.ILSpyCmd/ILSpyCmdNuGetPackageIcon.png similarity index 100% rename from ICSharpCode.Decompiler.Console/ILSpyCmdNuGetPackageIcon.png rename to ICSharpCode.ILSpyCmd/ILSpyCmdNuGetPackageIcon.png diff --git a/ICSharpCode.Decompiler.Console/IlspyCmdProgram.cs b/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs similarity index 99% rename from ICSharpCode.Decompiler.Console/IlspyCmdProgram.cs rename to ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs index bae080420d..db24859add 100644 --- a/ICSharpCode.Decompiler.Console/IlspyCmdProgram.cs +++ b/ICSharpCode.ILSpyCmd/IlspyCmdProgram.cs @@ -9,6 +9,7 @@ using System.Reflection.PortableExecutable; using System.Threading; +using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.CSharp; using ICSharpCode.Decompiler.CSharp.ProjectDecompiler; using ICSharpCode.Decompiler.DebugInfo; @@ -20,7 +21,7 @@ using McMaster.Extensions.CommandLineUtils; // ReSharper disable All -namespace ICSharpCode.Decompiler.Console +namespace ICSharpCode.ILSpyCmd { [Command(Name = "ilspycmd", Description = "dotnet tool for decompiling .NET assemblies and generating portable PDBs", ExtendedHelpText = @" diff --git a/ICSharpCode.Decompiler.Console/ProgramExitCodes.cs b/ICSharpCode.ILSpyCmd/ProgramExitCodes.cs similarity index 87% rename from ICSharpCode.Decompiler.Console/ProgramExitCodes.cs rename to ICSharpCode.ILSpyCmd/ProgramExitCodes.cs index 5997c93ddc..e5f78631df 100644 --- a/ICSharpCode.Decompiler.Console/ProgramExitCodes.cs +++ b/ICSharpCode.ILSpyCmd/ProgramExitCodes.cs @@ -1,6 +1,6 @@ // ReSharper disable InconsistentNaming -namespace ICSharpCode.Decompiler.Console +namespace ICSharpCode.ILSpyCmd { public class ProgramExitCodes { diff --git a/ICSharpCode.Decompiler.Console/Properties/AssemblyInfo.cs b/ICSharpCode.ILSpyCmd/Properties/AssemblyInfo.cs similarity index 100% rename from ICSharpCode.Decompiler.Console/Properties/AssemblyInfo.cs rename to ICSharpCode.ILSpyCmd/Properties/AssemblyInfo.cs diff --git a/ICSharpCode.Decompiler.Console/README.md b/ICSharpCode.ILSpyCmd/README.md similarity index 100% rename from ICSharpCode.Decompiler.Console/README.md rename to ICSharpCode.ILSpyCmd/README.md diff --git a/ICSharpCode.Decompiler.Console/TypesParser.cs b/ICSharpCode.ILSpyCmd/TypesParser.cs similarity index 97% rename from ICSharpCode.Decompiler.Console/TypesParser.cs rename to ICSharpCode.ILSpyCmd/TypesParser.cs index 844585bb62..c251960599 100644 --- a/ICSharpCode.Decompiler.Console/TypesParser.cs +++ b/ICSharpCode.ILSpyCmd/TypesParser.cs @@ -4,7 +4,7 @@ using ICSharpCode.Decompiler.TypeSystem; -namespace ICSharpCode.Decompiler.Console +namespace ICSharpCode.ILSpyCmd { public static class TypesParser { diff --git a/ICSharpCode.Decompiler.Console/ValidationAttributes.cs b/ICSharpCode.ILSpyCmd/ValidationAttributes.cs similarity index 96% rename from ICSharpCode.Decompiler.Console/ValidationAttributes.cs rename to ICSharpCode.ILSpyCmd/ValidationAttributes.cs index d231f883e7..dd758563be 100644 --- a/ICSharpCode.Decompiler.Console/ValidationAttributes.cs +++ b/ICSharpCode.ILSpyCmd/ValidationAttributes.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.IO; -namespace ICSharpCode.Decompiler.Console +namespace ICSharpCode.ILSpyCmd { [AttributeUsage(AttributeTargets.Class)] public sealed class ProjectOptionRequiresOutputDirectoryValidationAttribute : ValidationAttribute diff --git a/ILSpy.XPlat.slnf b/ILSpy.XPlat.slnf index 5515a99371..a1d4f823f8 100644 --- a/ILSpy.XPlat.slnf +++ b/ILSpy.XPlat.slnf @@ -2,7 +2,7 @@ "solution": { "path": "ILSpy.sln", "projects": [ - "ICSharpCode.Decompiler.Console\\ICSharpCode.Decompiler.Console.csproj", + "ICSharpCode.ILSpyCmd\\ICSharpCode.ILSpyCmd.csproj", "ICSharpCode.Decompiler.PowerShell\\ICSharpCode.Decompiler.PowerShell.csproj", "ICSharpCode.Decompiler.TestRunner\\ICSharpCode.Decompiler.TestRunner.csproj", "ICSharpCode.Decompiler.Tests\\ICSharpCode.Decompiler.Tests.csproj", diff --git a/ILSpy.sln b/ILSpy.sln index 44f9af8c66..898ff66018 100644 --- a/ILSpy.sln +++ b/ILSpy.sln @@ -30,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy.Tests", "ILSpy.Tests\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy.ReadyToRun", "ILSpy.ReadyToRun\ILSpy.ReadyToRun.csproj", "{0313F581-C63B-43BB-AA9B-07615DABD8A3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Console", "ICSharpCode.Decompiler.Console\ICSharpCode.Decompiler.Console.csproj", "{743B439A-E7AD-4A0A-BAB6-222E1EA83C6D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.ILSpyCmd", "ICSharpCode.ILSpyCmd\ICSharpCode.ILSpyCmd.csproj", "{743B439A-E7AD-4A0A-BAB6-222E1EA83C6D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.PowerShell", "ICSharpCode.Decompiler.PowerShell\ICSharpCode.Decompiler.PowerShell.csproj", "{50060E0C-FA25-41F4-B72F-8490324EC9F0}" EndProject diff --git a/README.md b/README.md index 549d4ddc1d..740589e846 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Aside from the WPF UI ILSpy (downloadable via Releases, see also [plugins](https * Our Visual Studio Code Extension [repository](https://github.com/icsharpcode/ilspy-vscode) | [marketplace](https://marketplace.visualstudio.com/items?itemName=icsharpcode.ilspy-vscode) * Our Linux/Mac/Windows ILSpy UI based on [Avalonia](http://www.avaloniaui.net/) - check out https://github.com/icsharpcode/AvaloniaILSpy * Our [ICSharpCode.Decompiler](https://www.nuget.org/packages/ICSharpCode.Decompiler/) NuGet for your own projects -* Our dotnet tool for Linux/Mac/Windows - check out [ICSharpCode.Decompiler.Console](ICSharpCode.Decompiler.Console) in this repository +* Our dotnet tool for Linux/Mac/Windows - check out [ILSpyCmd](ICSharpCode.ILSpyCmd) in this repository * Our Linux/Mac/Windows [PowerShell cmdlets](ICSharpCode.Decompiler.PowerShell) in this repository Features diff --git a/doc/third-party-notices.txt b/doc/third-party-notices.txt index 3f54b3b86a..84d8a2107e 100644 --- a/doc/third-party-notices.txt +++ b/doc/third-party-notices.txt @@ -105,7 +105,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -License Notice for CommandLineUtils (part of ICSharpCode.Decompiler.Console) +License Notice for CommandLineUtils (part of ICSharpCode.ILSpyCmd) --------------------------- https://github.com/natemcmaster/CommandLineUtils/blob/master/LICENSE.txt