Обновлены зависимости

EfsTools/EfsTools.csproj

@@ -32,16 +32,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath>
+    <Reference Include="CommandLine, Version=2.3.0.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.2.3.0\lib\net45\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.TypeExtensions.4.5.1\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

EfsTools/packages.config

@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
-  <package id="CommandLineParser" version="2.2.1" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
+  <package id="CommandLineParser" version="2.3.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
+  <package id="System.Console" version="4.3.1" targetFramework="net461" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO" version="4.3.0" targetFramework="net461" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net461" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Reflection.TypeExtensions" version="4.5.1" targetFramework="net461" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
 </packages>

packages/CommandLineParser.2.2.1/readme.md → packages/CommandLineParser.2.3.0/readme.md

@@ -27,15 +27,12 @@ __This library provides _hassle free_ command line parsing with a constantly upd
 - Supports `--help`, `--version`, `version` and `help [verb]` by default.
 - Map to sequences (via `IEnumerable<T>` and similar) and scalar types, including Enums and `Nullable<T>`.
 - You can also map to every type with a constructor that accepts a string (like `System.Uri`).
-- __Plug-In friendly__ architecture as explained [here](https://github.com/gsscoder/commandline/wiki/Plug-in-Friendly-Architecture).
-- Define [verb commands](https://github.com/gsscoder/commandline/wiki/Latest-Version#verbs) similar to `git commit -a`.
+- Define [verb commands](https://github.com/commandlineparser/commandline/wiki#verbs) similar to `git commit -a`.
 - Unparsing support: `CommandLine.Parser.Default.FormatCommandLine<T>(T options)`.
-- CommandLineParser.FSharp package is F#-friendly with support for `option<'a>`, see [demo](https://github.com/gsscoder/commandline/blob/master/demo/fsharp-demo.fsx).  _NOTE: This is a separate Nuget package._
+- CommandLineParser.FSharp package is F#-friendly with support for `option<'a>`, see [demo](https://github.com/commandlineparser/commandline/blob/master/demo/fsharp-demo.fsx).  _NOTE: This is a separate Nuget package._
 - Most of features applies with a [CoC](http://en.wikipedia.org/wiki/Convention_over_configuration) philosophy.
 - C# demo: source [here](https://github.com/commandlineparser/commandline/tree/master/demo/ReadText.Demo).
 
-Used by several open source projects and by various commercial products: See the [wiki for listing](https://github.com/gsscoder/commandline/Used_By)
-
 # Getting Started with the Command Line Parser Library
 
 You can utilize the parser library in several ways:
@@ -44,8 +41,6 @@ You can utilize the parser library in several ways:
 - Integrate directly into your project by copying the .cs files into your project.
 - ILMerge during your build process.
 
-See more details in the [wiki for direct integrations](https://github.com/gsscoder/commandline/wiki/Direct_Integrations)
-
 ## Quick Start Examples
 
 1. Create a class to define valid options, and to receive the parsed options.
@@ -54,31 +49,28 @@ See more details in the [wiki for direct integrations](https://github.com/gsscod
 C# Examples:
 
 ```csharp
-internal class Options {
-  [Option('r',"read", 
-	Required = true,
-	HelpText = "Input files to be processed.")]
+class Options
+{
+  [Option('r', "read", Required = true, HelpText = "Input files to be processed.")]
   public IEnumerable<string> InputFiles { get; set; }
 
   // Omitting long name, defaults to name of property, ie "--verbose"
-  [Option(
-	DefaultValue = false,
-	HelpText = "Prints all messages to standard output.")]
+  [Option(Default = false, HelpText = "Prints all messages to standard output.")]
   public bool Verbose { get; set; }
-
-  [Option("stdin",
-	DefaultValue = false
-	HelpText = "Read from stdin")]
-   public bool stdin { get; set; }
-
-  [Value(0, MetaName = "offset",
-	HelpText = "File offset.")]
+
+  [Option("stdin", Default = false, HelpText = "Read from stdin")]
+  public bool stdin { get; set; }
+
+  [Value(0, MetaName = "offset", HelpText = "File offset.")]
   public long? Offset { get; set; }
 }
 
-static int Main(string[] args) {
-  var options = new Options();
-  var isValid = CommandLine.Parser.Default.ParseArgumentsStrict(args, options);
+static void Main(string[] args)
+{
+  CommandLine.Parser.Default.ParseArguments<Options>(args)
+    .WithParsed<Options>(opts => RunOptionsAndReturnExitCode(opts))
+    .WithNotParsed<Options>((errs) => HandleParseError(errs));
+}
 ```
 
 F# Examples:
@@ -102,25 +94,25 @@ VB.Net:
 
 ```VB.NET
 Class Options
-	<CommandLine.Option('r', "read", Required := true,
-	HelpText:="Input files to be processed.")>
-	Public Property InputFiles As IEnumerable(Of String)
-
-	' Omitting long name, defaults to name of property, ie "--verbose"
-	<CommandLine.Option(
-	HelpText:="Prints all messages to standard output.")>
-	Public Property Verbose As Boolean
-
-	<CommandLine.Option(DefaultValue:="中文",
-	HelpText:="Content language.")>
-	Public Property Language As String
-
-	<CommandLine.Value(0, MetaName:="offset",
-	HelpText:="File offset.")>
-	Public Property Offset As Long?
+    <CommandLine.Option("r", "read", Required:=True, HelpText:="Input files to be processed.")>
+    Public Property InputFiles As IEnumerable(Of String)
+
+    ' Omitting long name, defaults to name of property, ie "--verbose"
+    <CommandLine.Option(HelpText:="Prints all messages to standard output.")>
+    Public Property Verbose As Boolean
+
+    <CommandLine.Option([Default]:="中文", HelpText:="Content language.")>
+    Public Property Language As String
+
+    <CommandLine.Value(0, MetaName:="offset", HelpText:="File offset.")>
+    Public Property Offset As Long?
 End Class
 
-'TODO
+Sub Main(ByVal args As String())
+    CommandLine.Parser.Default.ParseArguments(Of Options)(args) _
+        .WithParsed(Function(opts As Options) RunOptionsAndReturnExitCode(opts)) _
+        .WithNotParsed(Function(errs As IEnumerable(Of [Error])) 1)
+End Sub
 ```
 
 ### For verbs:
@@ -160,20 +152,26 @@ VB.Net example:
 ```VB.NET
 <CommandLine.Verb("add", HelpText:="Add file contents to the index.")>
 Public Class AddOptions
-	'Normal options here
+    'Normal options here
 End Class
 <CommandLine.Verb("commit", HelpText:="Record changes to the repository.")>
-Public Class AddOptions
-	'Normal options here
+Public Class CommitOptions
+    'Normal options here
 End Class
 <CommandLine.Verb("clone", HelpText:="Clone a repository into a new directory.")>
-Public Class AddOptions
-	'Normal options here
+Public Class CloneOptions
+    'Normal options here
 End Class
 
-Public Shared Sub Main()
-	'TODO
-End Sub
+Function Main(ByVal args As String()) As Integer
+    Return CommandLine.Parser.Default.ParseArguments(Of AddOptions, CommitOptions, CloneOptions)(args) _
+          .MapResult(
+              (Function(opts As AddOptions) RunAddAndReturnExitCode(opts)),
+              (Function(opts As CommitOptions) RunCommitAndReturnExitCode(opts)),
+              (Function(opts As CloneOptions) RunCloneAndReturnExitCode(opts)),
+              (Function(errs As IEnumerable(Of [Error])) 1)
+          )
+End Function
 ```
 
 F# Example:
@@ -206,14 +204,6 @@ let main args =
   | :? CommandLine.NotParsed<obj> -> 1
 ```
 
-For additional examples, check the [wiki for additional examples](https://gsscoder/commandline/wiki/Examples)
-
-Acknowledgements:
----
-[![Jet Brains ReSharper](/art/resharper-logo.png)](http://www.jetbrains.com/resharper/)
-
-Thanks to JetBrains for providing an open source license for [ReSharper](http://www.jetbrains.com/resharper/).
-
 # Contibutors
 First off, _Thank you!_  All contributions are welcome.  
 
@@ -223,19 +213,17 @@ Additionally, for easiest diff compares, please follow the project's tabs settin
 
 __And most importantly, please target the ```develop``` branch in your pull requests!__
 
-For more info, see the [wiki for details about contributing](https://github.com/gsscoder/commandline/wiki/Building_the_library) and for building the project.
-
 ## Main Contributors (alphabetical order):
 - Alexander Fast (@mizipzor)
 - Dan Nemec (@nemec)
+- Eric Newton (@ericnewton76)
 - Kevin Moore (@gimmemoore)
 - Steven Evans
 - Thomas Démoulins (@Thilas)
 
 ## Resources for newcomers:
 
-- [Quickstart](https://github.com/gsscoder/commandline/wiki/Quickstart)
-- [Wiki](https://github.com/gsscoder/commandline/wiki)
+- [Wiki](https://github.com/commandlineparser/commandline/wiki)
 - [GNU getopt](http://www.gnu.org/software/libc/manual/html_node/Getopt.html)
 
 # Contacts:

packages/Newtonsoft.Json.12.0.1/LICENSE.md

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.