Skip to content

Commit 5675836

Browse files
Daniel15Daniel15
committed
Merge pull request reactjs#147 from xabikos/aspnet5beta5
Upgrade to aspnet5 beta5 version
2 parents 2e554e6 + 3dafa82 commit 5675836

File tree

6 files changed

+30
-33
lines changed

6 files changed

+30
-33
lines changed

‎src/React.AspNet/JsxFileSystem.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using IOwinFileSystem = Microsoft.Owin.FileSystems.IFileSystem;
1818
#else
1919
using Microsoft.AspNet.FileProviders;
20-
using Microsoft.Framework.Expiration.Interfaces;
20+
using Microsoft.Framework.Caching;
2121
using IOwinFileSystem = Microsoft.AspNet.FileProviders.IFileProvider;
2222
using PhysicalFileSystem = Microsoft.AspNet.FileProviders.PhysicalFileProvider;
2323
#endif
@@ -137,13 +137,13 @@ public IDirectoryContents GetDirectoryContents(string subpath)
137137
/// <returns>
138138
/// An <see cref="IExpirationTrigger"/> that is triggered when a file matching <paramref name="filter"/> is added, modified or deleted.
139139
/// </returns>
140-
public IExpirationTrigger Watch(string filter)
140+
IExpirationTrigger IOwinFileSystem.Watch(string filter)
141141
{
142142
return _physicalFileSystem.Watch(filter);
143143
}
144144
#endif
145145

146-
private class JsxFileInfo : IFileInfo
146+
private class JsxFileInfo : IFileInfo
147147
{
148148
private readonly IJsxTransformer _jsxTransformer;
149149
private readonly IFileInfo _fileInfo;
@@ -202,4 +202,4 @@ public bool Exists
202202
#endif
203203
}
204204
}
205-
}
205+
}

‎src/React.AspNet/React.AspNet.xproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222
<ProjectExtensions>
2323
<VisualStudio>
24-
<UserProperties project_1json__JSONSchema="http://www.asp.net/media/4878834/project.json" />
24+
<UserProperties />
2525
</VisualStudio>
2626
</ProjectExtensions>
2727
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" />

‎src/React.AspNet/project.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@
1515
}
1616
},
1717
"dependencies": {
18-
"Microsoft.Framework.DependencyInjection": "1.0.0-beta4",
19-
"Microsoft.AspNet.Hosting": "1.0.0-beta4",
20-
"Microsoft.AspNet.Mvc.Core": "6.0.0-beta4",
21-
"Microsoft.AspNet.StaticFiles": "1.0.0-beta4",
18+
"Microsoft.Framework.DependencyInjection": "1.0.0-beta5",
19+
"Microsoft.AspNet.Mvc.Core": "6.0.0-beta5",
20+
"Microsoft.AspNet.StaticFiles": "1.0.0-beta5",
21+
"Microsoft.AspNet.FileProviders.Physical": "1.0.0-beta5",
2222
"React.Core": "",
2323
"JavaScriptEngineSwitcher.Core": "1.2.4.0"
2424
},
2525
"frameworks": {
26-
DNX451: { }
26+
"dnx451": { }
2727
},
2828

29-
// NuGet info
3029
"authors": [ "Daniel Lo Nigro" ],
3130
"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",
3231
"tags": [ "asp.net", "mvc", "asp", "javascript", "js", "react", "facebook", "reactjs", "vnext" ],

‎src/React.Sample.Mvc6/React.Sample.Mvc6.xproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717
<ProjectExtensions>
1818
<VisualStudio>
19-
<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" />
19+
<UserProperties bower_1json__JSONSchema="http://json.schemastore.org/bower" package_1json__JSONSchema="http://json.schemastore.org/package" />
2020
</VisualStudio>
2121
</ProjectExtensions>
2222
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" />

‎src/React.Sample.Mvc6/Startup.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,23 @@
1111
using Microsoft.AspNet.Builder;
1212
using Microsoft.AspNet.Diagnostics;
1313
using Microsoft.AspNet.Hosting;
14-
using Microsoft.Framework.ConfigurationModel;
14+
using Microsoft.Framework.Configuration;
1515
using Microsoft.Framework.DependencyInjection;
1616
using Microsoft.Framework.Logging;
17-
using Microsoft.Framework.Logging.Console;
1817
using React.AspNet;
18+
using Microsoft.Framework.Runtime;
1919

2020
namespace React.Sample.Mvc6
2121
{
22-
public class Startup
22+
public class Startup
2323
{
24-
public Startup(IHostingEnvironment env)
24+
public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
2525
{
26-
// Setup configuration sources.
27-
Configuration = new Configuration()
28-
.AddEnvironmentVariables();
26+
// Setup configuration sources.
27+
var builder = new ConfigurationBuilder(appEnv.ApplicationBasePath)
28+
.AddEnvironmentVariables();
29+
30+
Configuration = builder.Build();
2931
}
3032

3133
public IConfiguration Configuration { get; set; }

‎src/React.Sample.Mvc6/project.json‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
{
2-
/* Click to learn more about project.json http://go.microsoft.com/fwlink/?LinkID=517074 */
32
"webroot": "wwwroot",
43
"version": "1.5.3-*",
54
"dependencies": {
6-
"Microsoft.AspNet.Mvc": "6.0.0-beta4",
7-
"Microsoft.AspNet.Diagnostics": "1.0.0-beta4",
8-
"Microsoft.AspNet.Server.IIS": "1.0.0-beta4",
9-
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta4",
10-
"Microsoft.AspNet.StaticFiles": "1.0.0-beta4",
11-
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
12-
"Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta4",
13-
"Microsoft.Framework.Logging": "1.0.0-beta4",
14-
"Microsoft.Framework.Logging.Console": "1.0.0-beta4",
15-
"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-beta4",
5+
"Microsoft.AspNet.Mvc": "6.0.0-beta5",
6+
"Microsoft.AspNet.Diagnostics": "1.0.0-beta5",
7+
"Microsoft.AspNet.Server.IIS": "1.0.0-beta5",
8+
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta5",
9+
"Microsoft.AspNet.StaticFiles": "1.0.0-beta5",
10+
"Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-beta5",
11+
"Microsoft.Framework.Configuration.Json": "1.0.0-beta5",
12+
"Microsoft.Framework.Logging": "1.0.0-beta5",
13+
"Microsoft.Framework.Logging.Console": "1.0.0-beta5",
1614
"React.AspNet": "",
1715
"React.Core": "",
1816
"JavaScriptEngineSwitcher.V8": "1.2.4.0",
1917
"JavaScriptEngineSwitcher.Msie": "1.2.4.0"
2018
},
2119
"commands": {
22-
/* Change the port number when you are self hosting this application */
2320
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000",
2421
"gen": "Microsoft.Framework.CodeGeneration"
2522
},
2623
"frameworks": {
27-
"DNX451": { }
28-
//"aspnetcore50": { }
24+
"dnx451": { }
2925
},
3026
"exclude": [
3127
"wwwroot",

0 commit comments

Comments
 (0)