diff --git a/src/React.AspNet/JsxFileSystem.cs b/src/React.AspNet/JsxFileSystem.cs
index 948c39a10..74bc1e883 100644
--- a/src/React.AspNet/JsxFileSystem.cs
+++ b/src/React.AspNet/JsxFileSystem.cs
@@ -17,7 +17,7 @@
using IOwinFileSystem = Microsoft.Owin.FileSystems.IFileSystem;
#else
using Microsoft.AspNet.FileProviders;
-using Microsoft.Framework.Expiration.Interfaces;
+using Microsoft.Framework.Caching;
using IOwinFileSystem = Microsoft.AspNet.FileProviders.IFileProvider;
using PhysicalFileSystem = Microsoft.AspNet.FileProviders.PhysicalFileProvider;
#endif
@@ -137,13 +137,13 @@ public IDirectoryContents GetDirectoryContents(string subpath)
///
/// An that is triggered when a file matching is added, modified or deleted.
///
- public IExpirationTrigger Watch(string filter)
+ IExpirationTrigger IOwinFileSystem.Watch(string filter)
{
return _physicalFileSystem.Watch(filter);
}
#endif
- private class JsxFileInfo : IFileInfo
+ private class JsxFileInfo : IFileInfo
{
private readonly IJsxTransformer _jsxTransformer;
private readonly IFileInfo _fileInfo;
@@ -202,4 +202,4 @@ public bool Exists
#endif
}
}
-}
\ No newline at end of file
+}
diff --git a/src/React.AspNet/React.AspNet.xproj b/src/React.AspNet/React.AspNet.xproj
index 577d95ee5..79d0a13b0 100644
--- a/src/React.AspNet/React.AspNet.xproj
+++ b/src/React.AspNet/React.AspNet.xproj
@@ -21,7 +21,7 @@
-
+
diff --git a/src/React.AspNet/project.json b/src/React.AspNet/project.json
index 31c91c9e4..dccef9699 100644
--- a/src/React.AspNet/project.json
+++ b/src/React.AspNet/project.json
@@ -15,18 +15,17 @@
}
},
"dependencies": {
- "Microsoft.Framework.DependencyInjection": "1.0.0-beta4",
- "Microsoft.AspNet.Hosting": "1.0.0-beta4",
- "Microsoft.AspNet.Mvc.Core": "6.0.0-beta4",
- "Microsoft.AspNet.StaticFiles": "1.0.0-beta4",
+ "Microsoft.Framework.DependencyInjection": "1.0.0-beta5",
+ "Microsoft.AspNet.Mvc.Core": "6.0.0-beta5",
+ "Microsoft.AspNet.StaticFiles": "1.0.0-beta5",
+ "Microsoft.AspNet.FileProviders.Physical": "1.0.0-beta5",
"React.Core": "",
"JavaScriptEngineSwitcher.Core": "1.2.4.0"
},
"frameworks": {
- DNX451: { }
+ "dnx451": { }
},
- // NuGet info
"authors": [ "Daniel Lo Nigro" ],
"description": "ReactJS tools for ASP.NET 5, including ASP.NET MVC 6. Please refer to project site (http://reactjs.net/) for full installation instructions, usage examples and sample code",
"tags": [ "asp.net", "mvc", "asp", "javascript", "js", "react", "facebook", "reactjs", "vnext" ],
diff --git a/src/React.Sample.Mvc6/React.Sample.Mvc6.xproj b/src/React.Sample.Mvc6/React.Sample.Mvc6.xproj
index 20052ebe2..e98ffa54f 100644
--- a/src/React.Sample.Mvc6/React.Sample.Mvc6.xproj
+++ b/src/React.Sample.Mvc6/React.Sample.Mvc6.xproj
@@ -16,7 +16,7 @@
-
+
diff --git a/src/React.Sample.Mvc6/Startup.cs b/src/React.Sample.Mvc6/Startup.cs
index 3f48d94ae..336213d79 100644
--- a/src/React.Sample.Mvc6/Startup.cs
+++ b/src/React.Sample.Mvc6/Startup.cs
@@ -11,21 +11,23 @@
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Diagnostics;
using Microsoft.AspNet.Hosting;
-using Microsoft.Framework.ConfigurationModel;
+using Microsoft.Framework.Configuration;
using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.Logging;
-using Microsoft.Framework.Logging.Console;
using React.AspNet;
+using Microsoft.Framework.Runtime;
namespace React.Sample.Mvc6
{
- public class Startup
+ public class Startup
{
- public Startup(IHostingEnvironment env)
+ public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
{
- // Setup configuration sources.
- Configuration = new Configuration()
- .AddEnvironmentVariables();
+ // Setup configuration sources.
+ var builder = new ConfigurationBuilder(appEnv.ApplicationBasePath)
+ .AddEnvironmentVariables();
+
+ Configuration = builder.Build();
}
public IConfiguration Configuration { get; set; }
diff --git a/src/React.Sample.Mvc6/project.json b/src/React.Sample.Mvc6/project.json
index 3f72d86fb..9a40328d8 100644
--- a/src/React.Sample.Mvc6/project.json
+++ b/src/React.Sample.Mvc6/project.json
@@ -1,31 +1,27 @@
{
- /* Click to learn more about project.json http://go.microsoft.com/fwlink/?LinkID=517074 */
"webroot": "wwwroot",
"version": "1.5.3-*",
"dependencies": {
- "Microsoft.AspNet.Mvc": "6.0.0-beta4",
- "Microsoft.AspNet.Diagnostics": "1.0.0-beta4",
- "Microsoft.AspNet.Server.IIS": "1.0.0-beta4",
- "Microsoft.AspNet.Server.WebListener": "1.0.0-beta4",
- "Microsoft.AspNet.StaticFiles": "1.0.0-beta4",
- "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
- "Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta4",
- "Microsoft.Framework.Logging": "1.0.0-beta4",
- "Microsoft.Framework.Logging.Console": "1.0.0-beta4",
- "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-beta4",
+ "Microsoft.AspNet.Mvc": "6.0.0-beta5",
+ "Microsoft.AspNet.Diagnostics": "1.0.0-beta5",
+ "Microsoft.AspNet.Server.IIS": "1.0.0-beta5",
+ "Microsoft.AspNet.Server.WebListener": "1.0.0-beta5",
+ "Microsoft.AspNet.StaticFiles": "1.0.0-beta5",
+ "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-beta5",
+ "Microsoft.Framework.Configuration.Json": "1.0.0-beta5",
+ "Microsoft.Framework.Logging": "1.0.0-beta5",
+ "Microsoft.Framework.Logging.Console": "1.0.0-beta5",
"React.AspNet": "",
"React.Core": "",
"JavaScriptEngineSwitcher.V8": "1.2.4.0",
"JavaScriptEngineSwitcher.Msie": "1.2.4.0"
},
"commands": {
- /* Change the port number when you are self hosting this application */
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000",
"gen": "Microsoft.Framework.CodeGeneration"
},
"frameworks": {
- "DNX451": { }
- //"aspnetcore50": { }
+ "dnx451": { }
},
"exclude": [
"wwwroot",