Upgrade to .NET 6.0

.gitignore

@@ -1,15 +1,22 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
+*.swp
+*.*~
+project.lock.json
+.DS_Store
+*.pyc
+nupkg/
+
+# Visual Studio Code
+.vscode
+
+# Rider
+.idea
 
 # User-specific files
 *.suo
 *.user
 *.userosscache
 *.sln.docstates
 
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -21,192 +28,13 @@ build/
 bld/
 [Bb]in/
 [Oo]bj/
+[Oo]ut/
+msbuild.log
+msbuild.err
+msbuild.wrn
 
-# Visual Studio 2015 cache/options directory
+# Visual Studio 2015
 .vs/
 
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
-#*.pubxml
-
-*.publishproj
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-
-# Windows Azure Build Output
-csx/
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# LightSwitch generated files
-GeneratedArtifacts/
-_Pvt_Extensions/
-ModelManifest.xml
+packages/
+launchSettings.json

README.MD

@@ -5,8 +5,7 @@ Software can also generate correct type project file for decrypted data.
 
 ## Usage
 
-RPG Maker Decrypter has Windows application and cli application which both provide same functionality
-but with different interface.
+RPG Maker Decrypter has a Windows application and a cli application which both provide the same functionality but with different interface.
 
 ### RPG Maker Decrypter CLI
 
@@ -32,15 +31,17 @@ Using Windows application is more straightforward. Open RGASSAD file by using Fi
 
 If you want to extract single files, select file from list and press extract under file name and size.
 
+![Screenshots of the GUI application](/screenshots/gui1.png)
+
 ## Requirements
 
-* .NET Framework 4.5.2
+* GUI version works only on Windows, CLI version works with any platform .NET 6.0 targets.
+* .NET Runtime is not required for prebuilt binaries on selected platforms as it is packaged in the executable.
 
 ## Binaries
 
-Latest builds can be found from [here](http://uuksu.fi/other/RPGMakerDecrypter).
+Prebuilt binaries are available for selected platforms. See [Releases](https://github.com/uuksu/RPGMakerDecrypter/releases).
 
 ## Building
 
-RPGMakerDecrypter will compile with Visual Studio 2015. Output deployment package can be created by running deploy.bat script
-from Deploy folder.
+RPGMakerDecrypter will compile with .NET 6.0 SDK.

RPGMakerDecrypter.Cli/CommandLineOptions.cs

@@ -12,34 +12,13 @@ namespace RPGMakerDecrypter.Cli
 {
     class CommandLineOptions
     {
-        [ValueList(typeof(List<string>), MaximumElements = 1)]
-        public IList<string> InputPaths { get; set; }
+        [Value(0, Required = true, HelpText = "Path to the RGSSAD file.")]
+        public string InputPath { get; set; }
 
         [Option('o', "output", Required = false, HelpText = "Optional output directory path.")]
         public string OutputDirectoryPath { get; set; }
 
         [Option('p', "project-file", Required = false, HelpText = "If set to true then generates project file.")]
         public bool GenerateProjectFile { get; set; }
-
-        [HelpOption]
-        public string GetUsage()
-        {
-            Assembly entryAssembly = Assembly.GetEntryAssembly();
-            FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(entryAssembly.Location);
-
-            HelpText help = new HelpText
-            {
-                Heading = new HeadingInfo("RPG Maker Decrypter", fvi.FileVersion),
-                Copyright = new CopyrightInfo("Mikko Uuksulainen", 2015),
-                AdditionalNewLineAfterOption = true,
-                AddDashesToOption = true
-            };
-
-            help.AddPreOptionsLine(Environment.NewLine);
-            help.AddPreOptionsLine("Usage: RPGMakerDecrypter-cli <inputPath> [options]");
-            help.AddOptions(this);
-
-            return help;
-        }
     }
 }

RPGMakerDecrypter.Cli/Program.cs

@@ -10,26 +10,21 @@
 
 namespace RPGMakerDecrypter.Cli
 {
-    class Program
+    static class Program
     {
         private static CommandLineOptions _commandLineOptions;
 
         static void Main(string[] args)
         {
-            _commandLineOptions = new CommandLineOptions();
+            var parsedResult = Parser.Default.ParseArguments<CommandLineOptions>(args);
+            _commandLineOptions = parsedResult.Value;
 
-            if (Parser.Default.ParseArguments(args, _commandLineOptions) == false)
+            if (parsedResult.Errors.Any())
             {
                 Environment.Exit(1);
             }
 
-            if (_commandLineOptions.InputPaths.Count == 0)
-            {
-                Console.WriteLine(_commandLineOptions.GetUsage());
-                Environment.Exit(1);
-            }
-
-            RPGMakerVersion version = RGSSAD.GetVersion(_commandLineOptions.InputPaths.First());
+            RPGMakerVersion version = RGSSAD.GetVersion(_commandLineOptions.InputPath);
 
             if (version == RPGMakerVersion.Invalid)
             {
@@ -45,7 +40,7 @@ static void Main(string[] args)
             }
             else
             {
-                FileInfo fi = new FileInfo(_commandLineOptions.InputPaths.First());
+                FileInfo fi = new FileInfo(_commandLineOptions.InputPath);
                 outputDirectoryPath = fi.DirectoryName;
             }
 
@@ -55,11 +50,11 @@ static void Main(string[] args)
                 {
                     case RPGMakerVersion.Xp:
                     case RPGMakerVersion.Vx:
-                        RGSSADv1 rgssadv1 = new RGSSADv1(_commandLineOptions.InputPaths.First());
+                        RGSSADv1 rgssadv1 = new RGSSADv1(_commandLineOptions.InputPath);
                         rgssadv1.ExtractAllFiles(outputDirectoryPath);
                         break;
                     case RPGMakerVersion.VxAce:
-                        RGSSADv3 rgssadv2 = new RGSSADv3(_commandLineOptions.InputPaths.First());
+                        RGSSADv3 rgssadv2 = new RGSSADv3(_commandLineOptions.InputPath);
                         rgssadv2.ExtractAllFiles(outputDirectoryPath);
                         break;
                 }
@@ -80,7 +75,6 @@ static void Main(string[] args)
                 Environment.Exit(1);
             }
 
-
             if (_commandLineOptions.GenerateProjectFile)
             {
                 ProjectGenerator.GenerateProject(version, outputDirectoryPath);