Skip to content

Upgrade to aspnet5 beta5 version #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Daniel15 merged 3 commits into from
Jul 16, 2015
Merged

Upgrade to aspnet5 beta5 version #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d757d7
Upgrade to aspnet5 beta5 version
xabikos Jul 16, 2015
a22536d
Replace spaces with tab
xabikos Jul 16, 2015
3dafa82
Fix indenting
xabikos Jul 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/React.AspNet/JsxFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -137,13 +137,13 @@ public IDirectoryContents GetDirectoryContents(string subpath)
/// <returns>
/// An <see cref="IExpirationTrigger"/> that is triggered when a file matching <paramref name="filter"/> is added, modified or deleted.
/// </returns>
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;
Expand Down Expand Up @@ -202,4 +202,4 @@ public bool Exists
#endif
}
}
}
}
2 changes: 1 addition & 1 deletion src/React.AspNet/React.AspNet.xproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties project_1json__JSONSchema="http://www.asp.net/media/4878834/project.json" />
<UserProperties />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" />
Expand Down
11 changes: 5 additions & 6 deletions src/React.AspNet/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
2 changes: 1 addition & 1 deletion src/React.Sample.Mvc6/React.Sample.Mvc6.xproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties bower_1json__JSONSchema="http://json.schemastore.org/bower" project_1json__JSONSchema="http://www.asp.net/media/4878834/project.json" package_1json__JSONSchema="http://json.schemastore.org/package" />
<UserProperties bower_1json__JSONSchema="http://json.schemastore.org/bower" package_1json__JSONSchema="http://json.schemastore.org/package" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" />
Expand Down
16 changes: 9 additions & 7 deletions src/React.Sample.Mvc6/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
24 changes: 10 additions & 14 deletions src/React.Sample.Mvc6/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down