From 8df3b5ca0e7990a5cc5f7eadd6c836c45ac0968e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Tue, 15 Mar 2016 18:16:29 +0100 Subject: [PATCH] Add temporary workarounds for missing framework assemblies errors --- samples/Mvc.Client/Startup.cs | 3 +-- samples/Mvc.Client/project.json | 8 ++++++-- samples/Mvc.Server/Startup.cs | 3 +-- samples/Mvc.Server/project.json | 8 ++++++-- src/OpenIddict.Assets/project.json | 14 +++++++++++++- src/OpenIddict.Core/project.json | 14 +++++++++++++- src/OpenIddict.Mvc/project.json | 13 +++++++++++-- 7 files changed, 51 insertions(+), 12 deletions(-) diff --git a/samples/Mvc.Client/Startup.cs b/samples/Mvc.Client/Startup.cs index b22bba7f..3f00ed8a 100644 --- a/samples/Mvc.Client/Startup.cs +++ b/samples/Mvc.Client/Startup.cs @@ -30,8 +30,7 @@ namespace Mvc.Client { services.AddMvcDnx(); } - public void Configure(IApplicationBuilder app) { - var factory = app.ApplicationServices.GetRequiredService(); + public void Configure(IApplicationBuilder app, ILoggerFactory factory) { factory.AddConsole(); factory.AddDebug(); diff --git a/samples/Mvc.Client/project.json b/samples/Mvc.Client/project.json index 29da46c0..58a9b71c 100644 --- a/samples/Mvc.Client/project.json +++ b/samples/Mvc.Client/project.json @@ -12,11 +12,15 @@ "Microsoft.AspNetCore.StaticFiles": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.NETCore.Platforms": "1.0.1-*", + + "System.ComponentModel": "4.0.1-*", + "System.IO": "4.1.0-*", + "System.Runtime": "4.1.0-*" }, "frameworks": { - "dnx451": { }, + "net451": { }, "netstandardapp1.5": { "imports": [ diff --git a/samples/Mvc.Server/Startup.cs b/samples/Mvc.Server/Startup.cs index 4997daf6..767d3912 100644 --- a/samples/Mvc.Server/Startup.cs +++ b/samples/Mvc.Server/Startup.cs @@ -53,8 +53,7 @@ namespace Mvc.Server { services.AddTransient(); } - public void Configure(IApplicationBuilder app) { - var factory = app.ApplicationServices.GetRequiredService(); + public void Configure(IApplicationBuilder app, ILoggerFactory factory) { factory.AddConsole(); factory.AddDebug(); diff --git a/samples/Mvc.Server/project.json b/samples/Mvc.Server/project.json index e4868e4f..07e63ab2 100644 --- a/samples/Mvc.Server/project.json +++ b/samples/Mvc.Server/project.json @@ -15,11 +15,15 @@ "Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*", - "OpenIddict": "1.0.0-*" + "OpenIddict": "1.0.0-*", + + "System.ComponentModel": "4.0.1-*", + "System.IO": "4.1.0-*", + "System.Runtime": "4.1.0-*" }, "frameworks": { - "dnx451": { }, + "net451": { }, "netstandardapp1.5": { "imports": [ diff --git a/src/OpenIddict.Assets/project.json b/src/OpenIddict.Assets/project.json index ba44fe0d..ad79f4fe 100644 --- a/src/OpenIddict.Assets/project.json +++ b/src/OpenIddict.Assets/project.json @@ -13,7 +13,19 @@ }, "frameworks": { - "net451": { }, + "net451": { + "frameworkAssemblies": { + "System.Reflection": { + "type": "build", + "version": "4.0.0.0" + }, + + "System.Runtime": { + "type": "build", + "version": "4.0.10.0" + } + } + }, "netstandard1.3": { "imports": [ diff --git a/src/OpenIddict.Core/project.json b/src/OpenIddict.Core/project.json index 6581f84c..fe616b30 100644 --- a/src/OpenIddict.Core/project.json +++ b/src/OpenIddict.Core/project.json @@ -14,7 +14,19 @@ }, "frameworks": { - "net451": { }, + "net451": { + "frameworkAssemblies": { + "System.ComponentModel": { + "type": "build", + "version": "4.0.0.0" + }, + + "System.Runtime": { + "type": "build", + "version": "4.0.10.0" + } + } + }, "netstandard1.3": { "imports": [ diff --git a/src/OpenIddict.Mvc/project.json b/src/OpenIddict.Mvc/project.json index 705b5711..a31f5a0e 100644 --- a/src/OpenIddict.Mvc/project.json +++ b/src/OpenIddict.Mvc/project.json @@ -11,11 +11,20 @@ "Microsoft.AspNetCore.Mvc": "1.0.0-*", "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*", "Microsoft.Extensions.FileProviders.Composite": "1.0.0-*", - "OpenIddict.Core": "1.0.0-*" + "OpenIddict.Core": "1.0.0-*", + + "System.Reflection": "4.1.0-*" }, "frameworks": { - "net451": { }, + "net451": { + "frameworkAssemblies": { + "System.Reflection": { + "type": "build", + "version": "4.0.0.0" + } + } + }, "netstandard1.5": { "imports": [