diff --git a/FileAES-CLI/FileAES-CLI.csproj b/FileAES-CLI/FileAES-CLI.csproj
index e91a2ed..1a7fef3 100644
--- a/FileAES-CLI/FileAES-CLI.csproj
+++ b/FileAES-CLI/FileAES-CLI.csproj
@@ -1,85 +1,49 @@
-
-
-
-
+
+
- Debug
- AnyCPU
- {AE1C86EC-831A-4A44-96AE-CC2CAA585B51}
Exe
+ win-x64;linux-x64;osx-x64
+ false
+ true
+ net45;net46;netcoreapp2.1;netcoreapp3.1
FileAES_CLI
- FileAES-CLI
- v4.5
- 512
-
-
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
+ 1.1.0
+ 1.1.0.0
+ - Added progress reporting (--progress)
+- Added ability to toggle the overwriting (-o)
+- Added ability to toggle the deletion of the original files (-po)
+- Added ability to change the FAES CryptoStream buffer with '-buffer '
+- Added ability to show all metadata (--metadata)
+- Added ability to get raw metadata in decoded UTF8
+- Updated help text
+- Changed verbose mode to now enable FAES' Verbose Logging mode
+ mullak99
+ A CLI application for encrypting and decrypting files using FAES.
+ 1.1.0.0
+ false
+ https://github.com/fileaes/FileAES-CLI
+ Copyright © 2019 | mullak99
Icon.ico
+
-
- ..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
-
- {6489d5bc-b847-499e-9ce9-53f702bb892c}
- FAES
-
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
\ No newline at end of file
+
+
diff --git a/FileAES-CLI/FodyWeavers.xml b/FileAES-CLI/FodyWeavers.xml
index 0a0ac8f..20b6986 100644
--- a/FileAES-CLI/FodyWeavers.xml
+++ b/FileAES-CLI/FodyWeavers.xml
@@ -3,6 +3,7 @@
FAES
+ SharpCompress
\ No newline at end of file
diff --git a/FileAES-CLI/Program.cs b/FileAES-CLI/Program.cs
index 2d60e8f..189f7da 100644
--- a/FileAES-CLI/Program.cs
+++ b/FileAES-CLI/Program.cs
@@ -47,7 +47,7 @@ class Program
private const bool _isDevBuild = true;
private const bool _isBetaBuild = false;
- private const string _devBuildTag = "v1.1.0-DEV191010-1";
+ private const string _devBuildTag = "BETA_3";
static void Main(string[] args)
{
@@ -526,7 +526,9 @@ static void Main(string[] args)
}
catch (Exception e)
{
+ #if NETFRAMEWORK
progressThread.Abort();
+ #endif
HandleException(e);
}
});
@@ -536,8 +538,9 @@ static void Main(string[] args)
while (eThread.ThreadState == ThreadState.Running)
{ }
-
+ #if NETFRAMEWORK
progressThread.Abort();
+ #endif
}
else
{
@@ -576,7 +579,9 @@ static void Main(string[] args)
}
catch (Exception e)
{
+ #if NETFRAMEWORK
progressThread.Abort();
+ #endif
HandleException(e);
}
});
@@ -586,8 +591,9 @@ static void Main(string[] args)
while (dThread.ThreadState == ThreadState.Running)
{ }
-
+ #if NETFRAMEWORK
progressThread.Abort();
+ #endif
}
}
}
diff --git a/FileAES-CLI/Properties/AssemblyInfo.cs b/FileAES-CLI/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0593c5d..0000000
--- a/FileAES-CLI/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FileAES-CLI")]
-[assembly: AssemblyDescription("A tool used to encrypt and decrypt files or folders using FAES.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("mullak99")]
-[assembly: AssemblyProduct("FileAES-CLI")]
-[assembly: AssemblyCopyright("Copyright © 2019 | mullak99")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("ae1c86ec-831a-4a44-96ae-cc2caa585b51")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/FileAES-CLI/Properties/launchSettings.json b/FileAES-CLI/Properties/launchSettings.json
new file mode 100644
index 0000000..8514ca2
--- /dev/null
+++ b/FileAES-CLI/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+ "profiles": {
+ "FileAES-CLI": {
+ "commandName": "Project",
+ "commandLineArgs": "Test.txt -p pass"
+ }
+ }
+}
\ No newline at end of file
diff --git a/FileAES-CLI/Update.cs b/FileAES-CLI/Update.cs
index ad7c38c..ce99969 100644
--- a/FileAES-CLI/Update.cs
+++ b/FileAES-CLI/Update.cs
@@ -217,7 +217,12 @@ public void UpdateSelf(bool doCleanUpdate = false, string version = "latest")
}
catch (UnauthorizedAccessException)
{
+ #if NETFRAMEWORK
RunAsAdmin();
+ #else
+ Logging.Log(String.Format("The program needs to be ran with administrator privilages to update!"), Severity.WARN);
+ #endif
+
}
catch (Exception e)
{
@@ -318,7 +323,7 @@ private string ConvertVersionToNonFormatted(string formattedVersion)
Logging.Log(String.Format("ToNonFormatted: Converted '{0}' to '{1}'.", formattedVersion, nonFormattedVersion), Severity.DEBUG);
return nonFormattedVersion;
}
-
+ #if NETFRAMEWORK
internal static bool IsRunAsAdmin()
{
WindowsIdentity id = WindowsIdentity.GetCurrent();
@@ -347,5 +352,6 @@ private static void RunAsAdmin()
Environment.Exit(0);
}
}
+ #endif
}
}