From 55310c767a21ca7d2093e0185d1bb0d616632908 Mon Sep 17 00:00:00 2001 From: Marcus Specht Date: Mon, 27 Nov 2017 13:33:12 +0100 Subject: [PATCH] updated picibits and newtonssoft.json --- dlkmasda | 211 +++++++++++++++++++++++++++ src/hbs.ldu/project.json | 4 +- src/hbs.wpf.demo/app.config | 6 +- src/hbs.wpf.demo/hbs.wpf.demo.csproj | 22 ++- src/hbs.wpf.demo/packages.config | 6 +- src/hbs.wpf/app.config | 6 +- src/hbs.wpf/hbs.wpf.csproj | 22 ++- src/hbs.wpf/packages.config | 6 +- src/hbs/project.json | 4 +- src/picibits.bib/project.json | 4 +- 10 files changed, 253 insertions(+), 38 deletions(-) create mode 100644 dlkmasda diff --git a/dlkmasda b/dlkmasda new file mode 100644 index 0000000..d12a341 --- /dev/null +++ b/dlkmasda @@ -0,0 +1,211 @@ +diff --git a/src/hbs.ldu/project.json b/src/hbs.ldu/project.json +index 9a231c6..fc20be4 100644 +--- a/src/hbs.ldu/project.json ++++ b/src/hbs.ldu/project.json +@@ -2,9 +2,9 @@ + "supports": {}, + "dependencies": { + "Flurl.Http": "0.10.1", +- "Newtonsoft.Json": "9.0.1", ++ "Newtonsoft.Json": "10.0.3", + "Nito.AsyncEx": "3.0.1", +- "picibits": "0.1.52" ++ "picibits": "0.1.61" + }, + "frameworks": { + ".NETPortable,Version=v4.5,Profile=Profile7": {} +diff --git a/src/hbs.wpf.demo/app.config b/src/hbs.wpf.demo/app.config +index 097b12a..af662b5 100644 +--- a/src/hbs.wpf.demo/app.config ++++ b/src/hbs.wpf.demo/app.config +@@ -4,12 +4,16 @@ +  +  +  +-  ++  +  +  +  +  +  ++  ++  ++  ++  +  +  +  +diff --git a/src/hbs.wpf.demo/hbs.wpf.demo.csproj b/src/hbs.wpf.demo/hbs.wpf.demo.csproj +index 4ab7f68..bdf54e4 100644 +--- a/src/hbs.wpf.demo/hbs.wpf.demo.csproj ++++ b/src/hbs.wpf.demo/hbs.wpf.demo.csproj +@@ -108,10 +108,8 @@ +  +  +  +-  +- False +- ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll +- True ++  ++ ..\..\..\hbs.product\src\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll +  +  + ..\packages\Newtonsoft.Json.Schema.2.0.4\lib\net45\Newtonsoft.Json.Schema.dll +@@ -129,17 +127,17 @@ + ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll + True +  +-  +- ..\packages\picibits.0.1.52\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.app.dll ++  ++ ..\packages\picibits.0.1.61\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.app.dll +  +-  +- ..\packages\picibits.0.1.52\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.core.dll ++  ++ ..\packages\picibits.0.1.61\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.core.dll +  +-  +- ..\packages\picibits.wpf.0.1.52\lib\dotnet\picibits.wpf.app.dll ++  ++ ..\packages\picibits.wpf.0.1.61\lib\dotnet\picibits.wpf.app.dll +  +-  +- ..\packages\picibits.wpf.0.1.52\lib\dotnet\picibits.wpf.core.dll ++  ++ ..\packages\picibits.wpf.0.1.61\lib\dotnet\picibits.wpf.core.dll +  +  + False +diff --git a/src/hbs.wpf.demo/packages.config b/src/hbs.wpf.demo/packages.config +index 2a15aab..d230c25 100644 +--- a/src/hbs.wpf.demo/packages.config ++++ b/src/hbs.wpf.demo/packages.config +@@ -5,11 +5,11 @@ +  +  +  +-  ++  +  +  +-  +-  ++  ++  +  +  +  +diff --git a/src/hbs.wpf/app.config b/src/hbs.wpf/app.config +index 8011fd9..4223a8f 100644 +--- a/src/hbs.wpf/app.config ++++ b/src/hbs.wpf/app.config +@@ -4,7 +4,11 @@ +  +  +  +-  ++  ++  ++  ++  ++  +  +  +  +diff --git a/src/hbs.wpf/hbs.wpf.csproj b/src/hbs.wpf/hbs.wpf.csproj +index c60d7e5..6aa7871 100644 +--- a/src/hbs.wpf/hbs.wpf.csproj ++++ b/src/hbs.wpf/hbs.wpf.csproj +@@ -151,10 +151,8 @@ +  +  +  +-  +- False +- ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll +- True ++  ++ ..\..\..\hbs.product\src\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll +  +  + ..\packages\Newtonsoft.Json.Schema.2.0.4\lib\net45\Newtonsoft.Json.Schema.dll +@@ -175,17 +173,17 @@ + ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll + True +  +-  +- ..\packages\picibits.0.1.52\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.app.dll ++  ++ ..\packages\picibits.0.1.61\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.app.dll +  +-  +- ..\packages\picibits.0.1.52\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.core.dll ++  ++ ..\packages\picibits.0.1.61\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.core.dll +  +-  +- ..\packages\picibits.wpf.0.1.52\lib\dotnet\picibits.wpf.app.dll ++  ++ ..\packages\picibits.wpf.0.1.61\lib\dotnet\picibits.wpf.app.dll +  +-  +- ..\packages\picibits.wpf.0.1.52\lib\dotnet\picibits.wpf.core.dll ++  ++ ..\packages\picibits.wpf.0.1.61\lib\dotnet\picibits.wpf.core.dll +  +  + False +diff --git a/src/hbs.wpf/packages.config b/src/hbs.wpf/packages.config +index aa53f93..a40422c 100644 +--- a/src/hbs.wpf/packages.config ++++ b/src/hbs.wpf/packages.config +@@ -5,11 +5,11 @@ +  +  +  +-  ++  +  +  +-  +-  ++  ++  +  +  +  +diff --git a/src/hbs/project.json b/src/hbs/project.json +index 97422d7..6f94c2a 100644 +--- a/src/hbs/project.json ++++ b/src/hbs/project.json +@@ -2,9 +2,9 @@ + "supports": {}, + "dependencies": { + "Flurl.Http": "0.10.1", +- "Newtonsoft.Json": "9.0.1", ++ "Newtonsoft.Json": "10.0.3", + "Nito.AsyncEx": "3.0.1", +- "picibits": "0.1.52", ++ "picibits": "0.1.61", + "SimpleInjector": "3.2.0", + "System.Reactive": "3.0.0" + }, +diff --git a/src/picibits.bib/project.json b/src/picibits.bib/project.json +index 9a231c6..fc20be4 100644 +--- a/src/picibits.bib/project.json ++++ b/src/picibits.bib/project.json +@@ -2,9 +2,9 @@ + "supports": {}, + "dependencies": { + "Flurl.Http": "0.10.1", +- "Newtonsoft.Json": "9.0.1", ++ "Newtonsoft.Json": "10.0.3", + "Nito.AsyncEx": "3.0.1", +- "picibits": "0.1.52" ++ "picibits": "0.1.61" + }, + "frameworks": { + ".NETPortable,Version=v4.5,Profile=Profile7": {} diff --git a/src/hbs.ldu/project.json b/src/hbs.ldu/project.json index 9a231c6..fc20be4 100644 --- a/src/hbs.ldu/project.json +++ b/src/hbs.ldu/project.json @@ -2,9 +2,9 @@ "supports": {}, "dependencies": { "Flurl.Http": "0.10.1", - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "10.0.3", "Nito.AsyncEx": "3.0.1", - "picibits": "0.1.52" + "picibits": "0.1.61" }, "frameworks": { ".NETPortable,Version=v4.5,Profile=Profile7": {} diff --git a/src/hbs.wpf.demo/app.config b/src/hbs.wpf.demo/app.config index 097b12a..af662b5 100644 --- a/src/hbs.wpf.demo/app.config +++ b/src/hbs.wpf.demo/app.config @@ -4,12 +4,16 @@ - + + + + + diff --git a/src/hbs.wpf.demo/hbs.wpf.demo.csproj b/src/hbs.wpf.demo/hbs.wpf.demo.csproj index 4ab7f68..28940a4 100644 --- a/src/hbs.wpf.demo/hbs.wpf.demo.csproj +++ b/src/hbs.wpf.demo/hbs.wpf.demo.csproj @@ -108,10 +108,8 @@ - - False - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\Newtonsoft.Json.Schema.2.0.4\lib\net45\Newtonsoft.Json.Schema.dll @@ -129,17 +127,17 @@ ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll True - - ..\packages\picibits.0.1.52\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.app.dll + + ..\packages\picibits.0.1.61\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.app.dll - - ..\packages\picibits.0.1.52\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.core.dll + + ..\packages\picibits.0.1.61\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.core.dll - - ..\packages\picibits.wpf.0.1.52\lib\dotnet\picibits.wpf.app.dll + + ..\packages\picibits.wpf.0.1.61\lib\dotnet\picibits.wpf.app.dll - - ..\packages\picibits.wpf.0.1.52\lib\dotnet\picibits.wpf.core.dll + + ..\packages\picibits.wpf.0.1.61\lib\dotnet\picibits.wpf.core.dll False diff --git a/src/hbs.wpf.demo/packages.config b/src/hbs.wpf.demo/packages.config index 2a15aab..d230c25 100644 --- a/src/hbs.wpf.demo/packages.config +++ b/src/hbs.wpf.demo/packages.config @@ -5,11 +5,11 @@ - + - - + + diff --git a/src/hbs.wpf/app.config b/src/hbs.wpf/app.config index 8011fd9..4223a8f 100644 --- a/src/hbs.wpf/app.config +++ b/src/hbs.wpf/app.config @@ -4,7 +4,11 @@ - + + + + + diff --git a/src/hbs.wpf/hbs.wpf.csproj b/src/hbs.wpf/hbs.wpf.csproj index c60d7e5..95ebe56 100644 --- a/src/hbs.wpf/hbs.wpf.csproj +++ b/src/hbs.wpf/hbs.wpf.csproj @@ -151,10 +151,8 @@ - - False - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\Newtonsoft.Json.Schema.2.0.4\lib\net45\Newtonsoft.Json.Schema.dll @@ -175,17 +173,17 @@ ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll True - - ..\packages\picibits.0.1.52\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.app.dll + + ..\packages\picibits.0.1.61\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.app.dll - - ..\packages\picibits.0.1.52\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.core.dll + + ..\packages\picibits.0.1.61\lib\.NETPortable,Version=v4.5,Profile=Profile7\picibits.core.dll - - ..\packages\picibits.wpf.0.1.52\lib\dotnet\picibits.wpf.app.dll + + ..\packages\picibits.wpf.0.1.61\lib\dotnet\picibits.wpf.app.dll - - ..\packages\picibits.wpf.0.1.52\lib\dotnet\picibits.wpf.core.dll + + ..\packages\picibits.wpf.0.1.61\lib\dotnet\picibits.wpf.core.dll False diff --git a/src/hbs.wpf/packages.config b/src/hbs.wpf/packages.config index aa53f93..a40422c 100644 --- a/src/hbs.wpf/packages.config +++ b/src/hbs.wpf/packages.config @@ -5,11 +5,11 @@ - + - - + + diff --git a/src/hbs/project.json b/src/hbs/project.json index 97422d7..6f94c2a 100644 --- a/src/hbs/project.json +++ b/src/hbs/project.json @@ -2,9 +2,9 @@ "supports": {}, "dependencies": { "Flurl.Http": "0.10.1", - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "10.0.3", "Nito.AsyncEx": "3.0.1", - "picibits": "0.1.52", + "picibits": "0.1.61", "SimpleInjector": "3.2.0", "System.Reactive": "3.0.0" }, diff --git a/src/picibits.bib/project.json b/src/picibits.bib/project.json index 9a231c6..fc20be4 100644 --- a/src/picibits.bib/project.json +++ b/src/picibits.bib/project.json @@ -2,9 +2,9 @@ "supports": {}, "dependencies": { "Flurl.Http": "0.10.1", - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "10.0.3", "Nito.AsyncEx": "3.0.1", - "picibits": "0.1.52" + "picibits": "0.1.61" }, "frameworks": { ".NETPortable,Version=v4.5,Profile=Profile7": {}