From 764016f0f0dffdabb0df4c8b035b21f94e33fb0d Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 3 May 2018 11:57:55 +0200 Subject: [PATCH] cleaning, with no change excpeted. --- cli/cli.csproj | 53 ++++++++++++++++--- cli/cli/Program.cs | 17 ------- cli/cli/packages.config | 60 ---------------------- cli/packages.config | 8 ++- cli/project.json | 109 ++++++++++++++++++++-------------------- cli/project.lock.json | 29 ++++++----- 6 files changed, 124 insertions(+), 152 deletions(-) delete mode 100644 cli/cli/Program.cs delete mode 100644 cli/cli/packages.config diff --git a/cli/cli.csproj b/cli/cli.csproj index c2d2d2ca..00ac19b8 100644 --- a/cli/cli.csproj +++ b/cli/cli.csproj @@ -1,5 +1,6 @@ - + 10.0 Debug @@ -12,8 +13,7 @@ netcoreapp2.0 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - + true @@ -24,7 +24,7 @@ DEBUG;TRACE prompt 4 - + true @@ -50,7 +50,7 @@ - packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -58,7 +58,7 @@ - packages\Npgsql.2.2.0-rc1\lib\net45\Mono.Security.dll + ..\packages\Npgsql.2.2.0-rc1\lib\net45\Mono.Security.dll @@ -90,6 +90,47 @@ ..\packages\Machine.Specifications.Runner.Console.0.9.0\tools\Machine.Specifications.Runner.Utility.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cli/cli/Program.cs b/cli/cli/Program.cs deleted file mode 100644 index 37aa9336..00000000 --- a/cli/cli/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -// // Program.cs -// /* -// paul 02/05/2018 02:32 20182018 5 2 -// */ -using System; - -namespace cli -{ - class MainClass - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - - } - } -} diff --git a/cli/cli/packages.config b/cli/cli/packages.config deleted file mode 100644 index 15155961..00000000 --- a/cli/cli/packages.config +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cli/packages.config b/cli/packages.config index 15155961..2038bc1c 100644 --- a/cli/packages.config +++ b/cli/packages.config @@ -3,12 +3,18 @@ + + + + + + @@ -23,8 +29,6 @@ - - diff --git a/cli/project.json b/cli/project.json index 9183cee6..bb9ff70f 100644 --- a/cli/project.json +++ b/cli/project.json @@ -1,58 +1,59 @@ { - "version": "1.0.5-*", - "commands": { - "run": "cli" - }, - "resource": "Resources/**/*.resx", - "buildOptions": { - "debugType": "full", - "emitEntryPoint": true, - "compile": { - "include": "*.cs", - "exclude": [ - "contrib" - ] + "version": "1.0.5-*", + "commands": { + "run": "cli" }, - "embed": [ - "Resources/**/*.resx" - ] - }, - "dependencies": { - "EntityFramework7.Npgsql": "3.1.0-rc1-3", - "MailKit": "1.12.0", - "Microsoft.AspNet.Hosting": "1.0.0-rc1-final", - "Microsoft.AspNet.Identity": "3.0.0-rc1-*", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*", - "Microsoft.AspNet.Mvc": "6.0.0-rc1-*", - "Microsoft.CodeAnalysis": "1.1.0-rc1-20151109-01", - "Microsoft.Extensions.CodeGeneration": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final", - "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final", - "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final", - "Microsoft.Extensions.Localization": "1.0.0-rc1-final", - "Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final", - "Microsoft.Extensions.Options": "0.0.1-alpha", - "Microsoft.Extensions.WebEncoders": "1.0.0-rc1-final", - "Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final", - "Microsoft.Framework.Configuration.Json": "1.0.0-beta8", - "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4", - "Yavsc": { - "version": "1.0.5-rc14", - "target": "package" + "resource": "Resources/**/*.resx", + "buildOptions": { + "debugType": "full", + "emitEntryPoint": true, + "compile": { + "include": "*.cs", + "exclude": [ + "contrib" + ] + }, + "embed": [ + "Resources/**/*.resx" + ] }, - "Yavsc.Abstract": { - "version": "1.0.5-rc14", - "target": "package" + "dependencies": { + "EntityFramework7.Npgsql": "3.1.0-rc1-3", + "MailKit": "1.12.0", + "Microsoft.AspNet.Hosting": "1.0.0-rc1-final", + "Microsoft.AspNet.Identity": "3.0.0-rc1-*", + "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*", + "Microsoft.AspNet.Mvc": "6.0.0-rc1-*", + "Microsoft.CodeAnalysis": "1.1.0-rc1-20151109-01", + "Microsoft.Extensions.CodeGeneration": "1.0.0-rc1-final", + "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final", + "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final", + "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final", + "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final", + "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", + "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final", + "Microsoft.Extensions.Localization": "1.0.0-rc1-final", + "Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final", + "Microsoft.Extensions.Logging": "1.0.0-rc1-final", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final", + "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final", + "Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final", + "Microsoft.Extensions.Options": "0.0.1-alpha", + "Microsoft.Extensions.WebEncoders": "1.0.0-rc1-final", + "Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final", + "Microsoft.Framework.Configuration.Json": "1.0.0-beta8", + "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4", + "Newtonsoft.Json": "9.0.1", + "Yavsc": { + "version": "1.0.5-rc14", + "target": "package" + }, + "Yavsc.Abstract": { + "version": "1.0.5-rc14", + "target": "package" + } + }, + "frameworks": { + "dnx451": {} } - }, - "frameworks": { - "dnx451": {} - } -} +} \ No newline at end of file diff --git a/cli/project.lock.json b/cli/project.lock.json index 17a9b94c..fdd76e48 100644 --- a/cli/project.lock.json +++ b/cli/project.lock.json @@ -1873,7 +1873,7 @@ "lib/net451/MimeKit.dll": {} } }, - "Newtonsoft.Json/6.0.6": { + "Newtonsoft.Json/9.0.1": { "type": "package", "compile": { "lib/net45/Newtonsoft.Json.dll": {} @@ -4001,7 +4001,7 @@ "lib/net451/MimeKit.dll": {} } }, - "Newtonsoft.Json/6.0.6": { + "Newtonsoft.Json/9.0.1": { "type": "package", "compile": { "lib/net45/Newtonsoft.Json.dll": {} @@ -6129,7 +6129,7 @@ "lib/net451/MimeKit.dll": {} } }, - "Newtonsoft.Json/6.0.6": { + "Newtonsoft.Json/9.0.1": { "type": "package", "compile": { "lib/net45/Newtonsoft.Json.dll": {} @@ -7717,9 +7717,9 @@ "mimekit.nuspec" ] }, - "Newtonsoft.Json/6.0.6": { + "Newtonsoft.Json/9.0.1": { "type": "package", - "sha512": "w26uZNyCG5VeoKiEOJ4+9/o8koSofLKwHl7WLreIcp0U6r57L7WiRXmjp8MTKFw6dYNZ9AE0lw69WYbIhUsU9Q==", + "sha512": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", "files": [ "lib/net20/Newtonsoft.Json.dll", "lib/net20/Newtonsoft.Json.xml", @@ -7729,14 +7729,15 @@ "lib/net40/Newtonsoft.Json.xml", "lib/net45/Newtonsoft.Json.dll", "lib/net45/Newtonsoft.Json.xml", - "lib/netcore45/Newtonsoft.Json.dll", - "lib/netcore45/Newtonsoft.Json.xml", + "lib/netstandard1.0/Newtonsoft.Json.dll", + "lib/netstandard1.0/Newtonsoft.Json.xml", "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll", "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml", - "lib/portable-net45+wp80+win8+wpa81+aspnetcore50/Newtonsoft.Json.dll", - "lib/portable-net45+wp80+win8+wpa81+aspnetcore50/Newtonsoft.Json.xml", - "newtonsoft.json.6.0.6.nupkg.sha512", - "newtonsoft.json.nuspec", + "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll", + "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.xml", + "Newtonsoft.Json.9.0.1.nupkg", + "Newtonsoft.Json.9.0.1.nupkg.sha512", + "Newtonsoft.Json.nuspec", "tools/install.ps1" ] }, @@ -8505,8 +8506,9 @@ "sha512": "qh7XoqBfHICTJuu7nwwOh9Wu7D8vntKvbpKPyiV9F61cXxssRBU0mlhmAfWfVmMeDOadTJMePXP43RDDjSxWpA==", "files": [ "lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Yavsc.dll", - "yavsc.1.0.5-rc14.nupkg.sha512", - "yavsc.nuspec" + "Yavsc.1.0.5-rc14.nupkg", + "Yavsc.1.0.5-rc14.nupkg.sha512", + "Yavsc.nuspec" ] }, "Yavsc.Abstract/1.0.5-rc14": { @@ -8547,6 +8549,7 @@ "Microsoft.Extensions.WebEncoders.Core >= 1.0.0-rc1-final", "Microsoft.Framework.Configuration.Json >= 1.0.0-beta8", "Microsoft.Framework.ConfigurationModel.Json >= 1.0.0-beta4", + "Newtonsoft.Json >= 9.0.1", "Yavsc >= 1.0.5-rc14", "Yavsc.Abstract >= 1.0.5-rc14" ],